From 86ecc6bcd2d030f6525b2afbfadcc2b62a4c896f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 14 Nov 2023 16:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E5=85=85=E5=80=BC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=A9=BA=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=97=AE=E7=AD=94?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ask-comments/ask-comments.vue   |  2 +-
 pages/plugins/wallet/recharge/recharge.vue | 35 +++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/components/ask-comments/ask-comments.vue b/components/ask-comments/ask-comments.vue
index db6ba34e..20cd6402 100644
--- a/components/ask-comments/ask-comments.vue
+++ b/components/ask-comments/ask-comments.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view">
         <view v-if="(data || null) != null && (data_base || null) != null">
             <view class="flex-row jc-sb align-c">
-                <view class="fw-b">共{{ data.comments_count || 0 }}个回答</view>
+                <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="fw-b">共{{ data.comments_count || 0 }}个回答</view>
                 <!-- 点赞、评论、分享 -->
                 <view v-if="propType == 'detail'" class="tr ask-comments-bottom-container cr-base">
                     <view v-if="(data_base.is_ask_comments_show || 0) == 1" class="item dis-inline-block cr-base" :data-value="'/pages/plugins/ask/comments/comments?id=' + data.id" @tap="url_event">
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index 11b44258..a9421be6 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -1,7 +1,7 @@
 <template>
     <view :class="theme_view">
         <component-nav-back prop-name="充值"></component-nav-back>
-        <view v-if="data.length > 0" class="weixin-nav-padding-top">
+        <view v-if="data_list_loding_status == 3" class="weixin-nav-padding-top">
             <view class="padding-top-xxxl">
                 <!-- 头部背景 -->
                 <image :src="wallet_static_url + 'rechage-bg.png'" mode="widthFix" class="pa top-0 bg-img wh-auto" />
@@ -13,29 +13,31 @@
                             <text class="price fw-b">{{ user_wallet.normal_money }}</text>
                         </view>
                     </view>
-                    <view class="recharge-content bg-white spacing-mt">
-                        <view class="padding-horizontal-sm spacing-mb">选择充值金额</view>
-                        <view class="flex-row flex-warp tc spacing-mb">
-                            <view v-for="(item, index) in data" :key="index" class="recharge-price-list" :data-index="index" :data-value="item.value" @tap="change_price_event">
-                                <view class="recharge-price-content border-radius-main pr" :class="select_index === index ? 'active' : ''">
-                                    <view v-if="item.tips" class="tips cr-white dis-inline-block pa left-0 text-size-xss">{{ item.tips }}</view>
-                                    <view class="single-text">
-                                        <text class="text-size-md">{{ currency_symbol }}</text>
-                                        <text class="text-size-xl">{{ item.value }}</text>
+                    <view class="recharge-content bg-white spacing-mt">
+                        <block v-if="preset_data.length > 0">
+                            <view class="padding-horizontal-sm spacing-mb">选择充值金额</view>
+                            <view class="flex-row flex-warp tc spacing-mb">
+                                <view v-for="(item, index) in preset_data" :key="index" class="recharge-price-list" :data-index="index" :data-value="item.value" @tap="change_price_event">
+                                    <view class="recharge-price-content border-radius-main pr" :class="select_index === index ? 'active' : ''">
+                                        <view v-if="item.tips" class="tips cr-white dis-inline-block pa left-0 text-size-xss">{{ item.tips }}</view>
+                                        <view class="single-text">
+                                            <text class="text-size-md">{{ currency_symbol }}</text>
+                                            <text class="text-size-xl">{{ item.value }}</text>
+                                        </view>
                                     </view>
                                 </view>
                             </view>
-                        </view>
+                        </block>
                         <view class="form-container padding-top-sm padding-horizontal-sm">
                             <view class="form-gorup border-radius-main custom-price flex-row align-c">
-                                <view class="margin-right-xxl">其他金额</view>
+                                <view class="margin-right-xxl">{{preset_data.length > 0 ? '其他' : '充值'}}金额</view>
                                 <input type="digit" name="money" v-model="recharge_money_value" placeholder-class="cr-grey-9" class="cr-base text-size-md flex-1 flex-width" placeholder="请输入充值金额" @input="recharge_money_value_input_event" maxlength="6" />
                             </view>
                             <view class="form-gorup form-gorup-submit spacing-mt">
                                 <button class="round cr-white bg-main br-main text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="form_submit_event">立即充值</button>
                             </view>
                         </view>
-                        <view class="recharge-desc padding-top-xxl padding-horizontal-sm">
+                        <view v-if="((recharge_desc || null) != null && recharge_desc.length > 0)" class="recharge-desc padding-top-xxl padding-horizontal-sm">
                             <view class="recharge-desc-title padding-bottom-sm">充值说明</view>
                             <view v-for="(item, index) in recharge_desc" :key="index" class="recharge-desc-content cr-grey-9 flex-row align-c">
                                 <text class="dis-inline-block circle bg-main circle-poiont margin-right-sm"></text>
@@ -86,7 +88,7 @@
                 recharge_money_value: '',
                 // recharge_money_value: '',
                 form_submit_disabled_status: false,
-                data: [],
+                preset_data: [],
                 recharge_desc: '',
                 user_wallet: null,
                 select_index: null,
@@ -166,12 +168,12 @@
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             this.setData({
-                                data: data.preset_data || [],
+                                preset_data: data.preset_data || [],
                                 payment_id: data.default_payment_id || 0,
                                 recharge_desc: data.recharge_desc || '',
                                 user_wallet: data.user_wallet || null,
                                 data_list_loding_msg: '',
-                                data_list_loding_status: 0,
+                                data_list_loding_status: 3,
                             });
                         } else {
                             this.setData({
@@ -199,7 +201,6 @@
                 this.setData({
                     select_index: e.currentTarget.dataset.index,
                     recharge_money_value: e.currentTarget.dataset.value,
-                    // recharge_money_value: '',
                 });
             },