فهرست منبع

花卉宝端的待支付页面调整:当xhShop 的rechargeWeal=3且使用红包时,隐藏微信支付

shizhongqi 3 ماه پیش
والد
کامیت
b42f6c3ec8
2فایلهای تغییر یافته به همراه9 افزوده شده و 4 حذف شده
  1. 1 1
      hdApp/src/admin/billing/affirm.vue
  2. 8 3
      mallApp/src/pages/callback/pay.vue

+ 1 - 1
hdApp/src/admin/billing/affirm.vue

@@ -620,7 +620,7 @@ export default {
         hasPay:0,
         hasPay:0,
         getStaffName:'',
         getStaffName:'',
         dealPrice:0,
         dealPrice:0,
-        forward:0,
+        forward:0, //红冲
         needWork:0,
         needWork:0,
         forwardStock:1,
         forwardStock:1,
         fromType:1,//门店来的订单
         fromType:1,//门店来的订单

+ 8 - 3
mallApp/src/pages/callback/pay.vue

@@ -32,8 +32,13 @@
           <view class="call-one-btn">
           <view class="call-one-btn">
             <view v-if="Number(hdInfo.balance)>0" style="color:green;font-weight:bold;font-size:36upx;margin-top:28upx;">可用余额 ¥{{ parseFloat(hdInfo.balance) }}</view>
             <view v-if="Number(hdInfo.balance)>0" style="color:green;font-weight:bold;font-size:36upx;margin-top:28upx;">可用余额 ¥{{ parseFloat(hdInfo.balance) }}</view>
             <button v-if="orderInfo.showYePay == 1" class="button-com green pay-wx" @click="balancePayFn" style="height:100upx;line-height:50upx;">余额支付</button>
             <button v-if="orderInfo.showYePay == 1" class="button-com green pay-wx" @click="balancePayFn" style="height:100upx;line-height:50upx;">余额支付</button>
-            <button v-if="getPayType == 1" class="button-com green pay-wx" @click="wxPayFn" style="height:100upx;line-height:50upx;">微信支付</button>
-            <button v-else class="button-com green pay-wx" @click="wxPayFnOld" style="height:100upx;line-height:50upx;">微信支付</button>
+            <block v-if="Number(orderInfo.rechargeWeal) == 3 && Number(orderInfo.hbId) != 0">
+              <view style="color:green;font-size:36upx;margin-top:28upx;text-align:center;">使用了红包,只支持余额支付</view>
+            </block>
+            <block v-else>
+              <button v-if="getPayType == 1" class="button-com green pay-wx" @click="wxPayFn" style="height:100upx;line-height:50upx;">微信支付</button>
+              <button v-else class="button-com green pay-wx" @click="wxPayFnOld" style="height:100upx;line-height:50upx;">微信支付</button>
+            </block>
           </view>
           </view>
         </block>
         </block>
         <block v-else-if="pageStatus == 3 || pageStatus == 4 || pageStatus == 5">
         <block v-else-if="pageStatus == 3 || pageStatus == 4 || pageStatus == 5">
@@ -64,7 +69,7 @@ import ModalModule from "@/components/plugin/modal";
 import AlertModule from "@/components/plugin/alert";
 import AlertModule from "@/components/plugin/alert";
 import wexinPay from "@/utils/pay/wxPay";
 import wexinPay from "@/utils/pay/wxPay";
 import { getShopUser } from "@/utils/auth";
 import { getShopUser } from "@/utils/auth";
-import { balancePay, wxPay,getDetail } from "@/api/order";
+import { balancePay, wxPay, getDetail } from "@/api/order";
 import { postWxCode } from '@/api/mini';
 import { postWxCode } from '@/api/mini';
 export default {
 export default {
   name: "index",
   name: "index",