Skip to content

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

订单动态接口更换

parent 583ace75
Expand all Show whitespace changes
Inline Side-by-side
Showing with 828 additions and 692 deletions
manifest.json
View file @ a26b8b53
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F", // "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F", "appid" : "__UNI__EDB6A1F",
"description" : "订货系统", "description" : "订货系统",
"versionName" : "1.1.24", "versionName" : "1.1.25",
"versionCode" : "10124", "versionCode" : "10125",
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
"changeOrigin" : true "changeOrigin" : true
}, },
"/crm-app" : { "/crm-app" : {
// "target" : "http://10.0.135.61", // "target" : "https://218.89.67.37/",
"target" : "http://221.10.127.60:5000", "target" : "http://221.10.127.60:5000",
"changeOrigin" : true "changeOrigin" : true
}, },
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
}, },
"/uusafe" : { "/uusafe" : {
"target" : "https://zzy.ipincloud.cn:9070", "target" : "https://zzy.ipincloud.cn:9070",
// "target" : "https://apps.wuliangye.com.cn:9076",
"changeOrigin" : true "changeOrigin" : true
} }
} }
......
pages/diy-wine/diy-wine.vue
View file @ a26b8b53
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
'BoxCode': this.orderDetail.INFO.ZZFLD000098, 'BoxCode': this.orderDetail.INFO.ZZFLD000098,
// 'CallbackUrlList': JSON.stringify({WorksbackUrl:''}), // 'CallbackUrlList': JSON.stringify({WorksbackUrl:''}),
'City': this.orderDetail.INFO.ZZFLD000003_TEXT, 'City': this.orderDetail.INFO.ZZFLD000003_TEXT,
// County: this.orderDetail.INFO., 'County': this.orderDetail.INFO.STREET_TEXT,
'MobileNumber': this.orderDetail.INFO.ZZFLD00002M, 'MobileNumber': this.orderDetail.INFO.ZZFLD00002M,
// OrderAmount: "", // OrderAmount: "",
'OrderGoods': JSON.stringify(goodsInfo), 'OrderGoods': JSON.stringify(goodsInfo),
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
"SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F", "SecretKey": "8B72E5CB394E3CABB56DC8E04AC4DE7F",
'StoreCompanyName': this.orderDetail.INFO.CUST_NAME, 'StoreCompanyName': this.orderDetail.INFO.CUST_NAME,
'StoreName': this.orderDetail.INFO.CUST_NAME, 'StoreName': this.orderDetail.INFO.CUST_NAME,
"Sign": md5.hex_md5(`Action=guanying.adapter.crmorder.down&Address=${this.orderDetail.INFO.ZZFLD00002N}&BoxCode=${this.orderDetail.INFO.ZZFLD000098}&City=${this.orderDetail.INFO.ZZFLD000003_TEXT}&MobileNumber=${this.orderDetail.INFO.ZZFLD00002M}&OrderGoods=${JSON.stringify(goodsInfo)}&OutsideCoreOrderID=${this.orderDetail.INFO.OBJECT_ID}&Province=${this.orderDetail.INFO.ZZFLD000002_TEXT}&RealName=${this.orderDetail.INFO.ZZFLD00002L}&StoreCompanyName=${this.orderDetail.INFO.CUST_NAME}&StoreName=${this.orderDetail.INFO.CUST_NAME}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`) "Sign": md5.hex_md5(`Action=guanying.adapter.crmorder.down&Address=${this.orderDetail.INFO.ZZFLD00002N}&BoxCode=${this.orderDetail.INFO.ZZFLD000098}&City=${this.orderDetail.INFO.ZZFLD000003_TEXT}&County=${this.orderDetail.INFO.STREET_TEXT}&MobileNumber=${this.orderDetail.INFO.ZZFLD00002M}&OrderGoods=${JSON.stringify(goodsInfo)}&OutsideCoreOrderID=${this.orderDetail.INFO.OBJECT_ID}&Province=${this.orderDetail.INFO.ZZFLD000002_TEXT}&RealName=${this.orderDetail.INFO.ZZFLD00002L}&StoreCompanyName=${this.orderDetail.INFO.CUST_NAME}&StoreName=${this.orderDetail.INFO.CUST_NAME}&SecretKey=8B72E5CB394E3CABB56DC8E04AC4DE7F`)
} }
const res2 = await apiSubmitCustom(params2) const res2 = await apiSubmitCustom(params2)
if(res2.Status !== 'Success'){ if(res2.Status !== 'Success'){
......
pages/login/login.nvue
View file @ a26b8b53
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
cursorNumber: 0, cursorNumber: 0,
rememberPsw: true, rememberPsw: true,
rememberAt: true, rememberAt: true,
flag: false
} }
}, },
computed: { computed: {
...@@ -128,11 +129,13 @@ ...@@ -128,11 +129,13 @@
} }
}, },
onLoad() { onLoad() {
ToastPlusModule && this.initEx() ToastPlusModule && this.initEx()
}, },
onShow() { onShow() {
// 判断是否正在等待authEx的返回结果，第一次进入页面默认是false
if (!this.flag && !this.accessToken) {
ToastPlusModule && this.authEx() ToastPlusModule && this.authEx()
}
}, },
//页面初始加载 //页面初始加载
mounted() { mounted() {
...@@ -195,7 +198,10 @@ ...@@ -195,7 +198,10 @@
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
// 开启等待被唤醒
this.flag = true
ToastPlusModule.registerExSyncFunc({}, res => { ToastPlusModule.registerExSyncFunc({}, res => {
this.flag = false
this.accessToken = res.data?.token || res this.accessToken = res.data?.token || res
this.getIdToken() this.getIdToken()
}) })
......
pages/my-order/my-order.nvue
View file @ a26b8b53
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
}, },
mainHeight() { mainHeight() {
return { return {
'height': `${this.sysinfo.safeArea.height - 44 }px`, 'height': `${this.sysinfo.safeArea.height - 30 }px`,
} }
}, },
scrollHeight() { scrollHeight() {
......
pages/order-trends/order-trends.nvue
View file @ a26b8b53
This diff is collapsed.
pages/purchase-main/purchase-main.nvue
View file @ a26b8b53
...@@ -23,15 +23,15 @@ ...@@ -23,15 +23,15 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">制票类型</text> <text class="middle-date">制票类型</text>
<text class="middle-date-des">{{orderItem.noticeSheetTypeTextView}}</text> <text class="middle-date-margin-des">{{orderItem.noticeSheetTypeTextView}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">开票客户</text> <text class="middle-date">开票客户</text>
<text class="middle-date-des">{{orderItem.billCustomer}}</text> <text class="middle-date-margin-des">{{orderItem.billCustomer}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date" @tap="selectClient">订单客户</text> <text class="middle-date" @tap="selectClient">订单客户</text>
<text class="middle-date-des">{{orderItem.customerName}}</text> <text class="middle-date-margin-des">{{orderItem.customerName}}</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">渠道类型</text> <text class="middle-date">渠道类型</text>
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
.text-block { .text-block {
overflow: hidden; overflow: hidden;
height: 96rpx; // height: 96rpx;
// margin-bottom: 14rpx; // margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
} }
...@@ -455,10 +455,19 @@ ...@@ -455,10 +455,19 @@
flex: 3; flex: 3;
font-size: 28rpx; font-size: 28rpx;
height: 96rpx; height: 96rpx;
color: $text-base-color;
padding-top: 30rpx; padding-top: 30rpx;
justify-content: start; justify-content: start;
} }
.middle-date-margin-des{
flex: 3;
font-size: 28rpx;
color: $text-base-color;
padding-top: 30rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year { .picker-year {
position: relative; position: relative;
...@@ -535,4 +544,5 @@ ...@@ -535,4 +544,5 @@
line-height: 96rpx; line-height: 96rpx;
color: $text-base-color; color: $text-base-color;
} }
</style> </style>
pages/purchase-plan-detail/purchase-plan-detail.vue
View file @ a26b8b53
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="middle view"> <view class="middle view">
<view class="text-block"> <view class="text-block">
<text class="middle-date">存货分类</text> <text class="middle-date">存货分类</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.wlybrand_text}}</text> <text class="uni-input">{{clueDetail.wlybrand_text}}</text>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">客户名称</text> <text class="middle-date">客户名称</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.cust_name}}</text> <text class="uni-input">{{clueDetail.cust_name}}</text>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">计划类型</text> <text class="middle-date">计划类型</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-pro uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{clueDetail.plan_type_text}}</text> <text class="uni-input">{{clueDetail.plan_type_text}}</text>
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
.text-block { .text-block {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
height: 96rpx; // height: 96rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
} }
...@@ -289,12 +289,22 @@ ...@@ -289,12 +289,22 @@
.middle-date-des { .middle-date-des {
align-items: center; align-items: center;
flex: 5.5; flex: 3;
font-size: 24rpx; font-size: 24rpx;
color: $text-base-color; color: $text-base-color;
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
} }
.middle-date-pro {
align-items: center;
flex: 3;
font-size: 24rpx;
color: $text-base-color;
// height: 96rpx;
// line-height: 96rpx;
display: flex;
margin-top: 30rpx;
}
.uni-input-placeholder { .uni-input-placeholder {
color: #DBDBDB; color: #DBDBDB;
......
pages/purchase-receive/purchase-receive.nvue
View file @ a26b8b53
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName" <picker class="picker-block" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName"
range-key='PARTNER_NAME' mode="selector" :range="receiveUnitArr"> range-key='PARTNER_NAME' mode="selector" :range="receiveUnitArr">
<text class="middle-date-address-text">{{orderItem.receiveUnitName}}</text> <text class="middle-date-margin-des">{{orderItem.receiveUnitName}}</text>
</picker> </picker>
</view> </view>
</view> </view>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<view class="middle-date-des-unit uni-list picker-year"> <view class="middle-date-des-unit uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="middle-date-address-text">{{orderItem.spurtCodeUnitName}}</text> <text class="middle-date-margin-des">{{orderItem.spurtCodeUnitName}}</text>
</view> </view>
</view> </view>
<!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image> --> <!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image> -->
...@@ -589,6 +589,16 @@ ...@@ -589,6 +589,16 @@
line-height: 34rpx; line-height: 34rpx;
align-items: center; align-items: center;
} }
.middle-date-margin-des{
flex: 1;
font-size: 28rpx;
color: #333;
margin-top: 0rpx;
margin-bottom: 20rpx;
width: 200%;
text-align: left;
justify-content: end;
}
.picker-year { .picker-year {
position: relative; position: relative;
align-items: center; align-items: center;
......
servers/api.helper.js
View file @ a26b8b53
...@@ -183,7 +183,7 @@ class Request { ...@@ -183,7 +183,7 @@ class Request {
if (config.url.indexOf('crm-app') !== -1) { if (config.url.indexOf('crm-app') !== -1) {
// config.baseUrl = 'http://10.0.135.61' // config.baseUrl = 'https://crm.wuliangye.com.cn'
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'
...@@ -197,6 +197,7 @@ class Request { ...@@ -197,6 +197,7 @@ class Request {
config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx' config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
} else if (config.url.indexOf('uusafe') !== -1) { } else if (config.url.indexOf('uusafe') !== -1) {
config.baseUrl = 'https://zzy.ipincloud.cn:9070' config.baseUrl = 'https://zzy.ipincloud.cn:9070'
// config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
} else { } else {
// http://10.0.134.182:8000 // http://10.0.134.182:8000
config.baseUrl = 'http://221.10.127.60:5000/wlySap' config.baseUrl = 'http://221.10.127.60:5000/wlySap'
......
servers/breakwords.js
View file @ a26b8b53
...@@ -231,3 +231,12 @@ export async function queryNewsListSet(params) { ...@@ -231,3 +231,12 @@ export async function queryNewsListSet(params) {
const res = await apiHelper.get('/sap/opu/odata/sap/ZODATA_APP_006_SRV/SODYNSTATSet', params, {'Content-Type': 'application/json','Accept':'application/json'}) const res = await apiHelper.get('/sap/opu/odata/sap/ZODATA_APP_006_SRV/SODYNSTATSet', params, {'Content-Type': 'application/json','Accept':'application/json'})
return res return res
} }
/**
* 最终订单动态
* @returns {Promise<AxiosResponse<T>>}
*/
export async function findAppWantGoods(params) {
const res = await apiHelper.post('/crm-app/Invinfo/findAppWantGoods', params, {
})
return res
}
\ No newline at end of file
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