Skip to content

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

调试ios模拟器兼容性

parent 97345d64
Expand all Show 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
......@@ -8,7 +8,8 @@
<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>
:class="{'uni-tab-item-title-active':tabIndex==index}"
@click="ontabtap">{{tab.name}}</text>
</view>
</view>
<view class="scroll-view-indicator">
......@@ -18,18 +19,28 @@
</view>
</scroll-view>
<view class="conditon-block" :class="{'conditon-block-auto':ishowDetail}">
<view class="conditon-block" :style="conditionTop" :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>
<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>
<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">
......@@ -89,8 +100,8 @@
tabbarWidth: 0,
tabListSize: {},
_touchTabIndex: 0,
ishowDetail:false,
filterActiveIndex:0,
ishowDetail: false,
filterActiveIndex: 0,
}
},
computed: {
......@@ -105,6 +116,11 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
conditionTop() {
return {
'top': `${this.sysinfo.safeArea.top + 44 + 42}px`
}
},
...mapState(['sysinfo'])
},
onReady() {
......@@ -289,7 +305,7 @@
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item){
handleFilter(item) {
this.filterActiveIndex = item
}
}
......@@ -297,8 +313,9 @@
</script>
<style lang="scss">
.ticket-order-page{
.ticket-order-page {
flex-direction: column;
flex: 1;
}
/* #ifndef APP-PLUS */
......@@ -372,20 +389,26 @@
transition-property: left;
}
.conditon-block{
.conditon-block {
position: fixed;
left: 0;
top: 172rpx;
right: 0;
bottom: 0;
z-index: 10;
width: 750rpx;
height: 124rpx;
overflow:hidden;
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;
.conditon-block-auto {
height: 460rpx;
overflow: auto;
max-height: 230px;
}
.icon-arrow {
......@@ -403,31 +426,49 @@
}
.filter-btn{
flex: 0 0 148rpx;
.filter-btn {
flex: 1;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx;
line-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-active{
.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);
box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
}
.filter-btn-active__text {
color: #fff;
}
.filter-content{
.filter-content {
display: flex;
flex-wrap: wrap;
}
.empty {
height: 124rpx;
}
.tab-box {
flex: 1;
background: $background-color-1;
......
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>
......@@ -133,8 +135,27 @@
return {
ishowDetail: 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');
......@@ -149,9 +170,9 @@
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
},
checkLogistics(){
checkLogistics() {
uni.navigateTo({
url:"/pages/logistics/logistics"
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 {
......@@ -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
......@@ -5,7 +5,8 @@
<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>
<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>
......@@ -99,7 +100,7 @@
flex-direction: column;
}
.date{
.date {
font-size: 28rpx;
color: #999999;
font-size: 28rpx;
......@@ -184,23 +185,28 @@
justify-content: space-between;
}
.item-block-btn{
.item-block-btn {
width: 120rpx;
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;
}
.item-block-name {
margin-top: 32rpx;
margin-bottom: 32rpx;
}
.item-block-date{
.item-block-date {
margin-top: 12rpx;
margin-bottom: 48rpx;
}
......@@ -218,10 +224,10 @@
background: #f8f8f8;
border-radius: 20rpx;
padding: 28rpx 32rpx;
margin-bottom: 16rpx;
margin-bottom: 52rpx;
}
.block-detal-last{
.block-detal-last {
margin-bottom: 32rpx;
}
......@@ -231,7 +237,7 @@
justify-content: space-between;
}
.block-detal-item-last{
.block-detal-item-last {
margin-bottom: 0;
}
......@@ -240,7 +246,7 @@
font-size: 24rpx;
}
.detal-item-value{
.detal-item-value {
color: #333;
font-size: 28rpx;
}
......
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="conditon-block" :style="conditionTop" :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>
<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>
<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">
......@@ -89,8 +97,8 @@
contentrefresh: '',
contentnomore: ''
},
ishowDetail:false,
filterActiveIndex:0,
ishowDetail: false,
filterActiveIndex: 0,
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg=="
}
},
......@@ -100,10 +108,20 @@
'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);
onNavigationBarButtonTap(e) {
console.log('onNavigationBarButtonTap：', e);
uni.navigateTo({
url: `/pages/produce-material/produce-plan`
});
......@@ -249,7 +267,7 @@
handleShowDetail() {
this.ishowDetail = !this.ishowDetail
},
handleFilter(item){
handleFilter(item) {
this.filterActiveIndex = item
}
}
......@@ -307,25 +325,25 @@
/* #endif */
}
.conditon-block{
position: absolute;
.conditon-block {
position: fixed;
left: 0;
top: 88rpx;
right: 0;
bottom: 0;
z-index:10;
z-index: 10;
height: 124rpx;
overflow:hidden;
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;
.conditon-block-auto {
height: 460rpx;
overflow: auto;
max-height: 230px;
}
.icon-arrow {
......@@ -342,28 +360,44 @@
transform: rotate(180deg);
}
.filter-title {
display: flex;
}
.filter-btn{
flex: 0 0 148rpx;
.filter-btn {
flex: 1;
min-width: 148rpx;
max-width: 148rpx;
height: 68rpx;
line-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-active{
.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);
box-shadow: 0px 4rpx 12rpx 0px rgba(255, 29, 50, 0.56);
}
.filter-btn-active__text {
color: #fff;
}
.filter-content{
.filter-content {
display: flex;
flex-wrap: wrap;
}
......
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,16 +9,28 @@
<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>
<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">
......@@ -54,11 +66,13 @@
</view>
</view>
<template v-slot:right>
<view class="swipe-right-block" @click="handleDel"><text class="swipe-right-block__text">删除</text>
<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">
......@@ -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;
......@@ -243,27 +259,37 @@
flex: 2;
color: #333;
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;
margin-bottom: 8rpx;
}
.summary-line-last{
.summary-line-last {
margin-top: 12rpx;
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,6 +349,7 @@
.planout-block-item {
flex: 1;
width: 750rpx;
}
/deep/ .uni-popup__wrapper {
......@@ -331,7 +363,7 @@
width: 580rpx;
height: 408rpx;
background: #ffffff;
border-radius: 20rpx;
border-radius: 24rpx;
}
.popup-content-head {
......@@ -374,6 +406,7 @@
color: #ff0f00;
font-weight: 500;
border-radius: 32rpx;
font-size: 22rpx;
}
.popup-content-foot__sure {
......@@ -382,5 +415,4 @@
background: #ff1d32;
border: 1px solid #ff1d32;
}
</style>
pages/produce-order/produce-plan.nvue
View file @ 46ce3f1c
......@@ -173,7 +173,7 @@
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/purchase-plan/purchase-plan.nvue
View file @ 46ce3f1c
......@@ -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 {
......
pages/purchase-receive/purchase-receive.nvue
View file @ 46ce3f1c
......@@ -255,7 +255,7 @@
}
.text-block {
overlow: hidden;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
......
pages/purchase/purchase.nvue
View file @ 46ce3f1c
......@@ -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
......@@ -3,7 +3,7 @@
<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">
......@@ -119,7 +119,6 @@
flex: 1;
background: #ffffff;
border-radius: 16rpx 100rpx 16rpx 16rpx;
box-shadow: 0px 2px 4px 0px #dbe4ee;
margin-bottom: 60rpx;
margin-top: 28rpx;
padding-top: 30rpx;
......@@ -147,12 +146,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;
......@@ -193,7 +197,7 @@
align-items: center;
}
.bottom-nav-arrow{
.bottom-nav-arrow {
align-items: center;
}
......
pages/ticket-order/ticket-order.nvue
View file @ 46ce3f1c
......@@ -39,6 +39,8 @@
</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">
......@@ -463,6 +465,10 @@
flex-wrap: wrap;
}
.empty{
height: 124rpx;
}
.tab-box {
flex: 1;
background: $background-color-1;
......
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