diff --git a/components/cartBtmList.vue b/components/cartBtmList.vue index 66d8e08..254d4df 100644 --- a/components/cartBtmList.vue +++ b/components/cartBtmList.vue @@ -362,56 +362,19 @@ export default { shoppingId: item, }) }) + const area = + this.goodsCheck[0].specialArea == REGIEST_AREA.id + ? 'regiest' + : 'upgrade' uni.navigateTo({ url: - '/pages/regiest/index?specialArea=' + - this.goodsCheck[0].specialArea + - '&shoppArr=' + - JSON.stringify(shoppArr), - }) - } else if (this.goodsCheck[0].specialArea == 21) { - if ( - this.userInfo.registerShare == 0 || - this.userInfo.registerFans == 0 - ) { - uni.navigateTo({ - url: - '/pages/shareArea/haiShare?allData=' + - JSON.stringify(this.goodsCheck[0].orderItemsParams), - }) - } else { - uni.setStorageSync( - 'haiConfirm', - JSON.stringify(this.goodsCheck[0].orderItemsParams) - ) - uni.navigateTo({ - url: '/pages/other/haiConfirm?shoppArr=' + JSON.stringify(shoppArr), - }) - } - } else if (this.goodsCheck[0].specialArea == 7) { - uni.navigateTo({ - url: - '/pages/hiFans/index?specialArea=' + + `/pages/${area}/index?specialArea=` + this.goodsCheck[0].specialArea + '&shoppArr=' + JSON.stringify(shoppArr), }) } else { - if (this.goodsCheck[0].specialArea == 2) { - let deleteList = [] - shoppArr.forEach(item => { - deleteList.push({ - shoppingId: item, - }) - }) - uni.navigateTo({ - url: - '/pages/other/index?specialArea=' + - this.goodsCheck[0].specialArea + - '&shoppArr=' + - JSON.stringify(shoppArr), - }) - } else if (this.goodsCheck[0].specialArea == 30) { + if (this.goodsCheck[0].specialArea == 30) { if (this.goodsCheck[0].orderItemsParams.length > 1) { uni.showToast({ title: '续约专区每次只能购买一件商品', diff --git a/config/order.js b/config/order.js index c703ec1..8452598 100644 --- a/config/order.js +++ b/config/order.js @@ -51,3 +51,5 @@ export const validRelation = params => http.post('sale/api/retail-order/valid-relation', { params }) // 升级订单 +export const upgradeOrder = data => + http.post('/sale/api/retail-order/confirm-upg-order', data) diff --git a/config/pay.js b/config/pay.js index c061caa..849cf9c 100644 --- a/config/pay.js +++ b/config/pay.js @@ -51,7 +51,7 @@ export const payRegOrder = params => http.post('/sale/api/retail-order/pay-reg-order', params) //支付其他订单 export const payOthOrder = params => - http.post('/sale/api/retail-order/pay-oth-order', params) + http.post('/sale/api/retail-order/pay-other-order', params) //宝付确认支付h5 export const baoFuPay = params => http.post('/pay/baofu-code/order', params) //汇付确认支付h5 @@ -69,15 +69,14 @@ export const payDrawGift = params => //提货下单 export const payPickOrder = params => http.post('/activity/api/pick/order', params) -//植树查看账户 -export const deductionAccount = params => - http.post('activity/api/sa-tree-order/deductionAccount', params) -//植树活动 -export const shoppingTree = params => - http.post('activity/api/sa-tree-order/shoppingTree', params) + //解绑银行卡 export const unBind = params => http.post('/pay/ada-fast/un-bind', params) //查询注册信息 export const registerInfo = params => http.get('/member/api/member/register-order/' + params) + +// 升级支付 +export const upgradePay = params => + http.post('/sale/api/retail-order/pay-upg-order', params) diff --git a/config/regiest.js b/config/regiest.js index d4e3a8b..364a823 100644 --- a/config/regiest.js +++ b/config/regiest.js @@ -49,12 +49,10 @@ export const validPPcode = params => //注册订单验证手机号 export const validPhone = params => http.post('/sale/api/retail-order/valid-phone', params) -//获取name -export const upgRel = params => - http.post('/sale/api/retail-order/validate-upg-rel', params) + //升级复购单确认 export const confirmOthOrder = params => - http.post('/sale/api/retail-order/confirm-oth-order', params) + http.post('/sale/api/retail-order/confirm-other-order', params) //嗨粉确认订单 export const confirmFunOrder = params => diff --git a/index.html b/index.html index 72a52eb..adb4f69 100644 --- a/index.html +++ b/index.html @@ -1,25 +1,32 @@ - + - - + + - - + + - - -
- - - - + + +
+ + + + diff --git a/pages.json b/pages.json index 46b3284..5616a97 100644 --- a/pages.json +++ b/pages.json @@ -324,11 +324,12 @@ } }, { - "path": "pages/shareArea/haiShare", + "path": "pages/upgrade/index", "style": { - "navigationBarTitleText": "海粉信息" + "navigationBarTitleText": "升级专区" } }, + { "path": "pages/shareArea/hiList", "style": { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 417f604..2ae46d2 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -1,60 +1,61 @@