Skip to content

W
wly-APP
Commit 11b66a7c authored by xiangzj's avatar xiangzj
Browse files
Options

UI修复

parent 2cf1ae9f
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 37 deletions
manifest.json
View file @ 11b66a7c
......@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F",
"description" : "订货系统",
"versionName" : "1.1.35",
"versionCode" : "10135",
"versionName" : "1.1.36",
"versionCode" : "10136",
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
......@@ -20,7 +20,10 @@
"nvue" : {
"flex-direction" : "row"
},
"modules" : {},
"modules" : {
"Barcode" : {},
"Camera" : {}
},
/* 模块配置 */
"distribute" : {
/* 应用发布信息 */
......@@ -129,33 +132,33 @@
// "changeOrigin": true
// }
"/sap" : {
"target" : "http://218.89.67.37:8001/wlySap",
// "target" : "http://221.10.127.60:5000/wlySap",
// "target" : "http://218.89.67.37:8001/wlySap",
"target" : "http://221.10.127.60:5000/wlySap",
"changeOrigin" : true
},
"/crm-app" : {
"target" : "http://218.89.67.37:8001",
// "target" : "http://221.10.127.60:5000",
// "target" : "https://crm.wuliangye.com.cn",
"target" : "http://221.10.127.60:5000",
"changeOrigin" : true
},
"/wmdp-storeapp" : {
"target" : "http://218.89.67.37:8001/gateway/zdcx",
// "target" : "http://221.10.127.60:5000/gateway/zdcx",
// "target" : "https://crm.wuliangye.com.cn/gateway/zdcx",
"target" : "http://221.10.127.60:5000/gateway/zdcx",
"changeOrigin" : true
},
"/wmdpwebservices" : {
"target" : "http://218.89.67.37:8001/gateway/sczx",
// "target" : "http://221.10.127.60:5000/gateway/sczx",
// "target" : "https://crm.wuliangye.com.cn/gateway/sczx",
"target" : "http://221.10.127.60:5000/gateway/sczx",
"changeOrigin" : true
},
"/adapter" : {
"target" : "http://api.wuliangcreart.com",
// "target" : "http://221.10.127.60:5000/gateway/cyj",
// "target" : "http://api.wuliangcreart.com",
"target" : "http://221.10.127.60:5000/gateway/cyj",
"changeOrigin" : true
},
"/uusafe" : {
"target" : "https://apps.wuliangye.com.cn:9076",
// "target" : "https://zzy.ipincloud.cn:9070",
// "target" : "https://apps.wuliangye.com.cn:9076",
"target" : "https://zzy.ipincloud.cn:9070",
"changeOrigin" : true
}
}
......
pages/breakwords-clue/breakwords-clue.vue
View file @ 11b66a7c
......@@ -389,6 +389,7 @@
},
data() {
return {
flag: false,
condition: {
submitMethod: '',
submitMethodName: '',
......@@ -623,6 +624,10 @@
this.distributerByBarcode = {}
},
async submit() {
if(this.flag){
return
}
this.flag = true
let params = {
'supplyType': this.condition.supplyType,
'auditTime': this.condition.auditTime,
......@@ -679,11 +684,14 @@
uni.showToast({
title: '提报成功',
duration: 2000,
icon: 'none'
});
uni.navigateBack({
delta:1
});
success: () => {
setTimeout(() => {
uni.navigateBack({delta:1})
}, 1000)
}
})
}else{
this.flag = false
}
},
handleScan() {
......
pages/group-buy/quota-order.nvue
View file @ 11b66a7c
......@@ -265,6 +265,7 @@
this.salesCenterIndex = idx
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenterArr[this.salesCenterIndex].VALUE
}
});
this.planinnerLists = [...this.groupOrder.ITEM]
......
pages/no-quota/quota-order.nvue
View file @ 11b66a7c
......@@ -213,6 +213,7 @@
this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
}
if (this.isKeepData) {
const {
INFO,
......@@ -226,6 +227,7 @@
this.salesCenterIndex = YXDY.findIndex((item) => {
return this.HEADINFO.ZZFLD000001 === item.KEY
})
this.Marketing = this.selectedSalesCenterArr[this.salesCenterIndex].VALUE
return
}
......
pages/produce-material/produce-plan.nvue
View file @ 11b66a7c
......@@ -61,7 +61,7 @@
<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">{{item.description}}</text>
<text class="middle-date-margin-des">{{item.description}}</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
......@@ -458,6 +458,16 @@
height: 96rpx;
color: #888;
}
.middle-date-margin-des{
flex: 3;
font-size: 28rpx;
color: #888;
margin-top: 20rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year {
position: relative;
......
pages/produce-order/produce-plan.nvue
View file @ 11b66a7c
......@@ -34,7 +34,7 @@
<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">{{item.description}}</text>
<text class="middle-date-margin-des">{{item.description}}</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
......@@ -462,6 +462,16 @@
color: #888;
}
.middle-date-margin-des{
flex: 3;
font-size: 28rpx;
color: #888;
margin-top: 20rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year {
position: relative;
border-radius: 4px;
......
pages/quota/quota-order.nvue
View file @ 11b66a7c
......@@ -349,6 +349,7 @@
this.salesCenterIndex = YXDY.findIndex((item) => {
return this.HEADINFO.ZZFLD000001 === item.KEY
})
this.Marketing = this.selectedSalesCenterArr[this.salesCenterIndex].VALUE
return
}
this.planinnerLists[0] = {
......
pages/select-product-pro/select-product-pro.vue
View file @ 11b66a7c
......@@ -41,7 +41,7 @@
</view>
<view class="text-block">
<text class="middle-date middle-date-select">描述</text>
<text class="middle-date-des middle-date-des-select">{{item.SHORT_TEXT}}</text>
<text class="middle-date-margin-des middle-date-des-select">{{item.SHORT_TEXT}}</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">产品类型</text>
......@@ -345,7 +345,7 @@
.text-block {
display: flex;
overflow: hidden;
height: 96rpx;
// height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
}
......@@ -373,7 +373,16 @@
text-overflow: ellipsis;
color: #888;
}
.middle-date-margin-des{
flex: 3;
font-size: 28rpx;
color: #888;
margin-top: 20rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.middle-date-select {
color: #888;
}
......
servers/api.helper.js
View file @ 11b66a7c
......@@ -183,23 +183,23 @@ class Request {
if (config.url.indexOf('crm-app') !== -1) {
config.baseUrl = 'http://218.89.67.37:8001'
// config.baseUrl = 'http://221.10.127.60:5000'
// config.baseUrl = 'http://218.89.67.37:8001'
config.baseUrl = 'http://221.10.127.60:5000'
} else if (config.url.indexOf('adapter') !== -1) {
config.baseUrl = 'http://api.wuliangcreart.com'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
// config.baseUrl = 'http://api.wuliangcreart.com'
config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
} else if (config.url.indexOf('wmdpwebservices') !== -1) {
config.baseUrl = 'http://218.89.67.37:8001/gateway/sczx'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
// config.baseUrl = 'http://218.89.67.37:8001/gateway/sczx'
config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
} else if (config.url.indexOf('wmdp-storeapp') !== -1) {
config.baseUrl = 'http://218.89.67.37:8001/gateway/zdcx'
// config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
// config.baseUrl = 'http://218.89.67.37:8001/gateway/zdcx'
config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
} else if (config.url.indexOf('uusafe') !== -1) {
config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
// config.baseUrl = 'https://zzy.ipincloud.cn:9070'
// config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
config.baseUrl = 'https://zzy.ipincloud.cn:9070'
} else {
config.baseUrl = 'http://218.89.67.37:8001/wlySap'
// config.baseUrl = 'http://221.10.127.60:5000/wlySap'
// config.baseUrl = 'http://218.89.67.37:8001/wlySap'
config.baseUrl = 'http://221.10.127.60:5000/wlySap'
}
} catch (e) {
console.log('error', e)
......
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