Skip to content

W
wly-APP
Commit 46ce3f1c authored by chuan.liu's avatar chuan.liu
Browse files
Options

调试ios模拟器兼容性

parent 97345d64
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 864 additions and 732 deletions
pages.json
View file @ 46ce3f1c
......@@ -448,13 +448,7 @@
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "制票单",
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "提交",
"fontSize": "14px",
"color": "#555"
}]
"autoBackButton": true
}
}
}
......@@ -469,7 +463,7 @@
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "生产备料",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "新增",
......@@ -490,7 +484,7 @@
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "生产备料",
"autoBackButton": false,
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "提交",
......
pages/apply-delivery/apply-delivery-checkin.nvue
View file @ 46ce3f1c
......@@ -104,7 +104,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/funds-confirm/funds-confirm.nvue
View file @ 46ce3f1c
......@@ -134,7 +134,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/group-baseinfo.nvue
View file @ 46ce3f1c
......@@ -163,7 +163,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/order-upload.nvue
View file @ 46ce3f1c
......@@ -127,7 +127,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/group-buy/quota-order.nvue
View file @ 46ce3f1c
......@@ -114,7 +114,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/my-purchase/my-purchase.nvue
View file @ 46ce3f1c
<template>
<view class="ticket-order-page">
<view class="status_bar" :style="navHeight"></view>
<view class="tabs">
<scroll-view ref="tabbar1" id="tab-bar" class="tab-bar" :scroll="false" :scroll-x="true"
:scroll-into-view="scrollInto">
<view class="tab-bar-list">
<view class="tab-bar-list-wrapper">
<view class="uni-tab-item" v-for="(tab,index) in tabList" :key="tab.id" :ref="'tabitem'+index">
<text :id="tab.id" :data-id="index" :data-current="index" class="uni-tab-item-title"
:class="{'uni-tab-item-title-active':tabIndex==index}" @click="ontabtap">{{tab.name}}</text>
</view>
</view>
<view class="scroll-view-indicator">
<view ref="underline" class="scroll-view-underline" :class="{'scroll-view-animation':isTap}"
:style="underlineStyle"></view>
</view>
</view>
</scroll-view>
<view class="conditon-block" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active">一周内</button>
<button type="default" @click="handleFilter(item)" :class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3" :key='item'>{{item}}月内</button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn" :class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>{{item+3}}月内</button>
</view>
</view>
<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
<orderPage :ref="'page' + index" class="page-item" :nid="page.newsid"></orderPage>
</swiper-item>
</swiper>
</view>
<view class="ticket-order-page">
<view class="status_bar" :style="navHeight"></view>
<view class="tabs">
<scroll-view ref="tabbar1" id="tab-bar" class="tab-bar" :scroll="false" :scroll-x="true"
:scroll-into-view="scrollInto">
<view class="tab-bar-list">
<view class="tab-bar-list-wrapper">
<view class="uni-tab-item" v-for="(tab,index) in tabList" :key="tab.id" :ref="'tabitem'+index">
<text :id="tab.id" :data-id="index" :data-current="index" class="uni-tab-item-title"
:class="{'uni-tab-item-title-active':tabIndex==index}"
@click="ontabtap">{{tab.name}}</text>
</view>
</view>
<view class="scroll-view-indicator">
<view ref="underline" class="scroll-view-underline" :class="{'scroll-view-animation':isTap}"
:style="underlineStyle"></view>
</view>
</view>
</scroll-view>
<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active"><text
class="filter-btn__text filter-btn-active__text">一周内</text></button>
<button type="default" @click="handleFilter(item)"
:class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3"
:key='item'>
<text class="filter-btn__text"
:class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn"
:class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'><text
class="filter-btn__text"
:class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
</view>
</view>
<view class="empty"></view>
<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
<orderPage :ref="'page' + index" class="page-item" :nid="page.newsid"></orderPage>
</swiper-item>
</swiper>
</view>
</view>
</template>
......@@ -88,9 +99,9 @@
swiperWidth: 0,
tabbarWidth: 0,
tabListSize: {},
_touchTabIndex: 0,
ishowDetail:false,
filterActiveIndex:0,
_touchTabIndex: 0,
ishowDetail: false,
filterActiveIndex: 0,
}
},
computed: {
......@@ -99,11 +110,16 @@
left: this.indicatorLineLeft + 'px',
width: this.indicatorLineWidth + 'px'
}
},
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
conditionTop() {
return {
'top': `${this.sysinfo.safeArea.top + 44 + 42}px`
}
},
...mapState(['sysinfo'])
},
......@@ -285,22 +301,23 @@
},
clearTabData(index) {
this.pageList[index].clear();
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item){
this.filterActiveIndex = item
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item) {
this.filterActiveIndex = item
}
}
}
</script>
<style lang="scss">
.ticket-order-page{
flex-direction: column;
}
<style lang="scss">
.ticket-order-page {
flex-direction: column;
flex: 1;
}
/* #ifndef APP-PLUS */
page {
width: 100%;
......@@ -319,7 +336,7 @@
flex: 1;
flex-direction: column;
overflow: hidden;
background-color: #ffffff;
background-color: #ffffff;
}
.tab-bar {
......@@ -328,7 +345,7 @@
flex-direction: row;
/* #ifndef APP-PLUS */
white-space: nowrap;
/* #endif */
/* #endif */
border-bottom: 0.5px solid #eeeeee;
}
......@@ -370,62 +387,86 @@
.scroll-view-animation {
transition-duration: 0.2s;
transition-property: left;
}
.conditon-block{
width: 750rpx;
height: 124rpx;
overflow:hidden;
background-color: #fff;
display: flex;
flex-direction: column;
padding: 40rpx 32rpx 0 16rpx;
}
.conditon-block-auto{
height: auto;
overflow:auto;
max-height:230px;
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
transform: rotate(0deg);
}
.icon-arrow-rotate {
transform: rotate(180deg);
}
.filter-btn{
flex: 0 0 148rpx;
height: 68rpx;
line-height: 68rpx;
background: #f8f8f8;
border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
border: 2rpx solid #f8f8f8;
}
.filter-btn-active{
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255,29,50,0.56);
}
.filter-content{
display: flex;
flex-wrap: wrap;
}
.conditon-block {
position: fixed;
left: 0;
top: 172rpx;
right: 0;
bottom: 0;
z-index: 10;
width: 750rpx;
height: 124rpx;
overflow: hidden;
background-color: #fff;
display: flex;
flex-direction: column;
padding: 40rpx 32rpx 0 16rpx;
}
.conditon-block-auto {
height: 460rpx;
overflow: auto;
max-height: 230px;
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
transform: rotate(0deg);
}
.icon-arrow-rotate {
transform: rotate(180deg);
}
.filter-btn {
flex: 1;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx;
line-height: unset;
background: #f8f8f8;
border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
margin-left: 0;
border: 2rpx solid #f8f8f8;
}
.filter-btn__text {
height: 68rpx;
line-height: 68rpx;
color: #8e8e8e;
font-size: 24rpx;
}
.filter-btn-active {
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
}
.filter-btn-active__text {
color: #fff;
}
.filter-content {
display: flex;
flex-wrap: wrap;
}
.empty {
height: 124rpx;
}
.tab-box {
......
pages/my-purchase/order-item.nvue
View file @ 46ce3f1c
......@@ -3,13 +3,14 @@
<view class="top">
<text class="title-no">要货单号：TP10000021</text>
<view class="title-info">
<button class="title-info__status" type="default">待审批</button>
<button class="title-info__status" type="default"><text class="item-block-btn__text">待审批</text></button>
</view>
</view>
<view class="middle view">
<view class="middle-title">
<text class="middle-title__text">发货单号：FH200333222</text>
<image @click="checkLogistics" class="icon-car" src="@/static/image/order_car@3x.png" mode="aspectFit"></image>
<image @click="checkLogistics" class="icon-car" src="@/static/image/order_car@3x.png" mode="aspectFit">
</image>
</view>
<view class="text-block">
<text class="middle-date">苏州新川商贸公司</text>
......@@ -70,9 +71,10 @@
</view>
</view>
<view class="receive-info" :class="{'receive-info-auto':ishowReceiveDetail}">
<view class="receive-info" ref='receiveInfo'
:class="{'receive-info-auto':ishowReceiveDetail}">
<view class="block-detal-item">
<text class="detal-item-label detal-item-title">尽快发货</text>
<text class="detal-item-label detal-item-title">收货信息</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">是否分流</text>
......@@ -132,9 +134,28 @@
data() {
return {
ishowDetail: true,
ishowReceiveDetail: true,
ishowReceiveDetail: true,
receiveInfoHeight:'24px'
}
},
},
// watch:{
// ishowReceiveDetail(val){
// if(val === true){
// this.receiveInfoHeight = `${this.$refs.receiveInfo.$el.clientHeight}px`
// }else{
// this.receiveInfoHeight = '24px'
// }
// }
// },
// computed: {
// receiveInfoHeight() {
// let height = 0
// height = this.ishowReceiveDetail ? this.$refs.receiveInfo.$el.clientHeight : '0'
// return {
// "height": `${height}px`
// }
// }
// },
methods: {
click() {
this.$emit('click');
......@@ -148,11 +169,11 @@
},
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
},
checkLogistics(){
uni.navigateTo({
url:"/pages/logistics/logistics"
})
},
checkLogistics() {
uni.navigateTo({
url: "/pages/logistics/logistics"
})
}
}
}
......@@ -195,12 +216,17 @@
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx;
border-radius: 80rpx 200rpx 200rpx 80rpx;
font-size: 12px;
color: #fff;
text-align: center;
}
.item-block-btn__text {
font-size: 12px;
color: #fff;
}
.middle {
position: relative;
padding: 26rpx 32rpx;
......@@ -258,7 +284,6 @@
}
.dot {
display: block;
width: 5px;
height: 5px;
background: #3bdc88;
......@@ -302,7 +327,7 @@
.bottom-content {
flex-direction: column;
margin-top: 48rpx;
margin-top: 24rpx;
}
.block-detal {
......@@ -352,7 +377,7 @@
padding-bottom: 60rpx;
}
.receive-info-auto {
.receive-info-auto {
height: auto;
}
......@@ -377,7 +402,7 @@
left: 0;
bottom: 0;
z-index: 10;
width: 100%;
width: 620rpx;
height: 120rpx;
background-color: #fff;
display: flex;
......@@ -394,4 +419,8 @@
align-items: center;
justify-content: center;
}
.float-btn__text {
font-size: 24rpx;
}
</style>
pages/no-quota/order-upload.nvue
View file @ 46ce3f1c
......@@ -127,7 +127,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/no-quota/quota-order.nvue
View file @ 46ce3f1c
......@@ -117,7 +117,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/order-detail-group/order-detail-group.nvue
View file @ 46ce3f1c
......@@ -340,7 +340,7 @@
}
.item-block {
overlow: hidden;
overflow: hidden;
}
.item-block-label {
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 46ce3f1c
......@@ -296,7 +296,7 @@
}
.item-block {
overlow: hidden;
overflow: hidden;
}
.item-block-label {
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 46ce3f1c
......@@ -312,7 +312,7 @@
}
.item-block {
overlow: hidden;
overflow: hidden;
}
.item-block-label {
......
pages/produce-material/order-list.nvue
View file @ 46ce3f1c
<template>
<view class="order view">
<view class="listview">
<view class="cell-list">
<view class="middle view planout-block-item">
<view class="item-block item-block-code">
<text class="item-block-label">单号：TP10000021</text>
<button class="item-block-btn" type="default">待审批</button>
</view>
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">高端总经销材料计划</text>
</view>
<view class="item-block">
<text class="item-block-label-des">2021-08-06 05:14</text>
</view>
<view class="item-block item-block-date">
<text class="detal-item-label">下单日期</text>
</view>
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">产品</text>
<text class="detal-item-value">1618五粮液 500ml*6</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">件数</text>
<text class="detal-item-value">220</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">吨数</text>
<text class="detal-item-value">7</text>
</view>
</view>
<view class="item-block">
<text class="item-block-label-des">尽快发货</text>
</view>
<view class="item-block item-block-date">
<text class="detal-item-label">备注</text>
</view>
<view class="cell-list">
<view class="middle view planout-block-item">
<view class="item-block item-block-code">
<text class="item-block-label">单号：TP10000021</text>
<button class="item-block-btn" type="default"><text
class="item-block-btn__text">待审批</text></button>
</view>
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">高端总经销材料计划</text>
</view>
<view class="item-block">
<text class="item-block-label-des">2021-08-06 05:14</text>
</view>
<view class="item-block item-block-date">
<text class="detal-item-label">下单日期</text>
</view>
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">产品</text>
<text class="detal-item-value">1618五粮液 500ml*6</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">件数</text>
<text class="detal-item-value">220</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">吨数</text>
<text class="detal-item-value">7</text>
</view>
</view>
<view class="item-block">
<text class="item-block-label-des">尽快发货</text>
</view>
<view class="item-block item-block-date">
<text class="detal-item-label">备注</text>
</view>
</view>
</view>
</view>
......@@ -51,14 +52,14 @@
} from 'vuex'
export default {
props: {
newsItem: {
type: Object,
default: function(e) {
return {}
}
}
export default {
props: {
newsItem: {
type: Object,
default: function(e) {
return {}
}
}
},
data() {
return {
......@@ -74,7 +75,7 @@
...mapState(['sysinfo'])
},
methods: {
}
}
</script>
......@@ -86,7 +87,7 @@
.order {
flex: 1;
padding: 0 16rpx;
padding: 0 16rpx;
margin-top: 28rpx;
}
......@@ -97,14 +98,14 @@
.cell-list {
flex-direction: column;
}
.date{
font-size: 28rpx;
color: #999999;
font-size: 28rpx;
text-align: center;
margin-bottom: 24rpx;
}
.date {
font-size: 28rpx;
color: #999999;
font-size: 28rpx;
text-align: center;
margin-bottom: 24rpx;
}
.icon-address {
......@@ -116,7 +117,7 @@
.cell-list-block__content {
display: flex;
flex: 1;
flex-direction: column;
flex-direction: column;
margin-bottom: 40rpx;
}
......@@ -133,8 +134,8 @@
display: flex;
flex-direction: column;
background: #fff;
padding: 20rpx 24rpx;
border-radius: 20rpx;
padding: 20rpx 24rpx;
border-radius: 20rpx;
margin-bottom: 56rpx;
}
......@@ -147,101 +148,106 @@
.list-block-title__text {
color: #999999;
font-size: 26rpx;
}
.planout-block-item {
flex: 1;
padding: 40rpx 32rpx;
background-color: #fff;
border-radius: 16rpx 100rpx 16rpx 16rpx;
}
.item-block {
overflow: hidden;
background-color: #fff;
padding: 0 16rpx;
}
.item-block-label {
font-size: 24rpx;
color: #333;
}
.item-block__label {
flex: 1;
text-align: left;
font-size: 32rpx;
color: #333;
font-weight: 500;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.item-block-code {
display: flex;
align-items: center;
justify-content: space-between;
}
.item-block-btn{
width: 120rpx;
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx;
font-size: 12px;
color: #fff;
text-align: center;
}
.item-block-name {
margin-top: 32rpx;
margin-bottom: 32rpx;
}
.item-block-date{
margin-top: 12rpx;
margin-bottom: 48rpx;
}
.item-block-label-des {
flex: 1;
text-align: left;
font-size: 28rpx;
color: #333;
}
.block-detal {
display: flex;
flex-direction: column;
background: #f8f8f8;
border-radius: 20rpx;
padding: 28rpx 32rpx;
margin-bottom: 16rpx;
}
.block-detal-last{
margin-bottom: 32rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last{
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value{
color: #333;
font-size: 28rpx;
}
.planout-block-item {
flex: 1;
padding: 40rpx 32rpx;
background-color: #fff;
border-radius: 16rpx 100rpx 16rpx 16rpx;
}
.item-block {
overflow: hidden;
background-color: #fff;
padding: 0 16rpx;
}
.item-block-label {
font-size: 24rpx;
color: #333;
}
.item-block__label {
flex: 1;
text-align: left;
font-size: 32rpx;
color: #333;
font-weight: 500;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.item-block-code {
display: flex;
align-items: center;
justify-content: space-between;
}
.item-block-btn {
width: 120rpx;
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx;
font-size: 12px;
color: #fff;
text-align: center;
}
.item-block-btn__text {
font-size: 12px;
color: #fff;
}
.item-block-name {
margin-top: 32rpx;
margin-bottom: 32rpx;
}
.item-block-date {
margin-top: 12rpx;
margin-bottom: 48rpx;
}
.item-block-label-des {
flex: 1;
text-align: left;
font-size: 28rpx;
color: #333;
}
.block-detal {
display: flex;
flex-direction: column;
background: #f8f8f8;
border-radius: 20rpx;
padding: 28rpx 32rpx;
margin-bottom: 52rpx;
}
.block-detal-last {
margin-bottom: 32rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last {
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value {
color: #333;
font-size: 28rpx;
}
</style>
pages/produce-material/produce-material.nvue
View file @ 46ce3f1c
<template>
<view class="page-news">
<view class="status_bar" :style="navHeight"></view>
<view class="conditon-block" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active">一周内</button>
<button type="default" @click="handleFilter(item)" :class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3" :key='item'>{{item}}月内</button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
<view class="conditon-block" :style="conditionTop" :class="{'conditon-block-auto':ishowDetail}">
<view class="filter-title">
<button type="default" class="filter-btn filter-btn-active"><text
class="filter-btn__text filter-btn-active__text">一周内</text></button>
<button type="default" @click="handleFilter(item)"
:class="{'filter-btn-active':item === filterActiveIndex}" class="filter-btn" v-for="item in 3"
:key='item'><text class="filter-btn__text"
:class="{'filter-btn-active__text':item === filterActiveIndex}">{{item}}月内</text></button>
<image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn" :class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>{{item+3}}月内</button>
<view class="filter-content">
<button type="default" @click="handleFilter(item+3)" class="filter-btn"
:class="{'filter-btn-active':item+3 === filterActiveIndex}" v-for="item in 9" :key='item'>
<text class="filter-btn__text"
:class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
</view>
</view>
<uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-list :style="listTop" ref="list" class="listview" :enableBackToTop="true" :scroll-y="true"
@scrolltolower="loadMore()">
<uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
:display="refreshing ? 'show' : 'hide'">
<div class="refresh-view">
......@@ -88,9 +96,9 @@
contentdown: '',
contentrefresh: '',
contentnomore: ''
},
ishowDetail:false,
filterActiveIndex:0,
},
ishowDetail: false,
filterActiveIndex: 0,
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg=="
}
},
......@@ -100,13 +108,23 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
conditionTop() {
return {
'top': `${this.sysinfo.safeArea.top + 44 + 4}px`
}
},
listTop() {
return {
'top': `${this.sysinfo.safeArea.top + 120}px`
}
},
...mapState(['sysinfo'])
},
onNavigationBarButtonTap(e){
console.log('onNavigationBarButtonTap：',e);
uni.navigateTo({
url: `/pages/produce-material/produce-plan`
});
},
onNavigationBarButtonTap(e) {
console.log('onNavigationBarButtonTap：', e);
uni.navigateTo({
url: `/pages/produce-material/produce-plan`
});
},
created() {
this.pullTimer = null;
......@@ -245,12 +263,12 @@
}
return (s4() + s4() + "-" + s4() + "-4" + s4().substr(0, 3) + "-" + s4() + "-" + s4() + s4() + s4())
.toUpperCase();
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item){
this.filterActiveIndex = item
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item) {
this.filterActiveIndex = item
}
}
}
......@@ -294,7 +312,7 @@
.listview {
position: absolute;
left: 0;
top: 216rpx;
top: 216rpx;
right: 0;
bottom: 0;
background: #f0f4f5;
......@@ -305,69 +323,85 @@
/* #ifndef MP-ALIPAY */
flex-direction: column;
/* #endif */
}
.conditon-block{
position: absolute;
left: 0;
top: 88rpx;
right: 0;
bottom: 0;
z-index:10;
height: 124rpx;
overflow:hidden;
background-color: #fff;
display: flex;
flex-direction: column;
padding: 40rpx 32rpx 0 16rpx;
}
.conditon-block-auto{
height: auto;
overflow:auto;
max-height:230px;
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
transform: rotate(0deg);
}
.icon-arrow-rotate {
transform: rotate(180deg);
}
.filter-btn{
flex: 0 0 148rpx;
height: 68rpx;
line-height: 68rpx;
background: #f8f8f8;
border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
border: 2rpx solid #f8f8f8;
}
.filter-btn-active{
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255,29,50,0.56);
}
.filter-content{
display: flex;
flex-wrap: wrap;
}
}
.conditon-block {
position: fixed;
left: 0;
top: 88rpx;
right: 0;
bottom: 0;
z-index: 10;
height: 124rpx;
overflow: hidden;
background-color: #fff;
display: flex;
flex-direction: column;
padding: 40rpx 32rpx 0 16rpx;
}
.conditon-block-auto {
height: 460rpx;
overflow: auto;
max-height: 230px;
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
transform: rotate(0deg);
}
.icon-arrow-rotate {
transform: rotate(180deg);
}
.filter-title {
display: flex;
}
.filter-btn {
flex: 1;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx;
line-height: unset;
background: #f8f8f8;
border-radius: 16rpx;
margin-right: 20rpx;
margin-bottom: 20rpx;
margin-left: 0;
border: 2rpx solid #f8f8f8;
}
.filter-btn__text {
height: 68rpx;
line-height: 68rpx;
color: #8e8e8e;
font-size: 24rpx;
}
.filter-btn-active {
background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30;
box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
}
.filter-btn-active__text {
color: #fff;
}
.filter-content {
display: flex;
flex-wrap: wrap;
}
.refresh {
justify-content: center;
}
......
pages/produce-material/produce-plan.nvue
View file @ 46ce3f1c
<template>
<view class="lists">
<view class="status_bar" :style="navHeight"></view>
<view class="middle upload summary">
<view class="middle summary">
<view class="summary-line">
<view class="summary-block">
<text class="upload-text">预约</text>
......@@ -9,57 +9,71 @@
<switch class="summary-num" color='red' :checked="isChecked" @change="switchChange" />
</view>
<view class="summary-line summary-line-last">
<text>材料保证金</text>
<text>0.00</text>
<text class="upload-text-2">材料保证金</text>
<text class="summary-num-2">0.00</text>
</view>
</view>
<!-- <uni-list :border="false">
<uni-list-item :border="false">
<template v-slot:header>
<text class="upload-text">预约</text>
</template>
<template v-slot:footer>
<switch class="summary-num" color='red' :checked="isChecked" @change="switchChange" />
</template>
</uni-list-item>
</uni-list> -->
<view class="planout-block">
<text class="planout-block-title">备料产品</text>
<image class="planout-block-icon" src="@/static/image/shop_more@3x.png" mode="aspectFit"></image>
</view>
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="item in 2" :key='item'>
<view class="middle view planout-block-item">
<view class="text-block title-first">
<text class="middle-date title-first__text">1</text>
</view>
<view class="text-block">
<text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="middle-date-des">请选择</text>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :show-scrollbar='false'>
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="item in 2" :key='item'>
<view class="middle view planout-block-item">
<view class="text-block title-first">
<text class="middle-date title-first__text">1</text>
</view>
<view class="text-block">
<text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="middle-date-des">请选择</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
<view class="text-block">
<text class="middle-date">备料件数</text>
<input class="middle-date-des" type="text" value="" placeholder="请填写" />
</view>
<view class="text-block">
<text class="middle-date">吨</text>
<text class="middle-date-des">2.5</text>
</view>
<view class="text-block">
<text class="middle-date">保证金</text>
<text class="middle-date-des">0.00</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date">备注</text>
<text class="middle-date-des">尽快发货</text>
</view>
</view>
<view class="text-block">
<text class="middle-date">备料件数</text>
<input class="middle-date-des" type="text" value="" placeholder="请填写" />
</view>
<view class="text-block">
<text class="middle-date">吨</text>
<text class="middle-date-des">2.5</text>
</view>
<view class="text-block">
<text class="middle-date">保证金</text>
<text class="middle-date-des">0.00</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date">备注</text>
<text class="middle-date-des">尽快发货</text>
</view>
</view>
<template v-slot:right>
<view class="swipe-right-block" @click="handleDel"><text class="swipe-right-block__text">删除</text>
</view>
</template>
</uni-swipe-action-item>
</uni-swipe-action>
<template v-slot:right>
<view class="swipe-right-block" @click="handleDel"><text
class="swipe-right-block__text">删除</text>
</view>
</template>
</uni-swipe-action-item>
</uni-swipe-action>
</scroll-view>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
<view class="popup-content">
<view class="popup-content-head">
......@@ -89,8 +103,9 @@
export default {
data() {
return {
isChecked:false,
isChecked: false,
orderNo: '',
scrollTop: 0
}
},
computed: {
......@@ -101,7 +116,7 @@
},
...mapState(['sysinfo'])
},
onNavigationBarButtonTap(e){
onNavigationBarButtonTap(e) {
this.$refs.popup.open('center')
},
methods: {
......@@ -153,11 +168,12 @@
/* #endif */
.lists {
width: 750rpx;
flex: 1;
position: relative;
flex-direction: column;
padding: 32rpx 16rpx 0;
overflow-y: scroll;
background: #f0f4f5;
}
.middle {
......@@ -173,7 +189,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -242,28 +258,38 @@
.upload-text {
flex: 2;
color: #333;
font-size: 28rpx;
font-size: 28rpx;
font-weight: 600;
}
.upload-text-2{
font-size: 24rpx;
}
.summary-num-2{
color: #333;
font-size: 24rpx;
}
.summary {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
margin-bottom: 32rpx;
padding: 32rpx 48rpx;
}
.summary-line {
flex: 1;
display: flex;
width: 100%;
align-items: center;
justify-content: space-between;
justify-content: space-between;
margin-bottom: 8rpx;
}
.summary-line-last{
.summary-line-last {
margin-top: 12rpx;
padding-right: 8rpx;
padding-right: 8rpx;
margin-bottom: 0;
}
.planout-block-lists {
......@@ -284,16 +310,21 @@
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
border-radius: 0px 8px 8px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.swipe-right-block__text {
width: 152rpx;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
padding-left: 24rpx;
}
.planout-block {
......@@ -318,12 +349,13 @@
.planout-block-item {
flex: 1;
width: 750rpx;
}
/deep/ .uni-popup__wrapper {
border-radius: 20rpx;
}
.popup-content {
display: flex;
flex-direction: column;
......@@ -331,40 +363,40 @@
width: 580rpx;
height: 408rpx;
background: #ffffff;
border-radius: 20rpx;
border-radius: 24rpx;
}
.popup-content-head {
margin-top: 56rpx;
margin-bottom: 16rpx;
}
.popup-content-head__icon {
width: 80rpx;
height: 80rpx;
}
.popup-content-content {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 52rpx;
}
.popup-content-content__title {
font-size: 32rpx;
color: #444;
font-weight: 500;
margin-bottom: 8rpx;
}
.popup-content-content__title2 {
color: #999999;
font-size: 24rpx;
}
.popup-content-foot {}
.popup-content-foot__btn {
width: 152rpx;
height: 60rpx;
......@@ -374,13 +406,13 @@
color: #ff0f00;
font-weight: 500;
border-radius: 32rpx;
font-size: 22rpx;
}
.popup-content-foot__sure {
margin-left: 40rpx;
color: #fff;
background: #ff1d32;
border: 1px solid #ff1d32;
}
</style>
</style>
pages/produce-order/produce-plan.nvue
View file @ 46ce3f1c
......@@ -89,7 +89,7 @@
data() {
return {
isChecked: false,
scrollTop:0,
scrollTop:0,
orderNo: '',
}
},
......@@ -173,7 +173,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -379,7 +379,7 @@
text-align: center;
color: #ff0f00;
font-weight: 500;
border-radius: 32rpx;
border-radius: 32rpx;
font-size: 22rpx;
}
......@@ -389,4 +389,4 @@
background: #ff1d32;
border: 1px solid #ff1d32;
}
</style>
</style>
pages/purchase-plan/purchase-plan.nvue
View file @ 46ce3f1c
......@@ -143,14 +143,14 @@
flex-direction: column;
overflow-y: scroll;
background: #f0f4f5;
flex: 1;
flex: 1;
height: 100%;
}
.main {
.main {
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
padding: 0 16rpx;
}
.middle {
......@@ -160,7 +160,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -228,7 +228,7 @@
}
.item-block {
overlow: hidden;
overflow: hidden;
}
.item-block-label {
......@@ -268,7 +268,7 @@
flex-direction: column;
background: #f8f8f8;
border-radius: 20rpx;
padding: 32rpx;
padding: 32rpx;
margin-top: 32rpx;
}
......
pages/purchase-receive/purchase-receive.nvue
View file @ 46ce3f1c
......@@ -160,7 +160,7 @@
index: 0,
quantity: '',
remark: '',
fileList: [],
fileList: [],
scrollTop: 0
}
},
......@@ -234,11 +234,11 @@
flex-direction: column;
background: #f0f4f5;
overflow-y: scroll;
}
.scroll-area{
flex: 1;
}
}
.scroll-area{
flex: 1;
}
.main {
margin: 0 16rpx;
......@@ -255,7 +255,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......@@ -422,4 +422,4 @@
.btn-text-l {
color: $wly-primary-color;
}
</style>
</style>
pages/purchase/purchase.nvue
View file @ 46ce3f1c
......@@ -251,10 +251,10 @@
flex-direction: column;
background: #f0f4f5;
overflow-y: scroll;
}
.scroll-area{
flex: 1;
}
.scroll-area{
flex: 1;
}
.main {
......@@ -272,7 +272,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/quota/order-upload.nvue
View file @ 46ce3f1c
......@@ -128,7 +128,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/quota/quota-order.nvue
View file @ 46ce3f1c
......@@ -195,7 +195,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-business/select-business.nvue
View file @ 46ce3f1c
......@@ -189,7 +189,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-client/select-client.nvue
View file @ 46ce3f1c
......@@ -226,7 +226,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-group-client/select-group-client.nvue
View file @ 46ce3f1c
......@@ -193,7 +193,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-product/select-product.nvue
View file @ 46ce3f1c
......@@ -190,7 +190,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/select-sale-plan/select-sale-plan.nvue
View file @ 46ce3f1c
......@@ -211,7 +211,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/ticket-order/order-item.nvue
View file @ 46ce3f1c
......@@ -2,11 +2,11 @@
<view class="order view">
<view class="top">
<text class="title-no">制票编号：TP10000021</text>
<view class="title-info">
<button class="title-info__status" type="default">待审批</button>
<view class="title-info">
<button class="title-info__status" type="default"><text class="item-block-btn__text">待审批</text></button>
</view>
</view>
<view class="middle view">
<view class="middle view">
<text class="middle-title">配额酒制票通知单(计划内)</text>
<view class="text-block">
<text class="middle-date">2021-08-06 05:14</text>
......@@ -105,7 +105,7 @@
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
},
}
}
</script>
......@@ -119,11 +119,10 @@
flex: 1;
background: #ffffff;
border-radius: 16rpx 100rpx 16rpx 16rpx;
box-shadow: 0px 2px 4px 0px #dbe4ee;
margin-bottom: 60rpx;
margin-top: 28rpx;
margin-bottom: 60rpx;
margin-top: 28rpx;
padding-top: 30rpx;
}
}
.top {
height: 72rpx;
......@@ -138,22 +137,27 @@
}
.title-info {
align-items: center;
align-items: center;
margin-right: 26rpx;
}
.title-info__status {
width: 120rpx;
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx;
font-size: 12px;
color: #fff;
width: 120rpx;
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx;
font-size: 12px;
color: #fff;
text-align: center;
}
.middle {
.item-block-btn__text {
font-size: 12px;
color: #fff;
}
.middle {
position: relative;
padding: 26rpx 32rpx;
}
......@@ -191,10 +195,10 @@
height: 40rpx;
justify-content: flex-end;
align-items: center;
}
.bottom-nav-arrow{
align-items: center;
}
.bottom-nav-arrow {
align-items: center;
}
.arrow-des {
......@@ -208,7 +212,7 @@
margin-left: 16rpx;
margin-top: 2px;
transition-property: transform;
transition-duration: 0.15s;
transition-duration: 0.15s;
transform: rotate(0deg);
}
......@@ -216,7 +220,7 @@
transform: rotate(180deg);
}
.bottom-content {
.bottom-content {
flex-direction: column;
margin-top: 48rpx;
}
......
pages/ticket-order/ticket-order.nvue
View file @ 46ce3f1c
......@@ -37,7 +37,9 @@
class="filter-btn__text"
:class="{'filter-btn-active__text':item+3 === filterActiveIndex}">{{item+3}}月内</text></button>
</view>
</view>
</view>
<view class="empty"></view>
<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
......@@ -461,6 +463,10 @@
.filter-content {
display: flex;
flex-wrap: wrap;
}
.empty{
height: 124rpx;
}
.tab-box {
......
unpackage/dist/dev/app-plus/pages/apply-delivery/apply-delivery.js
View file @ 46ce3f1c
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/apply-order/apply-order.js
View file @ 46ce3f1c
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment