From 948418ccfb265553581b7116dd990c57d4152bb9 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 27 Oct 2023 16:08:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BD=AC=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/wallet/transfer/transfer.vue       |   2 +-
 pages.json                                    |   7 +
 .../plugins/membershiplevelvip/user/user.vue  |   4 +-
 .../user-transfer-detail.vue                  | 123 ++++++++++++++++++
 pages/plugins/wallet/user/user.css            |   7 +
 pages/plugins/wallet/user/user.vue            |   8 +-
 6 files changed, 145 insertions(+), 6 deletions(-)
 create mode 100644 pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue

diff --git a/components/wallet/transfer/transfer.vue b/components/wallet/transfer/transfer.vue
index 685a665d..bce8ae5e 100644
--- a/components/wallet/transfer/transfer.vue
+++ b/components/wallet/transfer/transfer.vue
@@ -9,7 +9,7 @@
                     <text class="cr-grey-9">{{ item.add_time }}</text>
                 </view>
                 <view class="content margin-top">
-                    <navigator :url="'/pages/plugins/wallet/user-cash-detail/user-cash-detail?id=' + item.id" hover-class="none">
+                    <navigator :url="'/pages/plugins/wallet/user-transfer-detail/user-transfer-detail?id=' + item.id" hover-class="none">
                         <block v-for="(fv, fi) in content_list" :key="fi">
                             <view class="single-text margin-top-sm transfer-item">
                                 <text class="name cr-grey-9 margin-right-main dis-inline-block">{{ fv.name }}:</text>
diff --git a/pages.json b/pages.json
index 12cfca9a..2313d66b 100644
--- a/pages.json
+++ b/pages.json
@@ -568,6 +568,13 @@
                         "navigationBarTitleText": "提现详情"
                     }
                 },
+                {
+                    "path": "user-transfer-detail/user-transfer-detail",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "转账详情"
+                    }
+                },
                 {
                     "path": "payment-code/payment-code",
                     "style": {
diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue
index 622e99ea..59a74acc 100644
--- a/pages/plugins/membershiplevelvip/user/user.vue
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -27,10 +27,10 @@
                                                         <text>{{ user_vip.permanent_value }}{{ user_vip.permanent_unit }}</text>
                                                     </block>
                                                     <block v-else>
-                                                        <view v-if="(user_vip.surplus_time_number || 0) !== 0">
+                                                        <block v-if="(user_vip.surplus_time_number || 0) !== 0">
                                                             <text class="padding-horizontal-xs">|</text>
                                                             <text>{{ user_vip.surplus_time_number }}{{ user_vip.surplus_time_unit }}</text>
-                                                        </view>
+                                                        </block>
                                                     </block>
                                                 </view>
                                             </block>
diff --git a/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue b/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
new file mode 100644
index 00000000..18d13e81
--- /dev/null
+++ b/pages/plugins/wallet/user-transfer-detail/user-transfer-detail.vue
@@ -0,0 +1,123 @@
+<template>
+    <view>
+        <view v-if="detail != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="panel-content oh">
+                        <view v-for="(item, index) in detail_list" :key="index" class="item br-b-dashed oh padding-vertical-main">
+                            <view class="title fl padding-right-main cr-grey">{{ item.name }}</view>
+                            <view class="content fl br-l padding-left-main">{{ item.value }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </view>
+    </view>
+</template>
+<script>
+const app = getApp();
+import componentNoData from "../../../../components/no-data/no-data";
+import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+
+export default {
+    data() {
+        return {
+            params: null,
+            data_list_loding_status: 1,
+            data_list_loding_msg: "",
+            data_bottom_line_status: false,
+            detail: null,
+            detail_list: [],
+        };
+    },
+
+    components: {
+        componentNoData,
+        componentBottomLine,
+    },
+    props: {},
+
+    onLoad(params) {
+        //params['id'] = 1;
+        this.setData({
+            params: params,
+        });
+        this.init();
+    },
+
+    onShow() {
+        // 分享菜单处理
+        app.globalData.page_share_handle();
+    },
+
+    // 下拉刷新
+    onPullDownRefresh() {
+        this.init();
+    },
+
+    methods: {
+        init() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.setData({
+                data_list_loding_status: 1,
+            });
+            uni.request({
+                url: app.globalData.get_request_url("detail", "transfer", "wallet"),
+                method: "POST",
+                data: {
+                    id: this.params.id,
+                },
+                dataType: "json",
+                success: (res) => {
+                    uni.hideLoading();
+                    uni.stopPullDownRefresh();
+                    if (res.data.code == 0) {
+                        var data = res.data.data;
+                        this.setData({
+                            detail: data.data,
+                            detail_list: [
+                                { name: "转账单号", value: data.data.transfer_no || "" },
+                                { name: "转账金额", value: data.data.money + " 元" || "" },
+                                { name: "备注", value: data.data.note || "" },
+                                { name: "转账时间", value: data.data.add_time || "" },
+                            ],
+                            data_list_loding_status: 3,
+                            data_bottom_line_status: true,
+                            data_list_loding_msg: "",
+                        });
+                    } else {
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: res.data.msg,
+                        });
+                        if (app.globalData.is_login_check(res.data, this, "init")) {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    }
+                },
+                fail: () => {
+                    uni.hideLoading();
+                    uni.stopPullDownRefresh();
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_bottom_line_status: false,
+                        data_list_loding_msg: "服务器请求出错",
+                    });
+                    app.globalData.showToast("服务器请求出错");
+                },
+            });
+        },
+    },
+};
+</script>
+<style></style>
diff --git a/pages/plugins/wallet/user/user.css b/pages/plugins/wallet/user/user.css
index b39ff1e1..0728d6a2 100644
--- a/pages/plugins/wallet/user/user.css
+++ b/pages/plugins/wallet/user/user.css
@@ -19,6 +19,13 @@
     padding: 0 28rpx;
 }
 
