Skip to content

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

销售订单联调 apk包打包测试

parent 2808db7f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22226 additions and 20507 deletions
main.js
View file @ b5a86c68
...@@ -22,9 +22,11 @@ const app = new Vue({ ...@@ -22,9 +22,11 @@ const app = new Vue({
...App ...App
}) })
// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用 /* #ifdef H5 */
// http拦截器， 将此部分放在new Vue() 和app.$mount() 之间， 才能App.vue中正常使用
import httpInterceptor from '@/servers/http.interceptor.js'; import httpInterceptor from '@/servers/http.interceptor.js';
Vue.use(httpInterceptor, app); Vue.use(httpInterceptor, app);
/* #endif */
app.$mount() app.$mount()
// #endif // #endif
......
manifest.json
View file @ b5a86c68
{ {
"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" : {}
"icons": { },
"android": { "icons" : {
"hdpi": "unpackage/res/icons/72x72.png", "android" : {
"xhdpi": "unpackage/res/icons/96x96.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxhdpi" : "unpackage/res/icons/144x144.png",
}, "xxxhdpi" : "unpackage/res/icons/192x192.png"
"ios": { },
"appstore": "unpackage/res/icons/1024x1024.png", "ios" : {
"ipad": { "appstore" : "unpackage/res/icons/1024x1024.png",
"app": "unpackage/res/icons/76x76.png", "ipad" : {
"app@2x": "unpackage/res/icons/152x152.png", "app" : "unpackage/res/icons/76x76.png",
"notification": "unpackage/res/icons/20x20.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification" : "unpackage/res/icons/20x20.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"settings": "unpackage/res/icons/29x29.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings" : "unpackage/res/icons/29x29.png",
"spotlight": "unpackage/res/icons/40x40.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight" : "unpackage/res/icons/40x40.png",
}, "spotlight@2x" : "unpackage/res/icons/80x80.png"
"iphone": { },
"app@2x": "unpackage/res/icons/120x120.png", "iphone" : {
"app@3x": "unpackage/res/icons/180x180.png", "app@2x" : "unpackage/res/icons/120x120.png",
"notification@2x": "unpackage/res/icons/40x40.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"settings@2x": "unpackage/res/icons/58x58.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@2x" : "unpackage/res/icons/80x80.png",
} "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
} }
}, }
/* SDK配置 */ },
"quickapp": {}, /* SDK配置 */
/* 快应用特有相关 */ "quickapp" : {},
"mp-weixin": { /* 快应用特有相关 */
/* 小程序特有相关 */ "mp-weixin" : {
"appid": "", /* 小程序特有相关 */
"setting": { "appid" : "",
"urlCheck": false "setting" : {
}, "urlCheck" : false
"usingComponents": true },
}, "usingComponents" : true
"h5": { },
"devServer": { "h5" : {
"https": false, "devServer" : {
"port": "8080", "https" : false,
"disableHostCheck": true, "port" : "8080",
"proxy": { "disableHostCheck" : true,
"/sap": { "proxy" : {
"target": "http://10.0.134.45:8000", "/sap" : {
"changeOrigin": true "target" : "http://10.0.134.45:8000",
}, "changeOrigin" : true
"/crm-app": { },
"target": "http://10.0.135.139:8080", "/crm-app" : {
"changeOrigin": true "target" : "http://10.0.135.139:8080",
} "changeOrigin" : true
} }
} }
} }
}
} }
pages/group-buy/group-baseinfo.nvue
View file @ b5a86c68
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerYearChange" mode="selector" <picker class="picker-block" @change="bindPickerYearChange" mode="selector"
range-key='value' :value="condition.ZZFLD000099" :range="status"> range-key='value' :value="condition.ZZFLD000099" :range="status">
<text class="uni-input">{{status[condition.ZZFLD000099].value}}</text> <text class="uni-input-text">{{status[condition.ZZFLD000099].value}}</text>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -315,6 +315,11 @@ ...@@ -315,6 +315,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/no-quota/quota-order.nvue
View file @ b5a86c68
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr"> :value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr">
<view class="uni-input"> <view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}} <text
class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
checked: false, checked: false,
'quantity': 0, 'quantity': 0,
'total': 0, 'total': 0,
NET_VALUE: 0,
'product_info': {}, 'product_info': {},
}], }],
HEADINFO: {}, HEADINFO: {},
...@@ -299,6 +301,7 @@ ...@@ -299,6 +301,7 @@
'NET_VALUE': '', 'NET_VALUE': '',
'quantity': 0, 'quantity': 0,
'total': 0, 'total': 0,
NET_VALUE: 0,
'product_info': {} 'product_info': {}
} }
this.planinnerLists.unshift(product) this.planinnerLists.unshift(product)
...@@ -416,6 +419,11 @@ ...@@ -416,6 +419,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/order-detail-group/order-detail-group.nvue
View file @ b5a86c68
...@@ -284,7 +284,6 @@ ...@@ -284,7 +284,6 @@
} }
.title-info__status { .title-info__status {
width: 120rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ b5a86c68
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
<view class="top"> <view class="top">
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status title-info__status-done" <button class="title-info__status title-info__status-done" type="default"><text
type="default">{{INFO.STATUS_TEXT}}</button> class="title-info__status-text">{{INFO.STATUS_TEXT}}</text>
</button>
</view> </view>
</view> </view>
<view class="order-main-middle view"> <view class="order-main-middle view">
...@@ -30,7 +31,8 @@ ...@@ -30,7 +31,8 @@
</view> </view>
</view> </view>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"> <view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}" ref='receiveInfo'
:style="receiveInfoHeightComputed">
<view class="middle view" v-for="(item,index) in ITEM" :key="index"> <view class="middle view" v-for="(item,index) in ITEM" :key="index">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">{{item.ZZFLD000005_Z1}}</text> <text class="item-block-label">{{item.ZZFLD000005_Z1}}</text>
...@@ -145,7 +147,8 @@ ...@@ -145,7 +147,8 @@
ITEM: [], ITEM: [],
INFO: {}, INFO: {},
ATTACHMENT: [] ATTACHMENT: []
} },
receiveInfoHeight: '132',
} }
}, },
computed: { computed: {
...@@ -163,6 +166,11 @@ ...@@ -163,6 +166,11 @@
}, },
ATTACHMENT() { ATTACHMENT() {
return this.orderDetail.ATTACHMENT || [] return this.orderDetail.ATTACHMENT || []
},
receiveInfoHeightComputed() {
return {
"height": `${this.receiveInfoHeight}px`
}
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -179,6 +187,11 @@ ...@@ -179,6 +187,11 @@
}, },
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = '480'
} else {
this.receiveInfoHeight = '132'
}
}, },
} }
} }
...@@ -236,7 +249,6 @@ ...@@ -236,7 +249,6 @@
} }
.title-info__status { .title-info__status {
width: 120rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
...@@ -411,7 +423,7 @@ ...@@ -411,7 +423,7 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
z-index: 10; z-index: 10;
width: 100%; width: 750rpx;
height: 120rpx; height: 120rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
...@@ -430,6 +442,12 @@ ...@@ -430,6 +442,12 @@
} }
.float-btn__text {
font-size: 24rpx;
}
.icon-arrow { .icon-arrow {
width: 7px; width: 7px;
height: 4px; height: 4px;
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ b5a86c68
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
<view class="top"> <view class="top">
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default">{{INFO.STATUS_TEXT}}</button> <button class="title-info__status" type="default">
<text class="title-info__status-text">{{INFO.STATUS_TEXT}}</text>
</button>
</view> </view>
</view> </view>
<view class="order-main-middle view"> <view class="order-main-middle view">
...@@ -29,7 +31,8 @@ ...@@ -29,7 +31,8 @@
</view> </view>
</view> </view>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"> <view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}" ref='receiveInfo'
:style="receiveInfoHeightComputed">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">计划内</text> <text class="item-block-label">计划内</text>
...@@ -161,7 +164,8 @@ ...@@ -161,7 +164,8 @@
ITEM_OUTER: [], ITEM_OUTER: [],
INFO: {}, INFO: {},
ATTACHMENT: [] ATTACHMENT: []
} },
receiveInfoHeight: '132',
} }
}, },
computed: { computed: {
...@@ -182,6 +186,11 @@ ...@@ -182,6 +186,11 @@
}, },
ATTACHMENT() { ATTACHMENT() {
return this.orderDetail.ATTACHMENT || [] return this.orderDetail.ATTACHMENT || []
},
receiveInfoHeightComputed() {
return {
"height": `${this.receiveInfoHeight}px`
}
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -198,6 +207,11 @@ ...@@ -198,6 +207,11 @@
}, },
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = '480'
} else {
this.receiveInfoHeight = '132'
}
}, },
} }
} }
...@@ -255,15 +269,18 @@ ...@@ -255,15 +269,18 @@
} }
.title-info__status { .title-info__status {
width: 120rpx; width: 160rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx; border-radius: 200rpx;
border: 1px solid #f61d30; border: 1px solid #f61d30;
text-align: center;
}
.title-info__status-text {
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center;
} }
.title-info__status:after { .title-info__status:after {
...@@ -430,7 +447,7 @@ ...@@ -430,7 +447,7 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
z-index: 10; z-index: 10;
width: 100%; width: 750rpx;
height: 120rpx; height: 120rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
...@@ -448,6 +465,10 @@ ...@@ -448,6 +465,10 @@
justify-content: center; justify-content: center;
} }
.float-btn__text {
font-size: 24rpx;
}
.icon-arrow { .icon-arrow {
width: 7px; width: 7px;
......
pages/produce-material/produce-material.nvue
View file @ b5a86c68
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
}, },
methods: { methods: {
loadData(refresh) { loadData(refresh) {
console.log(2)
if (this.isLoading) { if (this.isLoading) {
return; return;
} }
...@@ -154,7 +155,7 @@ ...@@ -154,7 +155,7 @@
...this.condition, ...this.condition,
...this.page ...this.page
} }
console.log(3)
apiGetProduceMaterialOrder(params).then((res) => { apiGetProduceMaterialOrder(params).then((res) => {
console.log('loadData', res) console.log('loadData', res)
const { const {
......
pages/produce-material/produce-plan.nvue
View file @ b5a86c68
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='TEXT' :range="selectedSalesCenterArr"> :value="salesCenterIndex" range-key='TEXT' :range="selectedSalesCenterArr">
<view class="uni-input"> <view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].TEXT || '请选择'}} <text class="uni-input-text">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].TEXT || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -459,6 +460,11 @@ ...@@ -459,6 +460,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/produce-order/produce-plan.nvue
View file @ b5a86c68
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='TEXT' :range="selectedSalesCenterArr"> :value="salesCenterIndex" range-key='TEXT' :range="selectedSalesCenterArr">
<view class="uni-input"> <view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].TEXT || '请选择'}} <text
class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].TEXT || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -369,6 +370,7 @@ ...@@ -369,6 +370,7 @@
flex-direction: column; flex-direction: column;
padding: 32rpx 16rpx 0; padding: 32rpx 16rpx 0;
background: #f0f4f5; background: #f0f4f5;
// height: 100%;
} }
.middle { .middle {
...@@ -441,6 +443,11 @@ ...@@ -441,6 +443,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/purchase-plan/purchase-plan.nvue
View file @ b5a86c68
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerYearChange" mode="date" <picker class="picker-block" @change="bindPickerYearChange" mode="date"
:value="condition.RT_GJAHR[0].LOW" fields='year'> :value="condition.RT_GJAHR[0].LOW" fields='year'>
<text class="uni-input">{{condition.RT_GJAHR[0].LOW}}</text> <text class="uni-input-text">{{condition.RT_GJAHR[0].LOW}}</text>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
<picker class="picker-block" @change="bindPickerTypesChange" range-key='VALUE' <picker class="picker-block" @change="bindPickerTypesChange" range-key='VALUE'
mode="selector" :value="typesIndex" :range="selectedSalePlanTypes"> mode="selector" :value="typesIndex" :range="selectedSalePlanTypes">
<view class="uni-input"> <view class="uni-input">
{{selectedSalePlanTypes[typesIndex] && selectedSalePlanTypes[typesIndex].VALUE || '请选择'}} <text
class="uni-input-text">{{selectedSalePlanTypes[typesIndex] && selectedSalePlanTypes[typesIndex].VALUE || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -273,6 +274,11 @@ ...@@ -273,6 +274,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/quota/quota-order.nvue
View file @ b5a86c68
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr"> :value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr">
<view class="uni-input"> <view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}} <text
class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -182,6 +183,7 @@ ...@@ -182,6 +183,7 @@
checked: false, checked: false,
'quantity': 0, 'quantity': 0,
'total': 0, 'total': 0,
NET_VALUE: 0,
'product_info': {}, 'product_info': {},
'salesplan_info': {} 'salesplan_info': {}
}], }],
...@@ -193,11 +195,11 @@ ...@@ -193,11 +195,11 @@
...mapState(['quotaOrder', 'userInfo']), ...mapState(['quotaOrder', 'userInfo']),
intotalComputed() { intotalComputed() {
let money = 0 let money = 0
this.planinnerLists.forEach((item) => { this.planinnerLists.length > 0 && this.planinnerLists.forEach((item) => {
money += item.NET_VALUE money += item.NET_VALUE * 1
}) })
this.planoutLists.forEach((item) => { this.planoutLists.length > 0 && this.planoutLists.forEach((item) => {
money += item.NET_VALUE money += item.NET_VALUE * 1
}) })
return money return money
} }
...@@ -479,6 +481,7 @@ ...@@ -479,6 +481,7 @@
'NET_VALUE': '', 'NET_VALUE': '',
'quantity': 0, 'quantity': 0,
'total': 0, 'total': 0,
NET_VALUE: 0,
'product_info': {}, 'product_info': {},
'salesplan_info': {} 'salesplan_info': {}
} }
...@@ -598,6 +601,11 @@ ...@@ -598,6 +601,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/select-sale-plan/select-sale-plan.vue
View file @ b5a86c68
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
</view> </view>
<uni-swipe-action class="planout-block-lists"> <uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="(item,index) in lists" :key='item.index' :threshold='100' <uni-swipe-action-item v-for="(item,index) in lists" :key='index' :threshold='100' :auto-close="false"
:auto-close="false" :disabled='true' :show="isOpened"> :disabled='true' :show="isOpened">
<template v-slot:left> <template v-slot:left>
<view class="swipe-right-block" @click.stop="handleChecked($event,item, index)"><text <view class="swipe-right-block" @click.stop="handleChecked($event,item, index)"><text
class="swipe-right-block__text" class="swipe-right-block__text"
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
flex-direction: column; flex-direction: column;
overflow-y: scroll; overflow-y: scroll;
background: #f0f4f5; background: #f0f4f5;
height: 100%; height: 100vh;
} }
.main { .main {
......
servers/api.helper.js
View file @ b5a86c68
...@@ -2,6 +2,9 @@ import { ...@@ -2,6 +2,9 @@ import {
deepMerge deepMerge
} from "@/utils/index.js"; } from "@/utils/index.js";
import validate from "@/utils/validate.js"; import validate from "@/utils/validate.js";
import {
Base64
} from 'js-base64'
class Request { class Request {
// 设置全局默认配置 // 设置全局默认配置
setConfig(customConfig) { setConfig(customConfig) {
...@@ -21,15 +24,18 @@ class Request { ...@@ -21,15 +24,18 @@ class Request {
} }
this.options = interceptorRequest; this.options = interceptorRequest;
} }
options.dataType = options.dataType || this.config.dataType; options.dataType = options.dataType || this.config.dataType;
options.responseType = options.responseType || this.config.responseType; options.responseType = options.responseType || this.config.responseType;
options.url = options.url || ''; options.url = options.url || '';
options.params = options.params || {}; options.params = options.params || {};
options.header = Object.assign({}, this.config.header, options.header); options.header = Object.assign({}, this.config.header, options.header);
options.method = options.method || this.config.method; options.method = options.method || this.config.method;
// console.log('api.helper-----request', options, this.options)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
options.complete = (response) => { options.complete = (response) => {
// console.log('api.helper---options.complete', response)
// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading) // 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
uni.hideLoading(); uni.hideLoading();
// 清除定时器，如果请求回来了，就无需loading // 清除定时器，如果请求回来了，就无需loading
...@@ -124,9 +130,26 @@ class Request { ...@@ -124,9 +130,26 @@ class Request {
// 拦截器 // 拦截器
this.interceptor = { this.interceptor = {
// 请求前的拦截 // 请求前的拦截
request: null, request: (config) => {
config.header['Authorization'] = `Basic ${Base64.encode('wangpc:LZY888@@')}`;
console.log('interceptor---config-----', config)
return config;
},
// 请求后的拦截 // 请求后的拦截
response: null response: (res) => {
console.log('interceptor---response-----', res)
if (res.MSGTYPE === 'S' || res.msgtype === 'S') {
// 如果把originalData设置为了true，这里return回什么，this.$u.post的then回调中就会得到什么
return res;
} else {
uni.showToast({
title: res.MESSAGE || res.message,
duration: 2000,
icon: 'none'
});
return false
};
}
} }
// get请求 // get请求
......
servers/http.interceptor.js
View file @ b5a86c68
...@@ -31,7 +31,7 @@ const install = (Vue, vm) => { ...@@ -31,7 +31,7 @@ const install = (Vue, vm) => {
// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的，所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值 // 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的，所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
// const token = uni.getStorageSync('token'); // const token = uni.getStorageSync('token');
// config.header.token = token; // config.header.token = token;
console.log('http.interceptor.request', config)
return config; return config;
} }
// 响应拦截，判断状态码是否通过 // 响应拦截，判断状态码是否通过
......
servers/produceMaterial.js
View file @ b5a86c68
import apiHelper from './api.helper.js' import apiHelper from './api.helper.js'
/** /**
* 根据搜索条件查询材料计划信息。 * 根据搜索条件查询材料计划信息。
* @param name 账户名 * @param name 账户名
......
unpackage/dist/dev/app-plus/app-service.js
View file @ b5a86c68
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ b5a86c68
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/manifest.json
View file @ b5a86c68
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"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"},"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"}}},"google":{"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\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/home/home\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.4.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/plan@3x.png","selectedIconPath":"static/image/plan@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/shop@3x.png","selectedIconPath":"static/image/shop@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/message@3x.png","selectedIconPath":"static/image/message@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/usercenter@3x.png","selectedIconPath":"static/image/usercenter@3x.png","text":"我的"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__343534B","name":"五粮液APP","version":{"name":"1.0.0","code":"100"},"description":"订货系统","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"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"},"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"}}},"google":{"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\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"me\",\"query\":\"uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1\",\"id\":0,\"pathName\":\"pages/home/home\"}","allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.4.7","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/plan@3x.png","selectedIconPath":"static/image/plan@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/shop@3x.png","selectedIconPath":"static/image/shop@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/message@3x.png","selectedIconPath":"static/image/message@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/usercenter@3x.png","selectedIconPath":"static/image/usercenter@3x.png","text":"我的"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/app-plus/pages/apply-delivery/apply-delivery.js
View file @ b5a86c68
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/plan/plan.js
View file @ b5a86c68
This source diff could not be displayed because it is too large. You can view the blob instead.
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