From 428cbfc4c98f4e5b9ee44ece997e3d1fe3e44f27 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 11 Apr 2024 00:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B8=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/plugins/coin/cash-list/cash-list.vue    | 12 +--
 pages/plugins/coin/cash/cash.vue              | 47 ++++++----
 pages/plugins/coin/collection/collection.vue  | 94 +++++--------------
 .../coin/convert-list/convert-list.vue        | 12 +--
 pages/plugins/coin/detail/detail.vue          |  9 +-
 .../coin/recharge-list/recharge-list.vue      | 12 +--
 pages/plugins/coin/recharge/recharge.vue      |  8 +-
 .../transaction-list/transaction-list.vue     | 12 +--
 .../coin/transfer-list/transfer-list.vue      | 12 +--
 10 files changed, 92 insertions(+), 128 deletions(-)

diff --git a/pages.json b/pages.json
index 22657d4b..e000f47f 100644
--- a/pages.json
+++ b/pages.json
@@ -1547,7 +1547,7 @@
                 {
                     "path": "collection/collection",
                     "style": {
-                        "enablePullDownRefresh": true,
+                        "enablePullDownRefresh": false,
                         "navigationBarTitleText": ""
                     }
                 }
diff --git a/pages/plugins/coin/cash-list/cash-list.vue b/pages/plugins/coin/cash-list/cash-list.vue
index 2df9bf97..e1985c83 100644
--- a/pages/plugins/coin/cash-list/cash-list.vue
+++ b/pages/plugins/coin/cash-list/cash-list.vue
@@ -133,8 +133,7 @@
                 wallet_static_url: wallet_static_url,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-
-                params: null,
+                params: {},
 
                 // 弹窗距离顶部距离
                 popup_top_height: 0,
@@ -176,11 +175,10 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
             // 设置参数
