Merge branch 'dev_7.1.0' into fixbug-ZYW

src/component/goHome/goHome.wxss

@@ -5,7 +5,7 @@
   align-items: center;
   justify-content: center;
   position: fixed;
-  bottom: 143rpx;
+  bottom: 225rpx;
   right: 25rpx;
   width: 82rpx;
   height: 82rpx;

src/pages/orderDetail/orderDetail.js

@@ -17,6 +17,7 @@ wxService.page({
     min: '00',
     sec: '00',
     ms:  '0',
+    mergedAmount: 0
   },
 
   /**
@@ -62,7 +63,8 @@ wxService.page({
           // 订单倒计时  超多两小时 刷新当前页
           // 本地时间 - 创建时间  >  2小时  刷新当前页
           this.setData({
-            detail: data
+            detail: data,
+            mergedAmount: data.mergedAmount || 0
           }, ()=>{
             this.initCountDown(data.countDownOrderTime, data.createOrderTime, data.localNowTime)
           })
@@ -169,11 +171,13 @@ wxService.page({
       title: '加载中',
       mask: true
     })
-    wxService.post(`/sale/trade/buyer/wxprepay/${id}`).then(res => {
+    
+    const { mergedAmount } = this.data
+    let url = mergedAmount ? `/sale/payment/merged/buyer/wxprepay/${id}` : `/sale/trade/buyer/wxprepay/${id}`
+    wxService.post(`${url}`).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
-          console.log('dddd', data.amount)
           let amount = data.amount || 0
           wx.hideLoading()
           wx.requestPayment(Object.assign({