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",
"appid" : "__UNI__343534B",
"description" : "订货系统",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
"name": "五粮液APP",
"appid": "__UNI__343534B",
"description": "订货系统",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"app-plus": {
/* 5+App特有相关 */
"usingComponents" : true,
"nvueCompiler" : "uni-app",
"nvueStyleCompiler" : "uni-app",
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"usingComponents": true,
"nvueCompiler": "uni-app",
"nvueStyleCompiler": "uni-app",
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
"nvue" : {
"flex-direction" : "row"
"nvue": {
"flex-direction": "row"
},
"modules" : {},
"modules": {},
/* 模块配置 */
"distribute" : {
"distribute": {
/* 应用发布信息 */
"android" : {
"android": {
/* android打包配置 */
"permissions" : [
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
......@@ -42,90 +42,90 @@
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a" ]
"abiFilters": ["armeabi-v7a"]
},
"ios" : {
"dSYMs" : false
"ios": {
"dSYMs": false
},
/* ios打包配置 */
"sdkConfigs" : {
"ad" : {}
"sdkConfigs": {
"ad": {}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
}
}
},
/* SDK配置 */
"quickapp" : {},
"quickapp": {},
/* 快应用特有相关 */
"mp-weixin" : {
"mp-weixin": {
/* 小程序特有相关 */
"appid" : "",
"setting" : {
"urlCheck" : false
"appid": "",
"setting": {
"urlCheck": false
},
"usingComponents" : true
"usingComponents": true
},
"h5" : {
"devServer" : {
"https" : false,
"port" : "8080",
"disableHostCheck" : true,
"proxy" : {
"h5": {
"devServer": {
"https": false,
"port": "8080",
"disableHostCheck": true,
"proxy": {
// "": {
// "target": "http://221.10.127.60:5000",
// "changeOrigin": true
// }
"/sap" : {
"target" : "http://221.10.127.60:5000/wlySap",
"/sap": {
"target": "http://221.10.127.60:5000/wlySap",
// "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.139",
"target" : "http://221.10.127.60:5000",
"changeOrigin" : true
"target": "http://221.10.127.60:5000",
"changeOrigin": true
},
"/wmdpwebservices" : {
"target" : "http://221.10.127.60:5000/sczx",
"/wmdpwebservices": {
"target": "http://221.10.127.60:5000/sczx",
// "target": "https://10.0.134.182:9002",
"changeOrigin" : true
"changeOrigin": true
},
"/adapter" : {
"target" : "http://221.10.127.60:5000/cyj",
// "target": "http://api.c0331.dev.guanyingyun.com",
"changeOrigin" : true
"/adapter": {
// "target" : "http://221.10.127.60:5000/cyj",
"target": "http://api.c0331.dev.guanyingyun.com",
"changeOrigin": true
}
}
}
......
pages/diy-wine/diy-wine.vue
View file @ 733dc164
......@@ -195,7 +195,7 @@
"Pagesize": "100",
...this.signParams
}
// const res = await apiGetCategoryDetail(params)
const res = await apiGetCategoryDetail(params)
const res2 = {
Data: [{
"TemplateID": "2",
......
pages/group-buy/order-upload.nvue
View file @ 733dc164
......@@ -87,8 +87,8 @@
INFO,
ITEM,
ATTACHMENT,
"USER_BP": this.userInfo.code || "0081000010",
"ROLE": "WLYALL"
"USER_BP": this.userInfo.code,
"ROLE": "WLY001"
}
const res = await apiUpdateGroupOrder(params)
......@@ -104,8 +104,8 @@
"INFO": INFO2,
'ITEM': ITEM2,
"ATTACHMENT": ATTACHMENT2,
"USER_BP": this.userInfo.code || "0081000010",
"ROLE": "WLYALL"
"USER_BP": this.userInfo.code,
"ROLE": "WLY001"
}
const res2 = await apiUpdateGroupOrder(params2)
console.log('apiUpdateGroupOrder', res2)
......
pages/login/login.nvue
View file @ 733dc164
......@@ -57,9 +57,9 @@
export default {
data() {
return {
account: '',
account: '0050000215',
// password: 'DO1tjHPW0Z',
password: '',
password: 'Wly12345',
phone: '',
code: '',
loginType: 'password',
......
pages/no-quota/quota-order.nvue
View file @ 733dc164
......@@ -351,6 +351,15 @@
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
},
nextStep() {
if (this.salesCenterIndex === -1) {
uni.showToast({
title: '请先选择营销中心',
duration: 2000,
icon: 'none'
});
return
}
let noQuotaOrder = {
'ITEM': this.planinnerLists,
'item_d': [],
......
pages/quota/quota-order.nvue
View file @ 733dc164
......@@ -556,6 +556,15 @@
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
},
nextStep() {
if (this.salesCenterIndex === -1) {
uni.showToast({
title: '请先选择营销中心',
duration: 2000,
icon: 'none'
});
return
}
let quotaOrder = {
'ITEM_INNER': this.planinnerLists,
'ITEM_OUTER': this.planoutLists,
......
servers/api.helper.js
View file @ 733dc164
......@@ -176,8 +176,8 @@ class Request {
// config.baseUrl = 'http://10.0.135.61'
config.baseUrl = 'http://221.10.127.60:5000'
} else if (config.url.indexOf('adapter') !== -1) {
// config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
config.baseUrl = 'http://221.10.127.60:5000/cyj'
config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
// config.baseUrl = 'http://221.10.127.60:5000/cyj'
} else if (config.url.indexOf('wmdpwebservices') !== -1) {
// config.baseUrl = 'https://10.0.134.182:9002'
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