Skip to content

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

修复日期查询方式 修复事件监听全局消息问题

parent 4051e2d0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 134 deletions
manifest.json
View file @ 90f5265b
{ {
"name": "五粮液APP", "name" : "五粮液APP",
"appid": "__UNI__343534B", "appid" : "__UNI__343534B",
"description": "订货系统", "description" : "订货系统",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
"app-plus": { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
"usingComponents": true, "usingComponents" : true,
"nvueCompiler": "uni-app", "nvueCompiler" : "uni-app",
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"nvue": { "nvue" : {
"flex-direction": "row" "flex-direction" : "row"
}, },
"modules": {}, "modules" : {},
/* 模块配置 */ /* 模块配置 */
"distribute": { "distribute" : {
/* 应用发布信息 */ /* 应用发布信息 */
"android": { "android" : {
/* android打包配置 */ /* android打包配置 */
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters": ["armeabi-v7a"] "abiFilters" : [ "armeabi-v7a" ]
}, },
"ios": {}, "ios" : {},
/* ios打包配置 */ /* ios打包配置 */
"sdkConfigs": { "sdkConfigs" : {
"ad": {} "ad" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
} }
} }
}, },
/* SDK配置 */ /* SDK配置 */
"quickapp": {}, "quickapp" : {},
/* 快应用特有相关 */ /* 快应用特有相关 */
"mp-weixin": { "mp-weixin" : {
/* 小程序特有相关 */ /* 小程序特有相关 */
"appid": "", "appid" : "",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"usingComponents": true "usingComponents" : true
}, },
"h5": { "h5" : {
"devServer": { "devServer" : {
"https": false, "https" : false,
"port": "8080", "port" : "8080",
"disableHostCheck": true, "disableHostCheck" : true,
"proxy": { "proxy" : {
"/sap": { "/sap" : {
"target": "http://10.0.135.139/wlySap", "target" : "http://10.0.135.139/wlySap",
// "target" : "http://10.0.134.45:8000", // "target" : "http://10.0.134.45:8000",
"changeOrigin": true "changeOrigin" : true
}, },
"/crm-app": { "/crm-app" : {
"target": "http://10.0.135.139", "target" : "http://10.0.135.139",
// "target" : "http://10.2.4.2", // "target" : "http://10.2.4.2",
"changeOrigin": true "changeOrigin" : true
} }
} }
} }
} }
} }
pages/group-buy/group-baseinfo.nvue
View file @ 90f5265b
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
'ZZFLD00002L': '', // 收货联系人 'ZZFLD00002L': '', // 收货联系人
'ZZFLD00002M': '', // 收货联系电话 'ZZFLD00002M': '', // 收货联系电话
'ZZFLD00002N': '', // 收货地址 'ZZFLD00002N': '', // 收货地址
'PENGMETHOD': '', // 喷码方式
}, },
designIndex: 0, designIndex: 0,
status: [{ status: [{
...@@ -236,6 +237,14 @@ ...@@ -236,6 +237,14 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedBusiness')
uni.$off('selectedGroupClient2')
uni.$off('selectedAddress')
uni.$off('selectedPaintDesign')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedBusiness') uni.$off('selectedBusiness')
uni.$off('selectedGroupClient2') uni.$off('selectedGroupClient2')
uni.$off('selectedAddress') uni.$off('selectedAddress')
...@@ -275,7 +284,9 @@ ...@@ -275,7 +284,9 @@
this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME
break; break;
case 2: case 2:
this.selectPaintDesign() uni.navigateTo({
url: `/pages/select-paint-design/select-paint-design`
});
break; break;
default: default:
break; break;
......
pages/group-buy/quota-order.nvue
View file @ 90f5265b
...@@ -155,12 +155,16 @@ ...@@ -155,12 +155,16 @@
return item return item
}) })
_this.updateQuotaData(fromIndex, data.mode, product); _this.updateQuotaData(fromIndex, data.mode, product);
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedProduct')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedProduct') uni.$off('selectedProduct')
}, },
created() { created() {
...@@ -184,13 +188,20 @@ ...@@ -184,13 +188,20 @@
let productAfterInit = this.updateProductByInit(productIndex, mode, product) let productAfterInit = this.updateProductByInit(productIndex, mode, product)
console.log('productAfterInit', productAfterInit) console.log('productAfterInit', productAfterInit)
// 产品编号和件数 都有才请求
if (!(productAfterInit?.product_info?.PRODUCT_ID &&
productAfterInit?.ZZFLD000009)) {
return
}
if (mode === 'inner') { if (mode === 'inner') {
item_inner = [productAfterInit] item_inner = [productAfterInit]
} }
const params = { const params = {
"info": this.HEADINFO, "INFO": this.HEADINFO,
"item": item_inner, "ITEM": item_inner,
} }
const res = await apiUpdateGroupData(params) const res = await apiUpdateGroupData(params)
console.log('updateQuotaData', res) console.log('updateQuotaData', res)
......
pages/no-quota/quota-order.nvue
View file @ 90f5265b
...@@ -166,6 +166,11 @@ ...@@ -166,6 +166,11 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedProduct')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedProduct') uni.$off('selectedProduct')
}, },
methods: { methods: {
...@@ -207,8 +212,8 @@ ...@@ -207,8 +212,8 @@
} }
const params = { const params = {
"info": this.HEADINFO, "INFO": this.HEADINFO,
"item": item_inner, "ITEM": item_inner,
} }
const res = await apiUpdateNoQuotaData(params) const res = await apiUpdateNoQuotaData(params)
console.log('updateNoQuotaData', res) console.log('updateNoQuotaData', res)
......
pages/produce-material/produce-material.nvue
View file @ 90f5265b
...@@ -103,12 +103,12 @@ ...@@ -103,12 +103,12 @@
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==", refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
condition: { condition: {
PARTNER: '0050000215', PARTNER: '0050000215',
DATUM: { DATUM: [{
"SIGN": "I", "SIGN": "I",
"OPTION": "BT", "OPTION": "BT",
LOW: '', LOW: '',
HIGH: '' HIGH: ''
} }]
}, },
page: { page: {
"PAGE": "1", "PAGE": "1",
...@@ -276,13 +276,13 @@ ...@@ -276,13 +276,13 @@
handleFilter(item) { handleFilter(item) {
if (item === 'week') { if (item === 'week') {
this.filterActiveIndex = 0 this.filterActiveIndex = 0
this.condition.DATUM.LOW = timeRangeFormat('week') this.condition.DATUM[0].LOW = timeRangeFormat('week')
} else { } else {
this.filterActiveIndex = item this.filterActiveIndex = item
this.condition.DATUM.LOW = timeRangeFormat(item) this.condition.DATUM[0].LOW = timeRangeFormat(item)
} }
this.condition.DATUM.HIGH = timeRangeFormat('now') this.condition.DATUM[0].HIGH = timeRangeFormat('now')
this.onrefresh() this.onrefresh()
} }
} }
......
pages/produce-material/produce-plan.nvue
View file @ 90f5265b
...@@ -192,6 +192,11 @@ ...@@ -192,6 +192,11 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedProduct')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedProduct') uni.$off('selectedProduct')
}, },
methods: { methods: {
......
pages/produce-order/produce-order.nvue
View file @ 90f5265b
...@@ -102,12 +102,12 @@ ...@@ -102,12 +102,12 @@
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==", refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
condition: { condition: {
PARTNER: '0050000215', PARTNER: '0050000215',
DATUM: { DATUM: [{
"SIGN": "I", "SIGN": "I",
"OPTION": "BT", "OPTION": "BT",
LOW: '', LOW: '',
HIGH: '' HIGH: ''
} }]
}, },
page: { page: {
"PAGE": "1", "PAGE": "1",
...@@ -277,13 +277,13 @@ ...@@ -277,13 +277,13 @@
handleFilter(item) { handleFilter(item) {
if (item === 'week') { if (item === 'week') {
this.filterActiveIndex = 0 this.filterActiveIndex = 0
this.condition.DATUM.LOW = timeRangeFormat('week') this.condition.DATUM[0].LOW = timeRangeFormat('week')
} else { } else {
this.filterActiveIndex = item this.filterActiveIndex = item
this.condition.DATUM.LOW = timeRangeFormat(item) this.condition.DATUM[0].LOW = timeRangeFormat(item)
} }
this.condition.DATUM.HIGH = timeRangeFormat('now') this.condition.DATUM[0].HIGH = timeRangeFormat('now')
this.onrefresh() this.onrefresh()
} }
} }
......
pages/produce-order/produce-plan.nvue
View file @ 90f5265b
...@@ -176,6 +176,11 @@ ...@@ -176,6 +176,11 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedProduct')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedProduct') uni.$off('selectedProduct')
}, },
methods: { methods: {
......
pages/quota/quota-order.nvue
View file @ 90f5265b
...@@ -254,6 +254,12 @@ ...@@ -254,6 +254,12 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedSalePlan')
uni.$off('selectedProduct')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedSalePlan') uni.$off('selectedSalePlan')
uni.$off('selectedProduct') uni.$off('selectedProduct')
}, },
......
pages/quota/quota.nvue
View file @ 90f5265b
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
return this.currentTabComponent == 'orderUpload' return this.currentTabComponent == 'orderUpload'
}, },
componentHeight() { componentHeight() {
console.log('componentHeight', `${this.sysinfo.safeArea.height - 44 - this.topHeight}px`, this.sysinfo); // console.log('componentHeight', `${this.sysinfo.safeArea.height - 44 - this.topHeight}px`, this.sysinfo);
return { return {
'height': `${this.sysinfo.safeArea.height - 44 - this.topHeight}px`, 'height': `${this.sysinfo.safeArea.height - 44 - this.topHeight}px`,
'overflow-y': 'scroll' 'overflow-y': 'scroll'
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
let queryTabSize = uni.createSelectorQuery().in(this); let queryTabSize = uni.createSelectorQuery().in(this);
queryTabSize.select('#top').boundingClientRect(); queryTabSize.select('#top').boundingClientRect();
queryTabSize.exec(rects => { queryTabSize.exec(rects => {
console.log('rects', rects); // console.log('rects', rects);
rects.forEach((rect) => { rects.forEach((rect) => {
this.topHeight = rect.height; this.topHeight = rect.height;
}) })
......
pages/select-business/select-business.vue
View file @ 90f5265b
...@@ -188,6 +188,11 @@ ...@@ -188,6 +188,11 @@
}) })
}, },
onUnload() { onUnload() {
console.log('onUnload')
uni.$off('selectedGroupClient')
},
beforeDestroy() {
console.log('onUnload2')
uni.$off('selectedGroupClient') uni.$off('selectedGroupClient')
}, },
methods: { methods: {
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 90f5265b
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