From 5813f98ab102370241d150fd9d32a424b16fba2e Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Thu, 16 Mar 2023 17:56:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=94=B6=E9=93=B6=E5=8F=B0?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/search.vue |  4 ++--
 pages/pay/index.vue    | 22 +++++++++++-----------
 sheep/store/app.js     |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pages/index/search.vue b/pages/index/search.vue
index f577d285..3e9b7fcd 100644
--- a/pages/index/search.vue
+++ b/pages/index/search.vue
@@ -19,7 +19,7 @@
         <button
           class="history-btn ss-reset-button"
           @tap="onSearch(item)"
-          v-for="(item, index) in state.historyTag"
+          v-for="(item, index) in state.historyList"
           :key="index"
         >
           {{ item }}
@@ -34,7 +34,7 @@
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
   const state = reactive({
-    historyTag: [],
+    historyList: [],
   });
 
   // 搜索
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index fbe45995..38619fb8 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -18,10 +18,7 @@
             <view
               class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
               :class="{ 'disabled-pay-item': item.disabled }"
-              v-if="
-                allowedPayment.includes(item.value) &&
-                !(state.orderType === 'recharge' && item.value === 'money')
-              "
+              v-if="allowedPayment.includes(item.value)"
             >
               <view class="ss-flex ss-col-center">
                 <image
@@ -88,8 +85,8 @@
   import { useDurationTime } from '@/sheep/hooks/useGoods';
 
   const userInfo = computed(() => sheep.$store('user').userInfo);
+
   // 检测支付环境
-  //
   const state = reactive({
     orderType: 'goods',
     payment: '',
@@ -97,7 +94,14 @@
     payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
     payMethods: [],
   });
-  const allowedPayment = computed(() => sheep.$store('app').platform.payment);
+
+  const allowedPayment = computed(() => {
+    if(state.orderType === 'recharge') {
+      return sheep.$store('app').platform.recharge_payment
+    }
+    return sheep.$store('app').platform.payment
+    });
+
   const payMethods = [
     {
       icon: '/static/img/shop/pay/wechat.png',
@@ -200,11 +204,6 @@
     const { data, error } = await sheep.$api.trade.order(id);
     if (error === 0) {
       state.orderInfo = data;
-      payMethods.forEach((item, index, array) => {
-        if (item.value === 'offline') {
-          array.splice(index, 1);
-        }
-      });
       state.payMethods = payMethods;
       checkPayStatus();
     } else {
@@ -257,6 +256,7 @@
       // 充值订单
       setRechargeOrder(id);
     } else {
+      state.orderType = 'goods';
       // 商品订单
       setGoodsOrder(id);
     }
diff --git a/sheep/store/app.js b/sheep/store/app.js
index fe9fc20f..4a338cef 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -23,6 +23,7 @@ const app = defineStore({
     },
     platform: {
       payment: [], // 支持的支付方式
+      recharge_payment: [], // 支持的充值支付方式
       share: {
         methods: [], // 支持的分享方式
         forwardInfo: {}, // 默认转发信息