修改直接收款下的等待支付页面

pages/index/index.axml

@@ -276,11 +276,11 @@
     <!-- 界面主体 -->
     <view class="bodyContainer">
       <view class="leftBody" hidden="{{waitOperateHideLeft}}">
-        <view class="contentLine" style="margin-top:29rpx;" hidden="{{flowType!='collections'}}">
+        <view class="contentLine" style="margin-top:29rpx;" hidden="{{flowType!='collections'&& flowType != 'direct_payment'}}">
           <view class="descText">合计金额：</view>
           <view class="totalPrice">￥{{totalPrice}}</view>
         </view>
-        <view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'}}">
+        <view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'&&flowType != 'direct_payment'}}">
           <view class="descText">商家优惠：</view>
           <view class="totalCoupon">￥{{discCouponPrice}}</view>
         </view>
@@ -288,7 +288,7 @@
           <view class="descText">{{waitOperateMoneyRemind}}</view>
           <view class="moneySign">￥</view>
           <view class="payPrice">{{waitOperateAmount}}</view>
-          <view class="descText" hidden="{{flowType!='collections'}}">（共{{totalQuantity}}件）</view>
+          <view class="descText" hidden="{{flowType!='collections' && flowType != 'direct_payment'}}">（共{{totalQuantity}}件）</view>
         </view>
       </view>
       <view class="rightBody">

pages/index/index.js

@@ -278,13 +278,6 @@ Page({
           });
 
           context.goPage('payresult');
-        } else if (res.action == ACTION_DIRECT_PAYMENT) {
-          //直接收款
-          context.clearGood();  
-          if (res.data != null) {
-            context.setData({ waitOperateAmount: res.data ,goods: [],discCouponPrice:0})
-          }
-          context.goPage('waitoperate');
         } else if (res.action == ACTION_CONVERT_COUPON) {
           //兑换券
           context.setData({ convertCouponState: res.data.state })
@@ -762,6 +755,17 @@ Page({
       data: commonRequest,
       success: (res) => {
         console.log("发送直接收款事件到前屏小程序 成功 ===》" + JSON.stringify(res));
+        //直接收款
+        context.clearGood();
+        if (payment != null) {
+          context.setData({
+            totalPrice: payment,
+            waitOperateAmount: payment,
+            goods: [],
+            discCouponPrice: 0
+          })
+        }
+        context.goPage('waitoperate');
       },
       fail: (res) => {
         console.log("发送收款事件到前屏小程序 失败 ===》 " + JSON.stringify(res));