From 44db498cedee7573d090797b1fe5c331c413b00a Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Mon, 22 Apr 2024 19:03:57 +0800
Subject: [PATCH] first

---
 src/page/user/recharge.vue |   85 ++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/src/page/user/recharge.vue b/src/page/user/recharge.vue
index 24a0ad6..7edccc9 100644
--- a/src/page/user/recharge.vue
+++ b/src/page/user/recharge.vue
@@ -3,10 +3,18 @@
     <van-nav-bar
       :placeholder="true"
       :safe-area-inset-top="true"
-      title="充值中心"
+      :title="$t('充值中心')"
       left-arrow
       @click-left="onClickLeft"
-    />
+    >
+      <template #right>
+        <van-icon
+          @click="$router.push('/rechargelist')"
+          name="orders-o"
+          size="20"
+        />
+      </template>
+    </van-nav-bar>
     <main>
       <div>
         <div class="main-title">{{ $t("支持得支付渠道") }}</div>
@@ -43,14 +51,17 @@
           </div>
           <div class="main-title">{{ $t("收款人名字") }}</div>
           <div class="white-input">
-            <span>{{ paymentSelectData.channelImg }}</span>
+            <span>{{ paymentSelectData.channelName }}</span>
             <i
               class="iconfont icon-fuzhi fuzhi"
-              @click="(e) => copyText(e, channelImg)"
+              @click="(e) => copyText(e, paymentSelectData.channelName)"
             ></i>
           </div>
           <div class="main-title">{{ $t("請選擇充值賬戶") }}</div>
-          <van-cell is-link :title="rechargeAccountData.name || $t('請選擇')" />
+          <van-cell
+            is-link
+            :title="$t(rechargeAccountData.key) || $t('請選擇')"
+          />
           <!-- @click="rechargeAccountShow = true" -->
           <van-action-sheet
             v-model="rechargeAccountShow"
@@ -66,13 +77,6 @@
           </div>
 
           <div class="bottom-text">
-            <!---->
-            <!-- <div class="balance">
-              <div>需要支付</div>
-              <div class="balance-text" style="margin-bottom: 0px">
-                0.0000 {{ rechargeAccountData.symbolCode }}
-              </div>
-            </div> -->
             <div class="balance" style="margin-top: 10px">
               <div>{{ $t("最小充值金額") }}</div>
               <div class="balance-text" style="margin-bottom: 0px">
@@ -86,6 +90,7 @@
                 {{ $t("上傳憑證:") }}
               </div>
               <el-upload
+                v-loading="loading"
                 :with-credentials="true"
                 class="avatar-uploader"
                 :action="admin + '/user/upload.do'"
@@ -107,8 +112,8 @@
               </el-upload>
             </div>
           </div>
+          <!--  :disabled="butFlg" -->
           <van-button
-            :disabled="butFlg"
             class="but"
             type="primary"
             style="margin-top: 1.04rem; margin-bottom: 1.04rem"
@@ -127,6 +132,7 @@
 import apiUrl from "@/axios/api.url.js";
 import { siteGetPayInfo, selCzFn } from "../../axios/api";
 import { Notify } from "vant";
+import { rechargeAccountActions } from "@/utils/rechargeActions";
 // baseURL
 export default {
   components: { ActionSheet, [Notify.Component.name]: Notify.Component },
@@ -136,6 +142,7 @@
   // getPayInfo
   data() {
     return {
+      loading: false,
       butFlg: true,
       admin: apiUrl.baseURL,
       value: 0,
@@ -143,38 +150,11 @@
       paymentSelectData: {},
       rechargeAccountData: {},
       show: false,
-      actions: [{ name: "銀行卡充值", key: "YHK" }],
+      actions: [{ name: this.$t("銀行卡充值"), key: "YHK" }],
       paymentShow: false,
       paymentActions: [],
       rechargeAccountShow: false,
-      rechargeAccountActions: [
-        {
-          title: this.$t("美股資產"),
-          title1: this.$t("美股可用"),
-          title2: this.$t("美股冻结"),
-          name: this.$t("US"),
-          key: "US",
-          symbol: "$",
-          symbolCode: "USD",
-        },
-        // {
-        //   title: this.$t("印股資產"),
-        //   title1: this.$t("印股可用"),
-        //   title2: this.$t("印股冻结"),
-        //   key: "IN",
-        //   symbol: "RM",
-        //   symbolCode: "MYR",
-        // },
-        {
-          name: this.$t("MAS"),
-          title: this.$t("馬股資產"),
-          title1: this.$t("馬股可用"),
-          title2: this.$t("馬股冻结"),
-          key: "MAS",
-          symbol: "RM",
-          symbolCode: "MYR",
-        },
-      ],
+      rechargeAccountActions: rechargeAccountActions,
       showBtn: true,
       imgStatus: false,
       form: {
@@ -196,7 +176,6 @@
       this.judgeValue();
     },
     async selCzFns() {
-      // payTypeId    payAmt  img
       if (!this.value) {
         return Notify(this.$t("hj171"));
       }
@@ -209,9 +188,9 @@
         img: this.form.img1key,
       });
       if (res.status === 0) {
-        Notify({ type: "success", message: "充值成功" });
+        Notify({ type: "success", message: this.$t("hj182") });
         setTimeout(() => {
-          this.onClickLeft();
+          this.$router.push("/rechargelist");
         }, 500);
       }
       //  Notify("请上传文件");
@@ -229,23 +208,25 @@
     handleAvatarSuccess(res, file) {
       this.imgStatus = false;
       this.form.img1key = res.data.url;
+      this.loading = false;
       this.judgeValue();
     },
     beforeAvatarUpload(file) {
+      this.loading = true;
       this.judgeValue();
       this.imgStatus = true;
     },
     handleError() {
+      this.loading = false;
       this.imgStatus = false;
     },
     // upload
     async afterRead(file) {
-      console.log(file);
       let formData = new FormData();
       formData.append("file", file.file || file.raw);
-      console.log(formData);
+      // console.log(formData);
       const res = await upload({ file: formData });
-      console.log(res);
+      // console.log(res);
     },
     copyText(e, data) {
       var clipboard = new ClipboardJS(".copy-button", {
@@ -253,7 +234,6 @@
       });
 
       clipboard.on("success", () => {
-        // alert("已复制到剪贴板");
         clipboard.destroy();
       });
 
@@ -270,14 +250,11 @@
     },
     paymentSelect(e) {
       this.paymentSelectData = e;
-      console.log(e);
       this.rechargeAccountActions.map((item) => {
-        console.log(item, e);
         if (item.key === e.assetsType) {
           this.rechargeAccountData = item;
         }
       });
-      console.log(this.rechargeAccountData, " this.rechargeAccountData");
     },
   },
 };
@@ -408,4 +385,8 @@
 /deep/ .el-upload__input {
   display: none !important;
 }
+/deep/ .avatar-uploader {
+  width: 2.740741rem;
+  height: 2.740741rem;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3