+/* #ifdef MP-WEIXIN */
+.transfer-icon {
+    position: relative;
+    top: 6rpx;
+}
+/* #endif */
+
 .content-padding-1 {
     padding: 2rpx;
     left: -4rpx;
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
index 6b8e8428..03de5db8 100644
--- a/pages/plugins/wallet/user/user.vue
+++ b/pages/plugins/wallet/user/user.vue
@@ -25,8 +25,10 @@
                                                     <view>有效(元)</view>
                                                     <text class="fw-b effective">{{ is_price_show ? user_wallet.normal_money || '0.00' : '***' }}</text>
                                                 </view>
-                                                <view class="is-price-show">
-                                                    <iconfont name="icon-wdhy-erweima" size="44rpx" class="margin-right-xxxl" :data-value="payment_page_url" @tap="url_event"></iconfont>
+                                                <view class="flex-row">
+                                                    <view class="margin-right-xxxl" :data-value="payment_page_url" @tap="url_event">
+                                                        <iconfont name="icon-wdhy-erweima" size="44rpx"></iconfont>
+                                                    </view>
                                                     <iconfont :name="is_price_show ? 'icon-wodeqianbao-eye' : 'icon-wodeqianbao-eyeclo2'" size="44rpx" @tap="price_change"></iconfont>
                                                 </view>
                                             </view>
@@ -42,7 +44,7 @@
                                                     </view>
                                                 </view>
                                                 <view class="transfer-accounts cr-white va-m round flex-row align-c" data-value="/pages/plugins/wallet/transfer/transfer" @tap="url_event">
-                                                    <iconfont name="icon-transfer" size="28rpx"></iconfont>
+                                                    <iconfont name="icon-transfer" size="28rpx" class="transfer-icon"></iconfont>
                                                     <text class="margin-left-xs">转账</text>
                                                 </view>
                                             </view>