-            if (params !== null && params.id) {
-                this.setData({
-                    params: params,
-                });
-            }
+            this.setData({
+                params: params,
+                accounts_id: params.id || 0,
+            });
         },
 
         onShow() {
diff --git a/pages/plugins/coin/cash/cash.vue b/pages/plugins/coin/cash/cash.vue
index 291320b6..49afe93a 100644
--- a/pages/plugins/coin/cash/cash.vue
+++ b/pages/plugins/coin/cash/cash.vue
@@ -6,11 +6,11 @@
                 <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
                     <view class="title flex-col padding-lg">
                         <view class="margin-bottom-xxxl flex-row jc-sb margin-top-xl">
-                            <view v-if="accounts_list.length > 0" class="cr-white">
+                            <view v-if="(accounts || mull) != null" class="cr-white">
                                 <view class="flex-row align-e margin-bottom-main">
                                     <view class="flex-row align-c pr coin-dropdown" @tap="popup_coin_status_open_event">
-                                        <image v-if="accounts_list[accounts_list_index]['platform_icon']" :src="accounts_list[accounts_list_index]['platform_icon']" mode="widthFix" class="coin-content-list-img round" />
-                                        <text class="margin-left-xs">{{ accounts_list[accounts_list_index]['platform_name'] }}</text>
+                                        <image v-if="(accounts.platform_icon || null) != null" :src="accounts.platform_icon" mode="widthFix" class="coin-content-list-img round" />
+                                        <text class="margin-left-xs">{{ accounts.platform_name }}</text>
                                         <view class="coin-dropdown-icon pa padding-left-xxl">
                                             <iconfont name="icon-arrow-bottom" size="24rpx" color="#fff"></iconfont>
                                         </view>
@@ -18,11 +18,11 @@
                                     <view class="text-size-xs fw-b padding-left-main text">可提现币</view>
                                 </view>
                                 <view class="flex-row align-e">
-                                    <view class="text-size-40 fw-b">{{ accounts_list[accounts_list_index]['normal_coin'] }}</view>
-                                    <view class="padding-left-sm margin-bottom-main cr-grey-d">{{ accounts_list[accounts_list_index]['default_symbol'] }}{{ accounts_list[accounts_list_index]['default_coin'] }}</view>
+                                    <view class="text-size-40 fw-b">{{ accounts.normal_coin }}</view>
+                                    <view class="padding-left-sm margin-bottom-main cr-grey-d">{{ accounts.default_symbol }}{{ accounts.default_coin }}</view>
                                 </view>
                             </view>
-                            <view class="detail pa right-0 fw-b cr-white" data-value="/pages/plugins/coin/cash-list/cash-list" @tap="url_event">提现明细</view>
+                            <view class="detail pa right-0 fw-b cr-white" :data-value="'/pages/plugins/coin/cash-list/cash-list?id='+accounts.id" @tap="url_event">提现明细</view>
                         </view>
                     </view>
                     <view class="content padding-main">
@@ -75,13 +75,15 @@
                         </view>
                         <view class="popup_coin_status_container padding-vertical-main flex-col text-size">
                             <view class="scroll-y">
-                                <view v-for="(item, index) in accounts_list" :key="index" class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item.id" :data-index="index" @tap="coin_checked_event">
-                                    <view class="flex-row align-c">
-                                        <image v-if="platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
-                                        <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
-                                    </view>
-                                    <view>
-                                        <iconfont :name="accounts_list_index === index ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="36rpx"></iconfont>
+                                <view v-for="(item, index) in accounts_list" :key="index">
+                                    <view class="flex-row jc-sb align-c padding-vertical-main" :class="accounts_list.length == index + 1 ? '' : 'br-b-f9'" :data-value="item.id" :data-index="index" @tap="coin_checked_event">
+                                        <view class="flex-row align-c">
+                                            <image v-if="platform_icon" :src="item.platform_icon" mode="widthFix" class="coin-list-img round" />
+                                            <view class="margin-left-sm text-size-md single-text">{{ item.platform_name }}</view>
+                                        </view>
+                                        <view>
+                                            <iconfont :name="accounts.id === item.id ? 'icon-zhifu-yixuan cr-red' : 'icon-zhifu-weixuan'" size="36rpx"></iconfont>
+                                        </view>
                                     </view>
                                 </view>
                             </view>
@@ -115,14 +117,16 @@
                 status_bar_height: bar_height,
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
+                params: {},
 
                 // 虚拟币
                 coin_num: '',
+                
+                // 账户
+                accounts: {},
 
                 // 虚拟币下拉框探弹窗状态
                 popup_coin_status: false,
-                // 虚拟币下标
-                accounts_list_index: 0,
                 // 虚拟币下拉框list
                 accounts_list: [],
                 // 充币网络
@@ -147,6 +151,10 @@
         onLoad(params) {
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
+            // 设置参数
+            this.setData({
+                params: params,
+            });
             this.init();
         },
 
@@ -175,7 +183,7 @@
                 uni.request({
                     url: app.globalData.get_request_url('createinfo', 'cash', 'coin'),
                     method: 'POST',
-                    data: {},
+                    data: {accounts_id : this.accounts.id || this.params.id},
                     dataType: 'json',
                     success: (res) => {
                         uni.stopPullDownRefresh();
@@ -183,6 +191,7 @@
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             this.setData({
+                                accounts: data.accounts || {},
                                 accounts_list: data.accounts_list || [],
                                 network_list: data.network_list || [],
                                 data_list_loding_msg: '',
@@ -211,7 +220,7 @@
             // 虚拟币切换
             coin_checked_event(e) {
                 this.setData({
-                    accounts_list_index: parseInt(e.currentTarget.dataset.index || 0),
+                    accounts: this.accounts_list[e.currentTarget.dataset.index],
                     coin_num: '',
                     popup_coin_status: false,
                 });
@@ -238,7 +247,7 @@
             // 全部提现
             all_cash_event(e) {
                 this.setData({
-                    coin_num: this.accounts_list[this.accounts_list_index].normal_coin || '',
+                    coin_num: this.accounts.normal_coin || '',
                 });
             },
 
@@ -266,7 +275,7 @@
             // 申请提现
             apply_for_cash_event() {
                 var new_data = {
-                    accounts_id: this.accounts_list[this.accounts_list_index].id,
+                    accounts_id: this.accounts.id,
                     network_id: this.network_list[this.network_list_index].id,
                     address: this.coin_address,
                     coin: this.coin_num,
diff --git a/pages/plugins/coin/collection/collection.vue b/pages/plugins/coin/collection/collection.vue
index 1a18d225..4e69a7bd 100644
--- a/pages/plugins/coin/collection/collection.vue
+++ b/pages/plugins/coin/collection/collection.vue
@@ -2,21 +2,27 @@
     <view :class="theme_view">
         <view class="collection">
             <view class="padding-main pr">
-                <view class="padding-lg bg-white radius-md margin-bottom-main tc">
-                    <view class="flex-row jc-c qrcode">
-                        <w-qrcode :options="qrcode"></w-qrcode>
+                <block v-if="(params.accounts_key || null) != null">
+                    <view class="padding-lg bg-white radius-md margin-bottom-main tc">
+                        <view class="flex-row jc-c qrcode">
+                            <w-qrcode :options="qrcode"></w-qrcode>
+                        </view>
+                        <view class="code br-c radius flex-row">
+                            <view class="num flex-1 flex-width flex-row align-c text-size-md">{{ params.accounts_key }}</view>
+                            <view class="copy br-l-c text-size fw-b" :data-value="params.accounts_key" @tap.stop="text_copy_event">复制</view>
+                        </view>
                     </view>
-                    <view class="code br-c radius flex-row">
-                        <view class="num flex-1 flex-width flex-row align-c text-size-md">{{ accounts_key }}</view>
-                        <view class="copy br-l-c text-size fw-b" :data-value="accounts_key" @tap.stop="text_copy_event">复制</view>
+                    <view class="cr-grey-9 margin-top-xxl flex-row">
+                        <view class="pr">
+                            <iconfont name="icon-sigh-o" size="32rpx"></iconfont>
+                        </view>
+                        <text class="margin-left-sm text-size-xs">扫一扫向对方发起转账，请核对认真账户后再确认转账！</text>
                     </view>
-                </view>
-                <view class="cr-grey-9 margin-top-xxl flex-row">
-                    <view class="pr">
-                        <iconfont name="icon-sigh-o" size="32rpx"></iconfont>
-                    </view>
-                    <text class="margin-left-sm text-size-xs">扫一扫向对方发起转账，请核对认真账户后再确认转账！</text>
-                </view>
+                </block>
+                <block v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0"></component-no-data>
+                </block>
             </view>
         </view>
     </view>
@@ -24,22 +30,12 @@
 <script>
     const app = getApp();
     import componentNoData from '@/components/no-data/no-data';
-    var wallet_static_url = app.globalData.get_static_url('coin', true) + 'app/';
-    // 状态栏高度
-    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
-    // #ifdef MP-TOUTIAO
-    bar_height = 0;
-    // #endif
     export default {
         data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
-                params: null,
-                qrcode: {
-                    code: '',
-                    size: 280,
-                },
-                accounts_key: '',
+                params: {},
+                qrcode: {},
             };
         },
 
@@ -54,8 +50,11 @@
             // 设置参数
             this.setData({
                 params: params,
+                qrcode: {
+                    code: params.accounts_key || null,
+                    size: 280,
+                }
             });
-            this.init();
         },
 
         onShow() {
@@ -66,52 +65,11 @@
             app.globalData.page_share_handle();
         },
 
-        // 下拉刷新
-        onPullDownRefresh() {
-            this.get_data();
-        },
         methods: {
-            init(e) {
-                var user = app.globalData.get_user_info(this, 'init');
-                if (user != false) {
-                    this.get_data();
-                }
-            },
-
-            // 获取数据
-            get_data() {
-                uni.request({
-                    url: app.globalData.get_request_url('detail', 'accounts', 'coin'),
-                    method: 'POST',
-                    data: this.params,
-                    dataType: 'json',
-                    success: (res) => {
-                        uni.stopPullDownRefresh();
-                        console.log(res.data.data);
-                        if (res.data.code == 0) {
-                            var data = res.data.data;
-                            this.setData({
-                                accounts_key: data.accounts.accounts_key || '',
-                            });
-                            var qrcode = this.qrcode;
-                            qrcode['code'] = data.accounts.accounts_key;
-                        } else {
-                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
-                                app.globalData.showToast(res.data.msg);
-                            }
-                        }
-                    },
-                    fail: () => {
-                        uni.stopPullDownRefresh();
-                        app.globalData.showToast(this.$t('common.internet_error_tips'));
-                    },
-                });
-            },
-
             // 复制文本
             text_copy_event(e) {
                 app.globalData.text_copy_event(e);
-            },
+            }
         },
     };
 </script>
diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue
index f986ab64..63ab40b2 100644
--- a/pages/plugins/coin/convert-list/convert-list.vue
+++ b/pages/plugins/coin/convert-list/convert-list.vue
@@ -111,8 +111,7 @@
                 accounts_static_url: accounts_static_url,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-
-                params: null,
+                params: {},
 
                 // 弹窗距离顶部距离
                 popup_top_height: 0,
@@ -148,11 +147,10 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
             // 设置参数
-            if (params !== null && params.id) {
-                this.setData({
-                    params: params.id,
-                });
-            }
+            this.setData({
+                params: params,
+                send_accounts_id: params.id || 0,
+            });
         },
 
         onShow() {
diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue
index acd8771f..6eb67c91 100644
--- a/pages/plugins/coin/detail/detail.vue
+++ b/pages/plugins/coin/detail/detail.vue
@@ -14,7 +14,10 @@
                                         <iconfont name="icon-arrow-bottom" size="24rpx" color="#666"></iconfont>
                                     </view>
                                 </view>
-                                <view class="fw-b text-size">{{ is_price_show ? accounts.normal_coin : '***' }}</view>
+                                <view>
+                                    <text class="fw-b text-size">{{ is_price_show ? accounts.normal_coin : '***' }}</text>
+                                    <text v-if="is_price_show" class="cr-grey-9 text-size-xs margin-left">{{ accounts.default_symbol }}{{ accounts.default_coin }}</text>
+                                </view>
                             </view>
                         </view>
                         <view @tap="price_change">
@@ -238,13 +241,13 @@
                                 temp_coin_oprate_list.push({
                                     name: '转账',
                                     icon: 'icon-transfer-count',
-                                    url: '/pages/plugins/coin/transfer/transfer?id=' + this.params.id,
+                                    url: '/pages/plugins/coin/transfer/transfer?id=' + this.accounts.id,
                                 });
                             }
                             temp_coin_oprate_list.push({
                                 name: '收款',
                                 icon: 'icon-collection',
-                                url: '/pages/plugins/coin/collection/collection?id=' + this.params.id,
+                                url: '/pages/plugins/coin/collection/collection?accounts_key=' + this.accounts.accounts_key,
                             });
                             temp_coin_oprate_list.push({
                                 name: '明细',
diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue
index 52b3e1c2..0dd93813 100644
--- a/pages/plugins/coin/recharge-list/recharge-list.vue
+++ b/pages/plugins/coin/recharge-list/recharge-list.vue
@@ -134,8 +134,7 @@
                 accounts_static_url: accounts_static_url,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-
-                params: null,
+                params: {},
 
                 // 弹窗距离顶部距离
                 popup_top_height: 0,
@@ -177,11 +176,10 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
             // 设置参数
-            if (params !== null && params.id) {
-                this.setData({
-                    params: params,
-                });
-            }
+            this.setData({
+                params: params,
+                accounts_id: params.id || 0,
+            });
         },
 
         onShow() {
diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue
index 61bb0816..7627dbda 100644
--- a/pages/plugins/coin/recharge/recharge.vue
+++ b/pages/plugins/coin/recharge/recharge.vue
@@ -4,7 +4,7 @@
         <block v-if="accounts_list.length > 0">
             <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
                 <view class="recharge-title flex-col padding-lg">
-                    <view v-if="accounts_list.length > 0" class="margin-bottom-xxxl flex-row jc-sb margin-top-xl">
+                    <view v-if="(accounts || mull) != null" class="margin-bottom-xxxl flex-row jc-sb margin-top-xl">
                         <view class="cr-white flex-1 flex-width">
                             <view class="coin-dropdown margin-bottom-main">
                                 <view class="flex-row align-c pr" @tap="popup_coin_status_open_event">
@@ -126,6 +126,7 @@
                 status_bar_height: bar_height,
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
+                params: {},
 
                 // 账户
                 accounts: {},
@@ -153,7 +154,10 @@
         onLoad(params) {
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
-
+            // 设置参数
+            this.setData({
+                params: params,
+            });
             this.init();
         },
 
diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue
index 0a14fd67..f553a2d2 100644
--- a/pages/plugins/coin/transaction-list/transaction-list.vue
+++ b/pages/plugins/coin/transaction-list/transaction-list.vue
@@ -156,8 +156,7 @@
                 accounts_static_url: accounts_static_url,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-
-                params: null,
+                params: {},
 
                 // 弹窗距离顶部距离
                 popup_top_height: 0,
@@ -205,11 +204,10 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
             // 设置参数
-            if (params !== null && params.id) {
-                this.setData({
-                    params: params,
-                });
-            }
+            this.setData({
+                params: params,
+                accounts_id: params.id || 0,
+            });
         },
 
         onShow() {
diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue
index 9314c6f9..8bee758c 100644
--- a/pages/plugins/coin/transfer-list/transfer-list.vue
+++ b/pages/plugins/coin/transfer-list/transfer-list.vue
@@ -82,8 +82,7 @@
                 accounts_static_url: accounts_static_url,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-
-                params: null,
+                params: {},
 
                 // 弹窗距离顶部距离
                 popup_top_height: 0,
@@ -113,11 +112,10 @@
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
             // 设置参数
-            if (params !== null && params.id) {
-                this.setData({
-                    params: params,
-                });
-            }
+            this.setData({
+                params: params,
+                accounts_id: params.id || 0,
+            });
         },
 
         onShow() {