diff --git a/pages/pay/index.vue b/pages/pay/index.vue index 6098acb..b962a20 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -470,20 +470,22 @@
-
{{ '升级会员信息' }}
+
{{ '会员信息' }}
-
{{ '升级编号' }}
+
{{ '会员编号' }}
{{ orderData.memberCode }}
-
{{ '升级姓名' }}
+
{{ '会员姓名' }}
{{ orderData.memberName }}
+
{{ '发货方式' }}
{{ orderData.deliveryWayVal }}
@@ -950,7 +952,7 @@ export default { url = this.specialArea == REGIEST_AREA.id ? api.payRegOrder - : api.upgradePay + : api.payOthOrder //api.upgradePay } else { url = api.payOthOrder } diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue index 4534342..c228992 100644 --- a/pages/upgrade/index.vue +++ b/pages/upgrade/index.vue @@ -969,26 +969,51 @@ export default { shoppingId: item, }) }) - upgradeOrder( - Object.assign({}, this.form, this.allGoodsData, { - deleteList: deleteList, - shopList: deleteList, - parentCode: this.form.parent, - upgradeMemberCode: this.form.memberCode, - }) - ).then(res => { - this.isLoading = false - if (res.code == 200) { - uni.redirectTo({ - url: - '/pages/pay/index?paramsPost=' + - JSON.stringify( - Object.assign({ specialArea: this.specialArea }, res.data) - ) + - '&businessType=1', + + api + .confirmOthOrder( + Object.assign({}, this.form, this.allGoodsData, { + deleteList: deleteList, + shopList: deleteList, + buyMemberCode: this.userInfo.memberCode, }) - } - }) + ) + .then(res => { + this.isLoading = false + + if (res.code == 200) { + const params = { + ...res.data, + specialArea: this.specialArea, + } + uni.redirectTo({ + url: + '/pages/pay/index?paramsPost=' + + JSON.stringify(params) + + '&businessType=1', + }) + } + }) + // upgradeOrder( + // Object.assign({}, this.form, this.allGoodsData, { + // deleteList: deleteList, + // shopList: deleteList, + // parentCode: this.form.parent, + // upgradeMemberCode: this.form.memberCode, + // }) + // ).then(res => { + // this.isLoading = false + // if (res.code == 200) { + // uni.redirectTo({ + // url: + // '/pages/pay/index?paramsPost=' + + // JSON.stringify( + // Object.assign({ specialArea: this.specialArea }, res.data) + // ) + + // '&businessType=1', + // }) + // } + // }) }) }, getDiqu() { diff --git a/util/specialAreaMap.js b/util/specialAreaMap.js index e88463c..9232909 100644 --- a/util/specialAreaMap.js +++ b/util/specialAreaMap.js @@ -5,7 +5,8 @@ export const REGIEST_AREA = { export const UPGRADE_AREA = { id: 42, - name: '升级专区', + // name: '升级专区', + name: '甄选专区', } export const REISSUE_AREA = {