Skip to content

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

调试ios模拟器兼容性

parent 0bab7fe5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2709 additions and 2599 deletions
components/uni-list.vue
View file @ 97345d64
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</list> </list>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 || MP-WEIXIN || MP-QQ --> <!-- #ifdef H5 || MP-WEIXIN || MP-QQ -->
<scroll-view class="uni-list" :enableBackToTop="enableBackToTop" :scroll-y="scrollY" @scrolltolower="loadMore"> <scroll-view class="uni-list" :enableBackToTop="enableBackToTop" :show-scrollbar='false' :scroll-y="scrollY" @scrolltolower="loadMore">
<slot /> <slot />
</scroll-view> </scroll-view>
<!-- #endif --> <!-- #endif -->
......
pages.json
View file @ 97345d64
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
"titleSize": "17px", "titleSize": "17px",
"backgroundColor": "transparent", "backgroundColor": "transparent",
"titleText": "客户选择", "titleText": "客户选择",
"autoBackButton": false, "autoBackButton": true,
"buttons": [{ "buttons": [{
"type": "none", "type": "none",
"text": "选择", "text": "选择",
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
"titleSize": "17px", "titleSize": "17px",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"titleText": "生产下单", "titleText": "生产下单",
"autoBackButton": false, "autoBackButton": true,
"buttons": [{ "buttons": [{
"type": "none", "type": "none",
"text": "新增", "text": "新增",
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
"titleSize": "17px", "titleSize": "17px",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"titleText": "生产计划", "titleText": "生产计划",
"autoBackButton": false, "autoBackButton": true,
"buttons": [{ "buttons": [{
"type": "none", "type": "none",
"text": "提交", "text": "提交",
......
pages/address-manage/address-manage.nvue
View file @ 97345d64
<template> <template>
<view class="order view"> <view class="order view">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="listview"> <view class="listview">
<view class="cell-list"> <list class="cell-list" :show-scrollbar='false'>
<view class="cell-list-block" @click="check" v-for="item in 10" :key='item'> <cell @click="check" v-for="item in 10" :key='item'>
<text class="icon-address">张</text> <view class="cell-list-block">
<view class="cell-list-block__content"> <text class="icon-address">张</text>
<view class="list-block-item"> <view class="cell-list-block__content">
<text class="list-block-item__title1">张先生 13760362013</text> <view class="list-block-item">
</view> <text class="list-block-item__title1">张先生 13760362013</text>
<view class="list-block-item"> </view>
<text class="list-block-item__label">单位编号</text> <view class="list-block-item">
<text class="list-block-item__value">38000680</text> <text class="list-block-item__label">单位编号</text>
</view> <text class="list-block-item__value">38000680</text>
<view class="list-block-item"> </view>
<text class="list-block-item__label">单位编号</text> <view class="list-block-item">
<text class="list-block-item__value">常委会退休处</text> <text class="list-block-item__label">单位编号</text>
</view> <text class="list-block-item__value">常委会退休处</text>
<view class="list-block-item"> </view>
<image class="icon-arrow" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image> <view class="list-block-item">
<text class="list-block-item__desc">天津天津市静海县华佗大道529号</text> <image class="icon-arrow" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image>
</view> <text class="list-block-item__desc">天津天津市静海县华佗大道529号</text>
</view>
</view>
</view> </view>
</cell>
</view> </list>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -81,18 +83,20 @@ ...@@ -81,18 +83,20 @@
.order { .order {
flex: 1; flex: 1;
background: #f8f9fa; background: #f0f4f5;
} }
.listview { .listview {
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
padding: 16rpx; padding:16rpx;
} }
.cell-list { .cell-list {
flex-direction: column; flex: 1;
} flex-direction: column;
background: #f0f4f5;
}
.icon-address { .icon-address {
width: 88rpx; width: 88rpx;
...@@ -145,10 +149,16 @@ ...@@ -145,10 +149,16 @@
width: 18rpx; width: 18rpx;
height: 22rpx; height: 22rpx;
margin-right: 28rpx; margin-right: 28rpx;
}
.list-block-item__desc{
font-size: 24rpx;
color: #333;
} }
.cell-list-block { .cell-list-block {
display: flex; display: flex;
flex: 1;
margin-bottom: 16rpx; margin-bottom: 16rpx;
background: #fff; background: #fff;
border-radius: 8px; border-radius: 8px;
......
pages/apply-delivery/apply-delivery-checkin.nvue
View file @ 97345d64
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
} }
.lists { .lists {
flex-direction: column; flex-direction: column;
padding: 0 16rpx; padding: 0 16rpx;
} }
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
position: absolute; position: absolute;
right: 0; right: 0;
top: 16px; top: 16px;
width: 12rpx; width: 12rpx;
height: 20rpx; height: 20rpx;
z-index: 10; z-index: 10;
} }
...@@ -211,4 +211,4 @@ ...@@ -211,4 +211,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/funds-confirm/funds-confirm.nvue
View file @ 97345d64
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
z-index: 10; z-index: 10;
} }
.remark-text { .remark-text {
flex: 1; flex: 1;
height: 320rpx; height: 320rpx;
background: #f5f6f7; background: #f5f6f7;
...@@ -222,4 +222,4 @@ ...@@ -222,4 +222,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/group-buy/group-baseinfo.nvue
View file @ 97345d64
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view class="text-block"> <view class="text-block" @click="selectAddress">
<text class="middle-date">收货单位</text> <text class="middle-date">收货单位</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
...@@ -80,56 +80,56 @@ ...@@ -80,56 +80,56 @@
export default { export default {
data() { data() {
return { return {
selectedBusiness: { selectedBusiness: {
id:'请选择', id:'请选择',
checked:false, checked:false,
product:'请填写', product:'请填写',
quantity:0, quantity:0,
price:0 price:0
}, },
selectedGroupClient:{ selectedGroupClient:{
id:'请选择', id:'请选择',
checked:false, checked:false,
product:'请填写', product:'请填写',
quantity:0, quantity:0,
price:0 price:0
} }
} }
},
onBackPress(event){
console.log('event',event)
uni.switchTab({
url: `/pages/go-order/go-order`
})
return false
},
mounted() {
console.log('监听到事件来自 update');
let _this = this
uni.$once('selectedBusiness',function(data){
console.log('监听到事件来自 selectedBusiness ，携带参数 msg 为：' + data.selectedBusiness.id);
_this.selectedBusiness = {...data.selectedBusiness}
})
uni.$once('selectedGroupClient',function(data){
console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：' + data.selectedGroupClient.id);
_this.selectedGroupClient = {...data.selectedGroupClient}
})
}, },
methods: { onBackPress(event){
selectGroupClient(){ console.log('event',event)
uni.navigateTo({ uni.switchTab({
url: `/pages/select-group-client/select-group-client` url: `/pages/go-order/go-order`
}); })
}, return false
selectBusiness(){ },
uni.navigateTo({ mounted() {
url: `/pages/select-business/select-business` console.log('监听到事件来自 update');
}); let _this = this
}, uni.$once('selectedBusiness',function(data){
selectAddress(){ console.log('监听到事件来自 selectedBusiness ，携带参数 msg 为：' + data.selectedBusiness.id);
uni.navigateTo({ _this.selectedBusiness = {...data.selectedBusiness}
url: `/pages/address-manage/address-manage` })
}); uni.$once('selectedGroupClient',function(data){
console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：' + data.selectedGroupClient.id);
_this.selectedGroupClient = {...data.selectedGroupClient}
})
},
methods: {
selectGroupClient(){
uni.navigateTo({
url: `/pages/select-group-client/select-group-client`
});
},
selectBusiness(){
uni.navigateTo({
url: `/pages/select-business/select-business`
});
},
selectAddress(){
uni.navigateTo({
url: `/pages/address-manage/address-manage`
});
}, },
nextStep() { nextStep() {
this.$emit('click', 'quotaOrder') this.$emit('click', 'quotaOrder')
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
position: relative; position: relative;
flex-direction: column; flex-direction: column;
padding: 0 16rpx; padding: 0 16rpx;
overflow-y: scroll; overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
} }
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -273,4 +273,4 @@ ...@@ -273,4 +273,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/group-buy/order-upload.nvue
View file @ 97345d64
...@@ -47,19 +47,19 @@ ...@@ -47,19 +47,19 @@
data() { data() {
return { return {
orderNo: '', orderNo: '',
fileList: [], fileList: [],
} }
}, },
computed:{ computed:{
imageStyles(){ imageStyles(){
return { return {
width: 64, width: 64,
height: 64, height: 64,
border: { border: {
radius: '50%' radius: '50%'
} }
} }
}, },
}, },
methods: { methods: {
change(e) { change(e) {
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
// 获取上传进度 // 获取上传进度
progress(e) { progress(e) {
console.log('上传进度：', e) console.log('上传进度：', e)
}, },
// 选择文件 // 选择文件
select(e) { select(e) {
console.log('选择文件：', e) console.log('选择文件：', e)
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
this.$refs.popup.close() this.$refs.popup.close()
}, },
submit() { submit() {
this.$refs.popup.open('center') this.$refs.popup.open('center')
this.$refs.files.upload() this.$refs.files.upload()
}, },
preStep() { preStep() {
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -179,16 +179,16 @@ ...@@ -179,16 +179,16 @@
border: 1px dashed #dedede; border: 1px dashed #dedede;
border-radius: 4px; border-radius: 4px;
margin-top: 90rpx; margin-top: 90rpx;
} }
.uni-file-picker{ .uni-file-picker{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
/deep/ .uni-file-picker__container{ /deep/ .uni-file-picker__container{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.bottom-area { .bottom-area {
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
text-align: center; text-align: center;
color: #ff0f00; color: #ff0f00;
font-weight: 500; font-weight: 500;
border-radius: 32rpx; border-radius: 32rpx;
font-size: 22rpx; font-size: 22rpx;
} }
...@@ -295,4 +295,4 @@ ...@@ -295,4 +295,4 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
</style> </style>
pages/group-buy/quota-order.nvue
View file @ 97345d64
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -318,4 +318,4 @@ ...@@ -318,4 +318,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/message/message.nvue
View file @ 97345d64
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<text class="cell-list-block__desc">最新消息：新川商贸要货审批</text> <text class="cell-list-block__desc">最新消息：新川商贸要货审批</text>
</view> </view>
<text class="dot">2</text> <text class="dot">2</text>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
<view class="line"></view>
</view> </view>
<view class="cell-list-block" @click="goMessageList('read')"> <view class="cell-list-block" @click="goMessageList('read')">
<image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image> <image class="icon-address" src="@/static/image/uc_setting@3x.png" mode="aspectFit"></image>
...@@ -133,8 +134,7 @@ ...@@ -133,8 +134,7 @@
align-items: center; align-items: center;
} }
.cell-list-block:after { .line {
content: '';
position: absolute; position: absolute;
width: 750rpx; width: 750rpx;
left: 40rpx; left: 40rpx;
...@@ -146,10 +146,12 @@ ...@@ -146,10 +146,12 @@
.dot { .dot {
width: 44rpx; width: 44rpx;
height: 36rpx; height: 36rpx;
line-height: 36rpx;
background: #ff0f00; background: #ff0f00;
border-radius: 18rpx; border-radius: 18rpx;
color: #fff; color: #fff;
font-size: 22rpx;
margin-right: 28rpx; margin-right: 28rpx;
text-align: center; text-align: center;
} }
......
pages/no-quota/order-upload.nvue
View file @ 97345d64
...@@ -47,19 +47,19 @@ ...@@ -47,19 +47,19 @@
data() { data() {
return { return {
orderNo: '', orderNo: '',
fileList: [], fileList: [],
} }
}, },
computed:{ computed:{
imageStyles(){ imageStyles(){
return { return {
width: 64, width: 64,
height: 64, height: 64,
border: { border: {
radius: '50%' radius: '50%'
} }
} }
}, },
}, },
methods: { methods: {
change(e) { change(e) {
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
// 获取上传进度 // 获取上传进度
progress(e) { progress(e) {
console.log('上传进度：', e) console.log('上传进度：', e)
}, },
// 选择文件 // 选择文件
select(e) { select(e) {
console.log('选择文件：', e) console.log('选择文件：', e)
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
this.$refs.popup.close() this.$refs.popup.close()
}, },
submit() { submit() {
this.$refs.popup.open('center') this.$refs.popup.open('center')
this.$refs.files.upload() this.$refs.files.upload()
}, },
preStep() { preStep() {
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -179,16 +179,16 @@ ...@@ -179,16 +179,16 @@
border: 1px dashed #dedede; border: 1px dashed #dedede;
border-radius: 4px; border-radius: 4px;
margin-top: 90rpx; margin-top: 90rpx;
} }
.uni-file-picker{ .uni-file-picker{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
/deep/ .uni-file-picker__container{ /deep/ .uni-file-picker__container{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.bottom-area { .bottom-area {
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
text-align: center; text-align: center;
color: #ff0f00; color: #ff0f00;
font-weight: 500; font-weight: 500;
border-radius: 32rpx; border-radius: 32rpx;
font-size: 22rpx; font-size: 22rpx;
} }
...@@ -295,4 +295,4 @@ ...@@ -295,4 +295,4 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
</style> </style>
pages/no-quota/quota-order.nvue
View file @ 97345d64
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -321,4 +321,4 @@ ...@@ -321,4 +321,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/produce-material/produce-plan.nvue
View file @ 97345d64
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<view class="lists"> <view class="lists">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="middle upload summary"> <view class="middle upload summary">
<view class="summary-line"> <view class="summary-line">
<view class="summary-block"> <view class="summary-block">
<text class="upload-text">预约</text> <text class="upload-text">预约</text>
</view> </view>
<switch class="summary-num" color='red' :checked="isChecked" @change="switchChange" /> <switch class="summary-num" color='red' :checked="isChecked" @change="switchChange" />
</view> </view>
<view class="summary-line summary-line-last"> <view class="summary-line summary-line-last">
<text>材料保证金</text> <text>材料保证金</text>
<text>0.00</text> <text>0.00</text>
</view> </view>
</view> </view>
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
<view class="text-block"> <view class="text-block">
<text class="middle-date">吨</text> <text class="middle-date">吨</text>
<text class="middle-date-des">2.5</text> <text class="middle-date-des">2.5</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">保证金</text> <text class="middle-date">保证金</text>
<text class="middle-date-des">0.00</text> <text class="middle-date-des">0.00</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<text class="middle-date">备注</text> <text class="middle-date">备注</text>
...@@ -58,24 +58,24 @@ ...@@ -58,24 +58,24 @@
</view> </view>
</template> </template>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'> <uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
<view class="popup-content"> <view class="popup-content">
<view class="popup-content-head"> <view class="popup-content-head">
<image class="popup-content-head__icon" src="@/static/image/icon_plan@3x.png" mode=""></image> <image class="popup-content-head__icon" src="@/static/image/icon_plan@3x.png" mode=""></image>
</view> </view>
<view class="popup-content-content"> <view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text> <text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">生产备料编号：{{ orderNo }}</text> <text class="popup-content-content__title2">生产备料编号：{{ orderNo }}</text>
<text class="popup-content-content__title2">生产备料单号：{{ orderNo }}</text> <text class="popup-content-content__title2">生产备料单号：{{ orderNo }}</text>
</view> </view>
<view class="popup-content-foot"> <view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">继续添加</text> <text class="popup-content-foot__btn" @click="fnBackHome()">继续添加</text>
<text class="popup-content-foot__btn popup-content-foot__sure" <text class="popup-content-foot__btn popup-content-foot__sure"
@click="fnCheckOrderByNo()">查看备料</text> @click="fnCheckOrderByNo()">查看备料</text>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
export default { export default {
data() { data() {
return { return {
isChecked:false, isChecked:false,
orderNo: '', orderNo: '',
} }
}, },
computed: { computed: {
...@@ -100,22 +100,22 @@ ...@@ -100,22 +100,22 @@
} }
}, },
...mapState(['sysinfo']) ...mapState(['sysinfo'])
},
onNavigationBarButtonTap(e){
this.$refs.popup.open('center')
}, },
methods: { onNavigationBarButtonTap(e){
change(e) { this.$refs.popup.open('center')
console.log('当前模式：' + e.type + ',状态：' + e.show); },
}, methods: {
fnBackHome() { change(e) {
this.$refs.popup.close() console.log('当前模式：' + e.type + ',状态：' + e.show);
}, },
fnCheckOrderByNo() { fnBackHome() {
this.$refs.popup.close() this.$refs.popup.close()
uni.navigateTo({ },
url: `/pages/produce-material/produce-material` fnCheckOrderByNo() {
}) this.$refs.popup.close()
uni.navigateTo({
url: `/pages/produce-material/produce-material`
})
}, },
handleDel() { handleDel() {
console.log(1) console.log(1)
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
}) })
}, },
switchChange(e) { switchChange(e) {
console.log('switch1 发生 change 事件，携带值为', e.detail.value) console.log('switch1 发生 change 事件，携带值为', e.detail.value)
this.isChecked = e.detail.value this.isChecked = e.detail.value
}, },
} }
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -246,24 +246,24 @@ ...@@ -246,24 +246,24 @@
} }
.summary { .summary {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
justify-content: center; justify-content: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;
padding: 32rpx 48rpx; padding: 32rpx 48rpx;
} }
.summary-line { .summary-line {
display: flex; display: flex;
width: 100%; width: 100%;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.summary-line-last{ .summary-line-last{
margin-top: 12rpx; margin-top: 12rpx;
padding-right: 8rpx; padding-right: 8rpx;
} }
.planout-block-lists { .planout-block-lists {
...@@ -318,69 +318,69 @@ ...@@ -318,69 +318,69 @@
.planout-block-item { .planout-block-item {
flex: 1; flex: 1;
} }
/deep/ .uni-popup__wrapper { /deep/ .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
.popup-content { .popup-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
width: 580rpx; width: 580rpx;
height: 408rpx; height: 408rpx;
background: #ffffff; background: #ffffff;
border-radius: 20rpx; border-radius: 20rpx;
} }
.popup-content-head { .popup-content-head {
margin-top: 56rpx; margin-top: 56rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.popup-content-head__icon { .popup-content-head__icon {
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
} }
.popup-content-content { .popup-content-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-bottom: 52rpx; margin-bottom: 52rpx;
} }
.popup-content-content__title { .popup-content-content__title {
font-size: 32rpx; font-size: 32rpx;
color: #444; color: #444;
font-weight: 500; font-weight: 500;
margin-bottom: 8rpx; margin-bottom: 8rpx;
} }
.popup-content-content__title2 { .popup-content-content__title2 {
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
} }
.popup-content-foot {} .popup-content-foot {}
.popup-content-foot__btn { .popup-content-foot__btn {
width: 152rpx; width: 152rpx;
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
background: #ffedee; background: #ffedee;
text-align: center; text-align: center;
color: #ff0f00; color: #ff0f00;
font-weight: 500; font-weight: 500;
border-radius: 32rpx; border-radius: 32rpx;
} }
.popup-content-foot__sure { .popup-content-foot__sure {
margin-left: 40rpx; margin-left: 40rpx;
color: #fff; color: #fff;
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
</style> </style>
pages/produce-order/order-list.nvue
View file @ 97345d64
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="middle view planout-block-item"> <view class="middle view planout-block-item">
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">单号：TP10000021</text> <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>
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label item-block__label">配额生产计划</text> <text class="item-block-label item-block__label">配额生产计划</text>
...@@ -204,10 +204,13 @@ ...@@ -204,10 +204,13 @@
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx; border-radius: 80rpx 200rpx 200rpx 80rpx;
text-align: center;
}
.item-block-btn__text{
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center;
} }
.item-block-name { .item-block-name {
......
pages/produce-order/produce-order.nvue
View file @ 97345d64
<template> <template>
<view class="page-news"> <view class="page-news">
<view class="status_bar" :style="navHeight"></view> <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"> <view class="filter-title">
<button type="default" class="filter-btn filter-btn-active">一周内</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'>{{item}}月内</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}" <image @click="handleShowDetail" class="icon-arrow" :class="{'icon-arrow-rotate':ishowDetail}"
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image> src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view> </view>
<view class="filter-content"> <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> </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" <uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
:display="refreshing ? 'show' : 'hide'"> :display="refreshing ? 'show' : 'hide'">
<div class="refresh-view"> <div class="refresh-view">
...@@ -99,6 +102,16 @@ ...@@ -99,6 +102,16 @@
return { return {
'height': `${this.sysinfo.safeArea.top + 44}px` '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']) ...mapState(['sysinfo'])
}, },
...@@ -194,7 +207,8 @@ ...@@ -194,7 +207,8 @@
} }
}); });
}, },
loadMore(e) { loadMore(e) {
console.log('loadMore')
this.loadData(); this.loadData();
}, },
clear() { clear() {
...@@ -308,7 +322,7 @@ ...@@ -308,7 +322,7 @@
} }
.conditon-block{ .conditon-block{
position: absolute; position: fixed;
left: 0; left: 0;
top: 88rpx; top: 88rpx;
right: 0; right: 0;
...@@ -323,7 +337,7 @@ ...@@ -323,7 +337,7 @@
} }
.conditon-block-auto{ .conditon-block-auto{
height: auto; height: 460rpx;
overflow:auto; overflow:auto;
max-height:230px; max-height:230px;
} }
...@@ -342,27 +356,42 @@ ...@@ -342,27 +356,42 @@
transform: rotate(180deg); transform: rotate(180deg);
} }
.filter-title{
display: flex;
}
.filter-btn{ .filter-btn{
flex: 0 0 148rpx; flex: 1;
min-width:148rpx;
max-width:148rpx;
height: 68rpx; height: 68rpx;
line-height: 68rpx; line-height:unset;
background: #f8f8f8; background: #f8f8f8;
border-radius: 16rpx; border-radius: 16rpx;
color: #8e8e8e;
font-size: 24rpx;
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
margin-left: 0;
border: 2rpx solid #f8f8f8; border: 2rpx solid #f8f8f8;
} }
.filter-btn__text{
height: 68rpx;
line-height: 68rpx;
color: #8e8e8e;
font-size: 24rpx;
}
.filter-btn-active{ .filter-btn-active{
background: #f61d30; background: #f61d30;
color: #fff;
border: 2rpx solid #f61d30; 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; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
......
pages/produce-order/produce-plan.nvue
View file @ 97345d64
This diff is collapsed.
pages/purchase-plan/purchase-plan.nvue
View file @ 97345d64
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<text class="detal-item-value">7</text> <text class="detal-item-value">7</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
height: 284rpx; height: 284rpx;
opacity: 0.72; opacity: 0.72;
margin-top: -88rpx; margin-top: -88rpx;
background: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%); background-image: linear-gradient(232deg, #f4e2e2 25%, #faf3f3 98%);
} }
.lists { .lists {
...@@ -143,13 +143,14 @@ ...@@ -143,13 +143,14 @@
flex-direction: column; flex-direction: column;
overflow-y: scroll; overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
flex: 1;
height: 100%; height: 100%;
} }
.main { .main {
flex-direction: column; flex-direction: column;
margin-top: -164rpx; margin-top: -164rpx;
padding: 0 16rpx; padding: 0 16rpx;
} }
.middle { .middle {
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
} }
.item-block { .item-block {
over-overflow: hidden; overlow: hidden;
} }
.item-block-label { .item-block-label {
...@@ -267,27 +268,28 @@ ...@@ -267,27 +268,28 @@
flex-direction: column; flex-direction: column;
background: #f8f8f8; background: #f8f8f8;
border-radius: 20rpx; border-radius: 20rpx;
padding: 32rpx; padding: 32rpx;
margin-top: 32rpx;
} }
.block-detal-item { .block-detal-item {
display: flex; display: flex;
margin-bottom: 32rpx; margin-bottom: 32rpx;
justify-content: space-between; justify-content: space-between;
} }
.block-detal-item-last{ .block-detal-item-last{
margin-bottom: 0; margin-bottom: 0;
} }
.detal-item-label { .detal-item-label {
color: #999; color: #999;
font-size: 24rpx; font-size: 24rpx;
} }
.detal-item-value{ .detal-item-value{
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
} }
.btn { .btn {
...@@ -301,4 +303,4 @@ ...@@ -301,4 +303,4 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
</style> </style>
pages/purchase/purchase.nvue
View file @ 97345d64
This diff is collapsed.
pages/quota/order-upload.nvue
View file @ 97345d64
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -296,4 +296,4 @@ ...@@ -296,4 +296,4 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
</style> </style>
pages/quota/quota-order.nvue
View file @ 97345d64
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -398,4 +398,4 @@ ...@@ -398,4 +398,4 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> </style>
pages/select-business/select-business.nvue
View file @ 97345d64
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -315,4 +315,4 @@ ...@@ -315,4 +315,4 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
</style> </style>
pages/select-client/select-client.nvue
View file @ 97345d64
This diff is collapsed.
pages/select-group-client/select-group-client.nvue
View file @ 97345d64
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
} }
.text-block { .text-block {
over-overflow: hidden; overlow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
...@@ -319,4 +319,4 @@ ...@@ -319,4 +319,4 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
</style> </style>
pages/select-product/select-product.nvue
View file @ 97345d64
This diff is collapsed.
pages/ticket-order/ticket-order.nvue
View file @ 97345d64
This diff is collapsed.
pages/usercenter/usercenter.nvue
View file @ 97345d64
This diff is collapsed.
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