Skip to content

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

bug修复

parent a0763dc7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 142 deletions
manifest.json
View file @ 733dc164
{ {
"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\"/>",
...@@ -42,90 +42,90 @@ ...@@ -42,90 +42,90 @@
"<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": {
"dSYMs" : false "dSYMs": false
}, },
/* 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": {
// "": { // "": {
// "target": "http://221.10.127.60:5000", // "target": "http://221.10.127.60:5000",
// "changeOrigin": true // "changeOrigin": true
// } // }
"/sap" : { "/sap": {
"target" : "http://221.10.127.60:5000/wlySap", "target": "http://221.10.127.60:5000/wlySap",
// "target": "http://10.0.134.182:8000", // "target": "http://10.0.134.182:8000",
"changeOrigin" : true "changeOrigin": true
}, },
"/crm-app" : { "/crm-app": {
// "target": "http://10.0.135.61", // "target": "http://10.0.135.61",
// "target": "http://10.0.135.139", // "target": "http://10.0.135.139",
"target" : "http://221.10.127.60:5000", "target": "http://221.10.127.60:5000",
"changeOrigin" : true "changeOrigin": true
}, },
"/wmdpwebservices" : { "/wmdpwebservices": {
"target" : "http://221.10.127.60:5000/sczx", "target": "http://221.10.127.60:5000/sczx",
// "target": "https://10.0.134.182:9002", // "target": "https://10.0.134.182:9002",
"changeOrigin" : true "changeOrigin": true
}, },
"/adapter" : { "/adapter": {
"target" : "http://221.10.127.60:5000/cyj", // "target" : "http://221.10.127.60:5000/cyj",
// "target": "http://api.c0331.dev.guanyingyun.com", "target": "http://api.c0331.dev.guanyingyun.com",
"changeOrigin" : true "changeOrigin": true
} }
} }
} }
......
pages/diy-wine/diy-wine.vue
View file @ 733dc164
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
"Pagesize": "100", "Pagesize": "100",
...this.signParams ...this.signParams
} }
// const res = await apiGetCategoryDetail(params) const res = await apiGetCategoryDetail(params)
const res2 = { const res2 = {
Data: [{ Data: [{
"TemplateID": "2", "TemplateID": "2",
......
pages/group-buy/order-upload.nvue
View file @ 733dc164
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
INFO, INFO,
ITEM, ITEM,
ATTACHMENT, ATTACHMENT,
"USER_BP": this.userInfo.code || "0081000010", "USER_BP": this.userInfo.code,
"ROLE": "WLYALL" "ROLE": "WLY001"
} }
const res = await apiUpdateGroupOrder(params) const res = await apiUpdateGroupOrder(params)
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
"INFO": INFO2, "INFO": INFO2,
'ITEM': ITEM2, 'ITEM': ITEM2,
"ATTACHMENT": ATTACHMENT2, "ATTACHMENT": ATTACHMENT2,
"USER_BP": this.userInfo.code || "0081000010", "USER_BP": this.userInfo.code,
"ROLE": "WLYALL" "ROLE": "WLY001"
} }
const res2 = await apiUpdateGroupOrder(params2) const res2 = await apiUpdateGroupOrder(params2)
console.log('apiUpdateGroupOrder', res2) console.log('apiUpdateGroupOrder', res2)
......
pages/login/login.nvue
View file @ 733dc164
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
export default { export default {
data() { data() {
return { return {
account: '', account: '0050000215',
// password: 'DO1tjHPW0Z', // password: 'DO1tjHPW0Z',
password: '', password: 'Wly12345',
phone: '', phone: '',
code: '', code: '',
loginType: 'password', loginType: 'password',
......
pages/no-quota/quota-order.nvue
View file @ 733dc164
...@@ -351,6 +351,15 @@ ...@@ -351,6 +351,15 @@
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
}, },
nextStep() { nextStep() {
if (this.salesCenterIndex === -1) {
uni.showToast({
title: '请先选择营销中心',
duration: 2000,
icon: 'none'
});
return
}
let noQuotaOrder = { let noQuotaOrder = {
'ITEM': this.planinnerLists, 'ITEM': this.planinnerLists,
'item_d': [], 'item_d': [],
......
pages/quota/quota-order.nvue
View file @ 733dc164
...@@ -556,6 +556,15 @@ ...@@ -556,6 +556,15 @@
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
}, },
nextStep() { nextStep() {
if (this.salesCenterIndex === -1) {
uni.showToast({
title: '请先选择营销中心',
duration: 2000,
icon: 'none'
});
return
}
let quotaOrder = { let quotaOrder = {
'ITEM_INNER': this.planinnerLists, 'ITEM_INNER': this.planinnerLists,
'ITEM_OUTER': this.planoutLists, 'ITEM_OUTER': this.planoutLists,
......
servers/api.helper.js
View file @ 733dc164
...@@ -176,8 +176,8 @@ class Request { ...@@ -176,8 +176,8 @@ class Request {
// config.baseUrl = 'http://10.0.135.61' // config.baseUrl = 'http://10.0.135.61'
config.baseUrl = 'http://221.10.127.60:5000' config.baseUrl = 'http://221.10.127.60:5000'
} else if (config.url.indexOf('adapter') !== -1) { } else if (config.url.indexOf('adapter') !== -1) {
// config.baseUrl = 'http://api.c0331.dev.guanyingyun.com' config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
config.baseUrl = 'http://221.10.127.60:5000/cyj' // config.baseUrl = 'http://221.10.127.60:5000/cyj'
} else if (config.url.indexOf('wmdpwebservices') !== -1) { } else if (config.url.indexOf('wmdpwebservices') !== -1) {
// config.baseUrl = 'https://10.0.134.182:9002' // config.baseUrl = 'https://10.0.134.182:9002'
config.baseUrl = 'http://221.10.127.60:5000/sczx' config.baseUrl = 'http://221.10.127.60:5000/sczx'
......
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