订单列表支付

src/pages/order/order.js

@@ -145,13 +145,15 @@ wxService.page({
   },
   // 立即支付
   handelToPay(e) {
-    const { id } = e.currentTarget.dataset
-    console.log('0000', id)
+    const { id, merged } = e.currentTarget.dataset
+    console.log('0000', id, merged)
+    let url = merged ? `/sale/payment/merged/buyer/wxprepay/${id}` : `/sale/trade/buyer/wxprepay/${id}`
     wx.showLoading({
       title: '加载中',
       mask: true
     })
-    wxService.post(`/sale/trade/buyer/wxprepay/${id}`).then(res => {
+    wxService.post(`${url}`).then(res => {
+    // wxService.post(`/sale/trade/buyer/wxprepay/${id}`).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {

src/pages/order/order.wxml

@@ -142,7 +142,7 @@
 							<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDelOrder">删除订单</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'N'}}">
-							<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
+							<button class="btn btn-sm btn-primary btn-outline" data-merged="{{item.mergedAmount}}" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
 						</view>
 						<view class="order-status" wx-if="{{item.status == 'P'}}">
 							<button