From 9508af87804c2d90b568a5e61007308b98137afe Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 19 Jul 2024 14:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bookShop/orderLCont.vue |  2 +-
 pages/bookShop/orderList.vue  | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index aebbb3b..4deac51 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -931,7 +931,7 @@ export default {
               color: "#fff",
             });
           }
-          if (this.orderContet.orderStatus == 0) {
+          if (this.orderContet.orderStatus == 0 && this.orderContet.paymentMethod != 3) {
             this.customButton.push({
               width: "160rpx",
               text: "继续付款",
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 897f2ee..66510f9 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -395,7 +395,7 @@
                   <view class="right flexbox opbtns">
                     <view
                       class="orderstatusbtn orderstatusbtn_success"
-                      v-if="slotProps.row.orderStatus == 0"
+                      v-if="slotProps.row.orderStatus == 0 && slotProps.row.paymentMethod != 3"
                       @click.stop="goPay(slotProps.row)"
                       >继续付款</view
                     >
@@ -948,14 +948,7 @@ export default {
         );
       } else if (payItem.paymentMethod == 1) {
         console.log("微信支付");        
-        if (this.isAndorid == false) {
-          uni.showModal({
-            title: "提示",
-            content: "很抱歉，苹果系统暂不支持微信支付",
-            showCancel: false,
-          });
-          return false;
-        } else {
+        
           let data1 = {
             orderSn: payItem.orderSn,
             buyOrderId: null,
@@ -983,8 +976,7 @@ export default {
                 });
               }
             }
-          });
-        }
+          });        
       } else if (payItem.paymentMethod == 3 && this.ordersListTab == 0 ) {
         // 苹果充值
         console.log("苹果二次支付");