合并支付

src/pages/confirmOrder/confirmOrder.js

@@ -61,6 +61,17 @@ wxService.page({
       this.initCitys()
       // 地址列表
       this.getAddressList()
+
+
+      const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
+            let params = {
+              checkByPremium,
+              trolleySku2Buy,
+              addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
+            }
+            this.calPreferentialPrice(params)  // 计算优惠价
+
+
       // if (!this.data.wxAddress){
       //   this.getAddressList()
       // }
@@ -326,7 +337,8 @@ wxService.page({
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/trade/buyer/bill`, params).then(res => {
+    
+    wxService.post(`/sale/payment/merged/buyer/bill`, params).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
@@ -380,13 +392,13 @@ wxService.page({
             addressInfo: _defalutAddress
           }, () => {
             // preview
-            const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
-            let params = {
-              checkByPremium,
-              trolleySku2Buy,
-              addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
-            }
-            this.calPreferentialPrice(params)  // 计算优惠价
+            // const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
+            // let params = {
+            //   checkByPremium,
+            //   trolleySku2Buy,
+            //   addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
+            // }
+            // this.calPreferentialPrice(params)  // 计算优惠价
           })
         }
       }

src/subPackage/page/pages/paymentStatus/paymentStatus.js

@@ -48,6 +48,15 @@ wxService.page({
       title: status == 'S' ? '支付成功' : '支付失败'
     })
   },
+  loginUpdateStroage(){
+    const code = wx.getStorageSync('_loginCode')
+
+    // wxService.post(`/member/minaLogin`, {
+    //   code,
+    //   wechatInfo: res[0],
+    //   brandId: app.globalData.brandId,
+    // })
+  },
   toPlus() {
     wxService.post(`/merchant/modelPage/mainSetting/page?brandId=${app.globalData.brandId}&isMain=3&type=2`).then(res => {
       const { result, data } = res.data