From b13d4a4289ca95318f10db5eba75310cae0db3d6 Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Wed, 11 Jun 2025 16:54:52 +0800
Subject: [PATCH] sytle

---
 src/views/wallet/withdraw.vue                                              |   11 
 src/utils/http.js                                                          |    4 
 src/views/forex/termsOfService.vue                                         |    2 
 src/i18n/en/home.js                                                        |    8 
 src/views/my/change-password.vue                                           |   22 +
 src/views/wealth/transactionRecord.vue                                     |   59 +++++
 src/i18n/cht/user.js                                                       |    9 
 src/api/currency.js                                                        |    6 
 src/views/market/components/hangqing.vue                                   |  147 ++++++++------
 src/i18n/zh/user.js                                                        |    8 
 src/i18n/en/user.js                                                        |   37 ++-
 src/components/constract/PerpetualContract/position.vue                    |    8 
 src/i18n/zh/home.js                                                        |    2 
 index.html                                                                 |    2 
 src/components/constract/index.vue                                         |   10 
 src/views/wallet/recharge.vue                                              |   32 +-
 src/i18n/en/forex.js                                                       |    2 
 src/i18n/cht/home.js                                                       |    6 
 src/assets/logo.png                                                        |    0 
 src/views/market/page.vue                                                  |    2 
 src/components/constract/PerpetualContract/positionCom/currentPosition.vue |   24 +
 src/components/layout/commonHeader.vue                                     |   12 
 src/components/layout/footerView.vue                                       |    2 
 src/components/constract/PerpetualContract/orderCom/amountSlider.vue       |   53 +++-
 src/i18n/en/jiaoyi.js                                                      |    4 
 src/components/constract/PerpetualContract/createOrder.vue                 |   81 ++++++-
 src/views/my/center.vue                                                    |   13 
 27 files changed, 368 insertions(+), 198 deletions(-)

diff --git a/index.html b/index.html
index 2749717..91da394 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/src/assets/logo.jpeg" />
+  <link rel="icon" type="image/svg+xml" href="/src/assets/logo.png" style="width: 80px; height: 80px;" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no,viewport-fit=cover"> -->
   <!-- <meta name="apple-mobile-web-app-capable" content="yes" />
diff --git a/src/api/currency.js b/src/api/currency.js
index d3dc28c..9381635 100644
--- a/src/api/currency.js
+++ b/src/api/currency.js
@@ -68,7 +68,13 @@
   return Axios.fetch("/wap/api/itemUserOptional!list.action", data);
 }
 
+//轮播
+const getBanner = (data) => {
+  return Axios.fetch("/wap/api/banner!list.action", data)
+};
+
 export default {
+  getBanner,
   currencyDetails,
   getRealtime,
   BuyOpenView,
diff --git a/src/assets/logo.png b/src/assets/logo.png
new file mode 100644
index 0000000..0ffd47d
--- /dev/null
+++ b/src/assets/logo.png
Binary files differ
diff --git a/src/components/constract/PerpetualContract/createOrder.vue b/src/components/constract/PerpetualContract/createOrder.vue
index a70dba0..c243946 100644
--- a/src/components/constract/PerpetualContract/createOrder.vue
+++ b/src/components/constract/PerpetualContract/createOrder.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="perpeCreateOrder" style="background: #1a1a1a">
       <!-- 开仓+ 平仓 -->
-      <div class="titles">
+      <!-- <div class="titles">
         <span
           v-for="(item, index) in title"
           :key="index"
@@ -10,7 +10,7 @@
           @click="changeTitle(item, index)"
           >{{ item }}</span
         >
-      </div>
+      </div> -->
       <!-- 全仓+杠杆 -->
       <div class="crossSettingBox">
         <div class="crossSettingItem" style="margin-right: 20px">
@@ -50,18 +50,18 @@
         v-if="existToken"
         @tab-click="handleTabClick"
       >
-        <el-tab-pane :label="$t('message.home.xianjia')" name="limit">
-        </el-tab-pane>
-        <!-- <el-tab-pane :label="$t('message.home.shijia')" name="opponent">
+        <!-- <el-tab-pane :label="$t('message.home.xianjia')" name="limit">
         </el-tab-pane> -->
+        <el-tab-pane :label="$t('message.home.shijia')" name="opponent">
+        </el-tab-pane>
       </el-tabs>
       <!-- 下单 -->
       <div class="place-order-form-box">
         <div class="common-form-box" id="leftPoForm">
-          <div class="avaliable-USD">
+          <!-- <div class="avaliable-USD">
             <div>{{ $t("message.jiaoyi.heyuezongzican") }}</div>
             <div>{{ availableMoney }} {{ unit }}</div>
-          </div>
+          </div> -->
           <!-- 价格输入 -->
           <div class="place-order-input-box" v-show="activeName === 'limit'">
             <div class="input-label-box">
@@ -128,7 +128,7 @@
               </div>
             </div>
             <!-- 做空 -->
-            <div class="btn-wrapper" v-show="isActive == 1">
+            <div class="btn-wrapper">
               <div class="submit-btn-box">
                 <button
                   side="sell"
@@ -236,7 +236,7 @@
       ],
       newPageData: {}, //替代pageData,因为不能修改props的数据
       isActive: 0, //开仓0or平仓1
-      activeName: "limit", //限价or市价
+      activeName: "opponent", //限价or市价
       directionName: "", //buy Or sell
       price: undefined, //输入的价格
       sessionObj: {}, //
@@ -249,8 +249,8 @@
 
       initClose: {},
       initOpen: {},
-      inputAmount: "0.00",
-      availableMoney: "0.00",
+      inputAmount: "0.000000",
+      availableMoney: "0.000000",
       closeBuyAmount: 0,
       closeSellAmount: 0,
       isNewPrice: 0,
@@ -324,12 +324,12 @@
           data = this.sessionObj?.amount * amount * 1;
         }
       }
-      return bigDecimal.round(data, 2);
+      return bigDecimal.round(data, 6);
     },
     // 获取保证金,开仓才需要
     getMargin: function () {
       const amount = this.inputAmount;
-      let data = "0.00";
+      let data = "0.000000";
       console.log(
         "getMargin",
         this.isActive,
@@ -350,15 +350,51 @@
           data = this.sessionObj.amount * amount * 1;
         }
       }
-      return bigDecimal.round(data, 2);
+      // 校验保证金不能大于余额
+      if (
+        Number(this.availableMoney) > 0 &&
+        Number(data) > Number(this.availableMoney)
+      ) {
+        // 自动限制为最大可用余额
+        data = this.availableMoney;
+        // 可选:提示
+        this.$nextTick(() => {
+          ElMessage.warning(this.$t("message.home.baozhengjinbuzu")); // 保证金不足
+        });
+      }
+      return bigDecimal.round(data, 6);
     },
     // 获取手续费
     getFee: function () {
+      // const amount = this.inputAmount;
+      // let data = "0.00";
+      // if (amount && this.isActive == 0) {
+      //   // 每手的数量*多少手(张)*每手的手续费
+      //   data = amount * this.sessionObj.fee;
+      // }
+      // return bigDecimal.round(data);
       const amount = this.inputAmount;
-      let data = "0.00";
+      let rate = 0;
+      // 根据当前杠杆设置费率
+      switch (Number(this.current_lever_rate_num)) {
+        case 25:
+          rate = 0.0375;
+          break;
+        case 50:
+          rate = 0.075;
+          break;
+        case 100:
+          rate = 0.15;
+          break;
+        case 200:
+          rate = 0.3;
+          break;
+        default:
+          rate = 0;
+      }
+      let data = 0;
       if (amount && this.isActive == 0) {
-        // 每手的数量*多少手(张)*每手的手续费
-        data = amount * this.sessionObj.fee;
+        data = amount * rate * 100; // 乘以100显示百分比
       }
       return bigDecimal.round(data, 2);
     },
@@ -368,7 +404,7 @@
     current_lever_rate(val) {
       this.$refs.sliderRef?.emptyValue();
       this.$refs.sliderRef?.cleanAmount();
-      this.inputAmount = "0.00";
+      this.inputAmount = "0.000000";
     },
     // 市价单,主动赋值
     clickData(val) {
@@ -427,6 +463,15 @@
       } else {
         if (this.lever_rate.length > 0) {
           return parseInt(amount / this.current_lever_rate_num);
+          // const contractSize = 1;
+          // const price = this.price || this.newPageData.close || 1;
+          // const availableMargin = amount; // 可用保证金
+          // const lever = this.current_lever_rate_num;
+
+          // const maxVolume = parseInt(
+          //   (availableMargin * lever) / (contractSize * price)
+          // );
+          // return maxVolume > 0 ? maxVolume : 0;
         } else if (this.lever_rate.length == 0) {
           return parseInt(amount / 1);
         }
diff --git a/src/components/constract/PerpetualContract/orderCom/amountSlider.vue b/src/components/constract/PerpetualContract/orderCom/amountSlider.vue
index fdd211e..f4c0b21 100644
--- a/src/components/constract/PerpetualContract/orderCom/amountSlider.vue
+++ b/src/components/constract/PerpetualContract/orderCom/amountSlider.vue
@@ -30,8 +30,10 @@
     <!-- 订单 -->
     <div v-if="existToken">
       <div v-if="typeNum == 0" class="submit-info-item">
-        <div>{{ $t("message.home.kekaizhangshu") }}</div>
-        <div>{{ `${maxAmount} ${$t("message.home.zhang")}` }}</div>
+        <!-- <div>{{ $t("message.home.kekaizhangshu") }}</div>
+        <div>{{ `${maxAmount} ${$t("message.home.zhang")}` }}</div> -->
+        <div>{{ $t("message.jiaoyi.qianbaoyue") }}</div>
+        <div>{{ walletMoney }} USDT</div>
       </div>
 
       <div v-if="typeNum == 1" class="submit-info-item">
@@ -54,6 +56,9 @@
 import { mapState, mapActions, mapStores } from "pinia";
 import { useUserStore } from "@/store/user";
 import { useCurrencyStore } from "@/store/currency";
+import Axios from "@/api/currency.js";
+import bus from "vue3-eventbus";
+
 export default {
   emits: ["getAmount"],
   name: "amountSlider",
@@ -95,27 +100,41 @@
         100: "100%",
       },
       allowedSteps: [0, 25, 50, 75, 100],
+
+      totalAsset: "0.000000", //总资产
+      walletMoney: "0.000000", //钱包余额
+      profitLoss: "0.000000", //未实现盈亏
+      marginRate: "0.000000", //保证金比率
+      maintenanceMargin: "0.000000", //维持保证金 = 钱包余额
     };
+  },
+  mounted() {
+    if (this.existToken) {
+      this.timer = setInterval(() => {
+        this.getAssetTotal();
+      }, 2000);
+    }
   },
   computed: {
     ...mapState(useUserStore, ["existToken"]),
+    //保证金余额
+    marginBalance: function () {
+      // 钱包余额 + 未实现盈亏
+      return bigDecimal.add(this.walletMoney, this.profitLoss);
+    },
   },
   methods: {
-    onSliderInput(val) {
-      // 只允许滑到指定点
-      const allowed = this.allowedSteps;
-      let closest = allowed[0];
-      let minDiff = Math.abs(val - allowed[0]);
-      for (let i = 1; i < allowed.length; i++) {
-        const diff = Math.abs(val - allowed[i]);
-        if (diff < minDiff) {
-          minDiff = diff;
-          closest = allowed[i];
-        }
-      }
-      if (this.sliderAmount !== closest) {
-        this.sliderAmount = closest;
-      }
+    //获取资产总余额
+    getAssetTotal() {
+      Axios.currencyPaypal().then((res) => {
+        const { total, money_wallet, money_contract, money_contract_profit } =
+          res.data;
+        this.totalAsset = total; //总资产
+        this.walletMoney = bigDecimal.round(money_wallet, 6); //钱包余额
+        this.profitLoss = bigDecimal.round(money_contract_profit, 6); //永续合约总未实现盈亏
+        bus.emit("moneyContract", money_contract); //合约可用余额
+        // bus.emit("moneyContract", this.walletMoney); //合约可用余额
+      });
     },
     //输入框事件
     inputChange(val) {
diff --git a/src/components/constract/PerpetualContract/position.vue b/src/components/constract/PerpetualContract/position.vue
index 491d5a1..30df075 100644
--- a/src/components/constract/PerpetualContract/position.vue
+++ b/src/components/constract/PerpetualContract/position.vue
@@ -16,7 +16,7 @@
             v-if="activeName === 'first'"
           />
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           :label="$t('message.home.dangqianweituo') + `(${curNum})`"
           name="second"
         >
@@ -26,7 +26,7 @@
             :paramsType="paramsType"
             v-if="activeName === 'second'"
           />
-        </el-tab-pane>
+        </el-tab-pane> -->
         <!-- <el-tab-pane :label="$t('message.home.lishiweituo')" name="third">
           <history-apply-position
             :symbol="symbol"
@@ -41,9 +41,9 @@
             :paramsType="paramsType"
           />
         </el-tab-pane>
-        <el-tab-pane :label="$t('message.jiaoyi.zichan')" name="fifth">
+        <!-- <el-tab-pane :label="$t('message.jiaoyi.zichan')" name="fifth">
           <asset :symbol="symbol" v-if="activeName == 'fifth'" />
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
 
       <div v-if="!existToken" class="logins">
diff --git a/src/components/constract/PerpetualContract/positionCom/currentPosition.vue b/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
index e9d504b..787c323 100644
--- a/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
+++ b/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
@@ -7,7 +7,7 @@
       :empty-text="$t('message.home.noData')"
     >
       <!-- 合约会显示buy和杠杆 -->
-      <el-table-column :label="$t('message.jiaoyi.heyue')" width="180">
+      <el-table-column :label="$t('message.jiaoyi.heyue')" width="140">
         <template #default="scope">
           <div class="first-column">
             <span
@@ -29,6 +29,7 @@
         :prop="item.prop"
         :label="$t(item.label)"
         :formatter="item.formatter"
+        :width="item.width"
       />
       <el-table-column :label="$t('message.home.caozuo')" min-width="100">
         <template #default="scope">
@@ -84,6 +85,7 @@
           prop: "profit",
           label: "message.user.weishixianyingkui(shouyilv)",
           formatter: this.formatterData,
+          width: 260,
         },
         {
           prop: "volume", //volume_open持仓总张数,volume表示剩余
@@ -93,6 +95,10 @@
         {
           prop: "trade_avg_price",
           label: "message.user.kaicangjiage",
+          formatter: (row) => {
+            const { trade_avg_price } = row;
+            return bigDecimal.round(trade_avg_price, 6);
+          },
         },
 
         {
@@ -104,11 +110,11 @@
           prop: "lever_rate",
           label: "message.home.gangganbeishu",
         },
-        {
-          prop: "change_ratio",
-          label: "message.home.baozhengjinbilv",
-          // formatter: this.ratioFormatter,
-        },
+        // {
+        //   prop: "change_ratio",
+        //   label: "message.home.baozhengjinbilv",
+        //   // formatter: this.ratioFormatter,
+        // },
         {
           prop: "deposit",
           label: "message.home.baozhengjin",
@@ -153,8 +159,8 @@
     },
     formatterData(row) {
       const ratio = this.ratioFormatter(row);
-      const profit = Number(row.profit).toFixed(4);
-      return `${profit}/(${ratio})`;
+      const profit = Number(row.profit).toFixed(6);
+      return `${profit}(${ratio})`;
     },
     //设置单个单元格样式   行下标:rowIndex    列下标:columnIndex
     cellStyle({ row, column, rowIndex, columnIndex }) {
@@ -195,7 +201,7 @@
           (accumulator, cur) => Number(accumulator) + Number(cur.profit),
           0
         );
-        const dataloss = bigDecimal.round(profitLoss, 2);
+        const dataloss = bigDecimal.round(profitLoss, 6);
         // 保证金率
         const marginRate = res.data.reduce(
           (accumulator, cur) =>
diff --git a/src/components/constract/index.vue b/src/components/constract/index.vue
index 221abfe..c7d402c 100644
--- a/src/components/constract/index.vue
+++ b/src/components/constract/index.vue
@@ -499,16 +499,16 @@
                       >{{ $t("message.user.tixian") }}</el-button
                     >
                   </div>
-                  <div class="cashbilist" v-if="existToken">
-                    <p>
+                  <!-- <div class="cashbilist" v-if="existToken"> -->
+                  <!-- <p>
                       {{ $t("message.jiaoyi.qianbaoyue")
                       }}<span>{{ walletMoney }} {{ unit }}</span>
-                    </p>
-                    <!-- <p>
+                    </p> -->
+                  <!-- <p>
                   {{ $t("message.jiaoyi.weishixianyinkui1")
                   }}<span>{{ profitLoss }} {{ unit }}</span>
                   </p> -->
-                  </div>
+                  <!-- </div> -->
                 </div>
               </div>
             </div>
diff --git a/src/components/layout/commonHeader.vue b/src/components/layout/commonHeader.vue
index 09fe37f..f72d0a4 100644
--- a/src/components/layout/commonHeader.vue
+++ b/src/components/layout/commonHeader.vue
@@ -5,7 +5,7 @@
         <!-- 通用左边菜单 -->
         <div class="left-page-header">
           <div @click="goRouter('/')" class="logo">
-            <img src="@/assets/logo.jpeg" width="40" height="40" />
+            <img src="@/assets/logo.png" width="40" height="40" />
             <span class="logoName2"> {{ $title }} </span>
           </div>
           <menu-item
@@ -495,11 +495,11 @@
         title: "staking",
         // iconPath: getImages("headIcon/personal-menu/notice.png"),
       },
-      {
-        urlPath: "/optionRecord", // order/coinOrder  合约历史
-        title: "heyue",
-        // iconPath: getImages("headIcon/personal-menu/quit.png"),
-      },
+      // {
+      //   urlPath: "/optionRecord", // order/coinOrder  合约历史
+      //   title: "heyue",
+      //   // iconPath: getImages("headIcon/personal-menu/quit.png"),
+      // },
       {
         urlPath: "/loginOut",
         title: "tuichu",
diff --git a/src/components/layout/footerView.vue b/src/components/layout/footerView.vue
index a4a269a..13344e5 100644
--- a/src/components/layout/footerView.vue
+++ b/src/components/layout/footerView.vue
@@ -121,7 +121,7 @@
         .avatar {
           width: 40px;
           height: 40px;
-          background: url(../../assets/logo.jpeg) no-repeat center center;
+          background: url(../../assets/logo.png) no-repeat center center;
           background-size: 40px 40px;
         }
         .text {
diff --git a/src/i18n/cht/home.js b/src/i18n/cht/home.js
index 07557f7..d82d621 100644
--- a/src/i18n/cht/home.js
+++ b/src/i18n/cht/home.js
@@ -311,7 +311,7 @@
     dengluhoujiaoyi: "登錄後交易",
     gouamijia: "購買價",
 
-    fangxiang: "方向",
+    fangxiang: "类型",
     maiduo2: "買多",
     maikong: "賣空",
     jiaogeshijian: "交割時間",
@@ -344,7 +344,7 @@
     quxiao: "取消",
     kaicang: "開倉",
     duishoujia: "對手價",
-    zhangshu: "張數",
+    zhangshu: "交易手数",
     zhang: "張",
     keduokai: "可多開",
     heyuejine: "合約金額",
@@ -433,7 +433,7 @@
     trading: "進行交易",
     tradingPair: "交易對",
     type: "類型",
-    direction: "方向",
+    direction: "Type",
     completeness: "完成度",
     chufatiaojian: "觸發條件",
     quanche: "全撤",
diff --git a/src/i18n/cht/user.js b/src/i18n/cht/user.js
index 97a2d43..4c9518f 100644
--- a/src/i18n/cht/user.js
+++ b/src/i18n/cht/user.js
@@ -225,7 +225,7 @@
     jiaogelishi: "交割歷史",
     zhangbainjilu: "賬變記錄",
     duihuanlishi: "兌換歷史",
-    shijian: "時間",
+    shijian: "下單時間",
     leixing: "類型",
     chengjiaoshuliang: "成交數量",
     pingcangjiage: "平倉價格",
@@ -675,7 +675,7 @@
     ma102: '4.2.2 服務資訊。',
     ma103: '4.3 當您使用本網站或其提供的服務時,我們可能會為了改善本網站的使用,增強您使用本網站及其提供的服務的體驗及其安全性,或根據法院或適用的法律法規的規定,或其他有管轄權的政府機構命令,透過我們在本網站上公佈的專用郵箱或其他我們認為合規的方式收集更多必要的資訊。',
     ma104: '4.4 如果您造訪本網站上的其他第三方網站或合作第三方的任何鏈接,您應同意並遵守該第三方網路單獨且獨立的隱私權政策。我們不對這些網站或合作夥伴的內容和活動負責。',
-    ma105: '五、Cookie',
+    ma105: '5、Cookie',
     ma106: '5.1 當您造訪我們的網站時,我們透過cookies使用Google Stats來記錄我們的表現並檢查線上廣告的效果。Cookie是發送到您的瀏覽器並儲存在您的電腦硬碟上的少量資料。只有當您使用電腦進入我們的網站時,cookies才會被傳送到您的電腦硬碟上。',
     ma107: '5.2 Cookie通常用於記錄訪客在瀏覽我們網站上的各種項目時的習慣和偏好。cookie收集的資訊是匿名集體統計,不包含個人資訊。',
     ma108: '5.3 Cookies不能用於獲取您的硬碟上的資料、您的電子郵件地址以及您的私人資訊。它們可以使網站或服務提供者係統識別您的瀏覽器並捕獲和記住資訊。大多數瀏覽器都預設為接受Cookie。您可以選擇將瀏覽器設定為不接受Cookie,或在安裝Cookie後立即通知您。但如果設定為禁止cookies,您可能無法啟動或使用我們網站的某些功能。',
@@ -793,6 +793,9 @@
     ma219: '審核交易資訊並確認無誤後,您可以提交交易委託。您提交交易委託後,即表示您授權本站代表您進行對應的交易撮合。當有符合您委託價格的交易時,本站將自動完成撮合交易,無需事先通知您。',
     ma220: '4.3.1.3 查看交易詳情',
     ma221: '您可以在管理中心的交易明細中查看對應的交易記錄,以確認您的詳細交易記錄。',
-    ma222: 'Deepcoin交易所是英國集團共同創辦的公司,經營一個網站 https://www.deepcoincrypto.co(以下簡稱「本網站」或「網站」),該網站是用戶進行數位資產交易的平台,並提供相關服務(以下簡稱「本服務」或「服務」)。為了本協議表述之方便,本公司及本網站在本協議中統稱為「我們」或其他第一人稱名稱。只要登入本網站的自然人或其他主體均為本網站的用戶,本協議中的便利性均以「您」或其他第二人稱表示。為了本協議表述之方便,我們和您在本協議中統稱為「雙方」,我們或您單獨稱為「一方」。為了方便用戶,本網站的所有內容可能以多種語言提供。如有衝突或遺漏,以英文內容為準。',
+    ma222: 'Deepcoin交易所是英國集團共同創辦的公司,經營一個網站 https://coin.usadeepcoin.com (以下簡稱「本網站」或「網站」),該網站是用戶進行數位資產交易的平台,並提供相關服務(以下簡稱「本服務」或「服務」)。為了本協議表述之方便,本公司及本網站在本協議中統稱為「我們」或其他第一人稱名稱。只要登入本網站的自然人或其他主體均為本網站的用戶,本協議中的便利性均以「您」或其他第二人稱表示。為了本協議表述之方便,我們和您在本協議中統稱為「雙方」,我們或您單獨稱為「一方」。為了方便用戶,本網站的所有內容可能以多種語言提供。如有衝突或遺漏,以英文內容為準。',
     ma223: '重要的',
+    cp1: '登入密碼',
+    cp2: '資金密碼',
+    cp3: '提交'
 };
diff --git a/src/i18n/en/forex.js b/src/i18n/en/forex.js
index a66f21a..fe09278 100644
--- a/src/i18n/en/forex.js
+++ b/src/i18n/en/forex.js
@@ -464,7 +464,7 @@
   // m2
   "m2-1": "Available Tools",
   "m2-2": "Spreads, Swaps and Commissions",
-  "m2-3": "Trading Time",
+  "m2-3": "Opening time",
   "m2-4": "Maintenance Schedule",
   "m2-5": "Trading Account",
   "m2-6": "Deposit and Withdrawal",
diff --git a/src/i18n/en/home.js b/src/i18n/en/home.js
index f2b2e11..05abe50 100644
--- a/src/i18n/en/home.js
+++ b/src/i18n/en/home.js
@@ -375,7 +375,7 @@
   dengluhoujiaoyi: "Transaction after login",
   zuidijine: "Minimum amount",
   keyong: "Avbl",
-  shouxufei: "Fee",
+  shouxufei: "Handling fee",
 
   dengluhoujiaoyi: "Transaction after login",
   gouamijia: "purchase price",
@@ -390,7 +390,7 @@
   yuebuzuqingxianchongzhi: "Insufficient balance, please recharge first",
   chengjiaomingxi: "Transaction details",
   yongxu2: "Sustainable",
-  quancang: "Cross",
+  quancang: "Multiples",
   chengjiaoshijian: "Deal time",
   dingdanhao: "Order number",
   weituozongshuliang: "Total number of orders",
@@ -408,7 +408,7 @@
   chongzhi: "Reset",
   queding: "OK",
   tiaozhengganggan: "Adjust the lever",
-  gangganbeishu: "leverage multiple",
+  gangganbeishu: "Leverage Multiples",
   dengluhougenggai: "Change after login",
   quxiao: "Cancel",
   kaicang: "Buy",
@@ -424,7 +424,7 @@
   xianjiaweituo: "Limited order",
   gongxini: "Congratulations",
   xiadanchenggong: "Order successfully placed",
-  kaiduo: "Buy",
+  kaiduo: "Long",
   kaikong: "Short",
   yichengjiao: "Dealed",
   weituozongliang: "Total commissioned",
diff --git a/src/i18n/en/jiaoyi.js b/src/i18n/en/jiaoyi.js
index d768242..eb84980 100644
--- a/src/i18n/en/jiaoyi.js
+++ b/src/i18n/en/jiaoyi.js
@@ -9,7 +9,7 @@
   盘前交易: "Premarket trading",
   交易完成: "Success",
   pls_xuanzejiaoyishiduan: "Please choose the Trading period",
-  jiaoyishijian: "Trading time",
+  jiaoyishijian: "Opening time",
   closeDeliveryTradeTip: "The market is closed, please place an order later!",
   meiyuanjiage: "USD price",
   "24hzuidi": "24h minimum",
@@ -84,7 +84,7 @@
   jiaoyizican: "Trading Assets",
   keyongjine: "Amount Avbl",
   keyongshuliang: "Avbl Amount",
-  shouxufei: "Fee",
+  shouxufei: "Handling fee",
   zuidimairu: "Minimum buy",
   jiaoyishiduan: "Trading session",
   mairu: "Buy",
diff --git a/src/i18n/en/user.js b/src/i18n/en/user.js
index 8cc3b38..55273ef 100644
--- a/src/i18n/en/user.js
+++ b/src/i18n/en/user.js
@@ -119,7 +119,7 @@
   sousuobizhong: "Search Coin",
   chaxun: "Query",
   yincangzichan: "Hide 0 assets",
-  bizhong: "Coin",
+  bizhong: "Currency",
   keyong: "Avbl",
   dongjie: "Frozen",
   jiedai: "Loan",
@@ -161,7 +161,7 @@
   shoujirenzheng: "Mobile phone authentication",
   youxiangrenzheng: "Email authentication",
   qiyong: "Enable",
-  weibangding: "Unbound",
+  weibangding: "Unverified",
   chakan: "View",
   zhengjianzhengmian: "Front of the document",
   zhengjianfanmian: "Back of document",
@@ -182,7 +182,7 @@
   qsr_yanzhengma: "Please enter the verification code",
   huoquyanzhengma: "Get verification code",
   shenfenrenzheng: "Identity authentication",
-  yirenzheng: "Authenticated",
+  yirenzheng: "Verified",
   guoji: "Nationality",
   xingming: "Name",
   zhengjianhao: "document number",
@@ -232,11 +232,11 @@
   jiaogelishi: "Delivery History",
   zhangbainjilu: "Transaction Record",
   duihuanlishi: "Exchange History",
-  shijian: "Time",
+  shijian: "Opening time",
   leixing: "Type",
   chengjiaoshuliang: "Filled",
   pingcangjiage: "Close price",
-  shouxufei: "Fee",
+  shouxufei: "Handling fee",
   shixianyingkui: "Realize profit and loss",
   shouyilv: "Yield",
   zhuangtai: "Status",
@@ -318,7 +318,7 @@
   heyuejiaoyi: "Contract transaction",
   bibijiaoyi: "Exchange",
   tibi: "Withdrawal",
-  chongbi: "Deposit Coin",
+  chongbi: "Deposit",
   yongxuheyuepingcang: "Perpetual contract close position",
   yongxuheyuejiancang: "Perpetual contract open position",
   yongxuheyuechedan: "Perpetual contract cancel order",
@@ -421,7 +421,7 @@
   dingdanshijian3: "Order time",
   dingdanhao3: "Order number",
   jine2: "Amount",
-  bizhong4: "Coin",
+  bizhong4: "Currency",
   shouxufei2: "Handling fee",
   shoukuandizhi: "Payment address",
   zhuanchudizhi: "Transfer address",
@@ -432,8 +432,8 @@
   shibai5: "Failure",
 
   shuzihuobichongzhi: "Digital Coin recharge",
-  xuanzebizhong: "Select Coin",
-  bizhong2: "Coin",
+  xuanzebizhong: "Select Currency",
+  bizhong2: "Currency",
   chongzhidizhi: "Deposit address",
   zhuanzhangwangluo: "Transfer Network",
   shiyongjiaoyiping:
@@ -473,13 +473,13 @@
   ti21: "Top-up account",
   ti22: "Wallet Account",
   ti23: "View all",
-  ti24: "Please select a Coin",
+  ti24: "Please select a Currency",
   ti25: "Please select a network",
   ti26: "Make sure the deposit network you choose is the same as the network you use on the withdrawal platform, otherwise assets may be lost.",
   ti27: "The recharge application has been submitted",
-  xian1: "Digital Coin withdrawal",
-  xian2: "Select Coin",
-  xian3: "Coin",
+  xian1: "Digital Currency withdrawal",
+  xian2: "Select Currency",
+  xian3: "Currency",
   xian4: "Withdrawal address",
   xian5: "Address Book",
   xian6: "Select from address book",
@@ -507,7 +507,7 @@
   xian27: "Withdrawal Account",
   xian28: "Wallet account",
   xian29: "View all",
-  xian30: "Please select a Coin",
+  xian30: "Please select a Currency",
   xian31: "Select transfer network",
   xian32: "Address cannot be empty",
   xian33: "Quantity needs to be greater than 0",
@@ -662,8 +662,8 @@
   ma74: 'Income will be distributed to your exchange account after 24 hours.',
   ma75: 'If you need to end the event early, please contact customer service.',
   ma76: 'Platform Introduction',
-  ma77: 'Deepcoin is a world-leading digital asset trading platform, committed to providing users with safe, professional, and convenient digital currency trading services.',
-  ma78: 'The company was founded in 2014 and is currently headquartered in the UK. In 2022, after eight years of development, Deepcoin achieved great success in Europe, occupying 43.17% of the market share in the crypto matching trading sector and attracting a large amount of capital. To accelerate its global strategic layout, the Deepcoin team decided to establish a second headquarters in North America. At the end of 2022, it was officially established in the United States! In the same year, Deepcoin applied for and obtained the Fincen MSB license from the US financial authorities, marking another step forward in security, compliance, and stability.',
+  ma77: 'Deepcoin is a global leader in digital currency asset trading, committed to providing secure, professional, and convenient digital currency trading services to users.',
+  ma78: 'Founded in 2018 and headquartered in the Singapore, Deepcoin has achieved significant success in Asian, capturing 43.17% of the market share in the cryptocurrency matching trading field by 2022. Attracted by substantial capital, Deepcoin decided to accelerate its global strategic layout by establishing a second headquarters in North America. By the end of 2023, Deepcoin officially launched in the US and obtained the Fincen MSB license, signifying a further step in security, compliance, and stability.',
   ma79: 'The US MSB license is a financial license issued and regulated by FINCEN (the Financial Crimes Enforcement Network under the US Department of the Treasury). The US Treasury and SEC clearly emphasize that companies engaged in digital asset-related businesses in the US must register with FINCEN to obtain an MSB license, meaning they must operate with a license and comply with anti-money laundering and anti-terrorist financing regulations.',
   ma80: 'At the same time, from the user’s perspective, with a deep understanding of the blockchain field, Deepcoin carefully selects high-quality coins for global users and leads the trend of blockchain technology. The core team brings together senior technical engineers, global blockchain research experts, an international operations team, and top international risk control experts, adopting world-leading encryption technology.',
   ma81: 'The self-developed cluster memory matching system integrates multiple currencies and supports multiple languages, aiming to provide global users with safer, more stable, and more convenient digital asset trading.',
@@ -812,7 +812,10 @@
   ma219: 'After reviewing the trading information and confirming that it is correct, you can submit a trading order. After you submit the trading order, you authorize this site to conduct the corresponding trading match on your behalf. When there is a transaction that matches your order price, this site will automatically complete the matching transaction without prior notice to you.',
   ma220: '4.3.1.3 Viewing Transaction Details',
   ma221: 'You can view the corresponding transaction records in the transaction details of the management center to confirm your detailed transaction records.',
-  ma222: 'Deepcoin Exchange is a company jointly founded by a UK group, operating a website https://www.deepcoincrypto.co (hereinafter referred to as "this website" or "the site"), which is a platform for users to conduct digital asset transactions and provides related services (hereinafter referred to as "the Service" or "Services"). For convenience of expression in this agreement, the company and this website are collectively referred to as "we" or other first-person terms. Any natural person or other entity logging into this website is a user of this website, and for convenience in this agreement, "you" or other second-person pronouns are used. For convenience of expression, we and you are collectively referred to as "the parties" in this agreement, and we or you individually as "a party". For user convenience, all content on this website may be provided in multiple languages. In case of conflict or omission, the English content shall prevail.',
+  ma222: 'Deepcoin exchange is a company co-founded by a Singaporean group, operating the website: https://coin.usadeepcoin.com (hereinafter referred to as "this website" or "website"). This website is a platform for users to trade digital assets and provide related services (hereinafter referred to as "this website"). (hereinafter referred to as "the service" or "this service"). For the convenience of this agreement, the company and this website are collectively referred to as "we" or other first-person names in this agreement. As long as the natural person or other subject who logs in to this website is a user of this website, this agreement is conveniently expressed as "you" or other second-person names. For the convenience of this agreement, we and you are collectively referred to as "both parties" in this agreement, and we or you are individually referred to as "one party". For the convenience of users, all content of this website may be provided in multiple languages. In the event of any conflict or omission, the English content shall prevail.',
   ma223: 'Important',
+  cp1: 'Login Password',
+  cp2: 'Fund Password',
+  cp3: 'Submit'
 };
 
diff --git a/src/i18n/zh/home.js b/src/i18n/zh/home.js
index 23759f3..2e1800c 100644
--- a/src/i18n/zh/home.js
+++ b/src/i18n/zh/home.js
@@ -378,7 +378,7 @@
   shouyilv: "收益率",
   pingcang: "平仓",
   dangqian: "当前",
-  quancang: "全仓",
+  quancang: "杠杆",
   chicangliang: "持仓量",
   kaicangjunjia: "开仓均价",
   chushibaozhengjin: "初始保证金",
diff --git a/src/i18n/zh/user.js b/src/i18n/zh/user.js
index 3406250..604432c 100644
--- a/src/i18n/zh/user.js
+++ b/src/i18n/zh/user.js
@@ -7,8 +7,8 @@
 
   etf: "ETF",
   meigu: "美股",
-  suoyoubizhong:'所有币种',
-  bibihangqing:'币币行情',
+  suoyoubizhong: '所有币种',
+  bibihangqing: '币币行情',
   jiaogeheyue: "交割合约",
   Agu: "A股",
   ganggu: "港股",
@@ -557,8 +557,8 @@
   yuanyin: "原因",
   zongchongzhi: "总充值",
   xianhuojiaoyishouye: "现货交易",
-  'hangqing':'行情',
-  'jiaoyi':'交易',
+  'hangqing': '行情',
+  'jiaoyi': '交易',
   'shandui': '闪兑',
   'leimengxianhuo': '热门现货',
   'leimenghey': '热门合约',
diff --git a/src/utils/http.js b/src/utils/http.js
index 6034192..8f1574e 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -19,7 +19,9 @@
 var lang = JSON.parse(localStorage.getItem("lang"));
 axios.defaults.timeout = 15000;
 // axios.defaults.baseURL = URL.BASE_URL;
-axios.defaults.baseURL = 'https://coin.usadeepcoin.com/';
+// axios.defaults.baseURL = 'https://coin.usadeepcoin.com/';
+axios.defaults.baseURL = 'https://btc.btcwapo.com/';
+
 axios.interceptors.request.use(
   (config) => {
     const token = getStorage("spToken");
diff --git a/src/views/forex/termsOfService.vue b/src/views/forex/termsOfService.vue
index 26b01a8..9567300 100644
--- a/src/views/forex/termsOfService.vue
+++ b/src/views/forex/termsOfService.vue
@@ -84,7 +84,7 @@
           </p>
           <p style="margin: 0pt; text-indent: 0pt; padding: 0pt">&nbsp;</p>
           <p style="margin: 0pt; text-indent: 0pt; padding: 0pt">
-            <b><font face="Helvetica">五、</font>Cookie</b>
+            <b><font face="Helvetica">5、</font>Cookie</b>
           </p>
           <p style="margin: 0pt; text-indent: 0pt; padding: 0pt">&nbsp;</p>
           <p style="margin: 0pt; text-indent: 0pt; padding: 0pt">
diff --git a/src/views/market/components/hangqing.vue b/src/views/market/components/hangqing.vue
index 3f15d54..7feb028 100644
--- a/src/views/market/components/hangqing.vue
+++ b/src/views/market/components/hangqing.vue
@@ -65,23 +65,29 @@
   </div> -->
   <div class="swiper-img">
     <div class="swiper-container">
+      <!-- <el-carousel height="150px">
+      <el-carousel-item v-for="item in imgLists" :key="item">
+        <h3 class="small justify-center" text="2xl">{{ item }}</h3>
+      </el-carousel-item> -->
+      <!-- </el-carousel> -->
       <el-carousel :interval="5000" arrow="always" indicator-position="none">
-        <el-carousel-item>
+        <el-carousel-item v-for="(item, index) in imgLists" :key="index">
           <div class="img-box">
             <img
-              v-for="item in imgLists"
+              v-for="(_item, _index) in imgLists[index]"
+              :key="_index"
               style="margin-right: 20px; border-radius: 12px"
-              width="290"
+              width="350"
               height="160"
-              :src="item"
+              :src="_item.image"
             />
           </div>
         </el-carousel-item>
       </el-carousel>
     </div>
   </div>
-  <div class="notice">
-    <div style="display: flex; align-items: center">
+  <!-- <div class="notice"> -->
+  <!-- <div style="display: flex; align-items: center">
       <div class="icon">
         <img
           src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAzCAMAAADivasmAAAAAXNSR0IArs4c6QAAAJBQTFRFAAAAAAAAICAwHh4tICAwICgwHycuJSUwJSowJCQvJCovJCQwJCgwIycvIyMwIyYwIyYuIyYwIyUtIyUwIiUtIicwIicuJCQwJCcwIiYtJCQvIiYuIiYuJCYwIiUuJCUvIyUvIyYvIyYuIyYvIyYvIyYvIyUvISYvIiUvJCUvIiYvIiYvIyYvIyYvIyYvIyYv1k8XmgAAAC90Uk5TAAEQESAgITAwMTFAQEFQUF9fYGBhb3BwcHFxf4CAkJ6fn6Cur76/zs/P3t/u7/5ALSHUAAABB0lEQVRIx+2U166DMAyGTcroonvvAemg4Pd/uzppq0qcQGOpvTnivwlS8hHbsX+ASpW+piUXcPZXJiEkEiI4xBkVEqa7NoPQiFrcD4e97nATJSk+EF/SmpXXQR15SafvHT4xfxCAaYrZxBiQlsgh9R5tNRBvbuHvBzkk1MkvELcMRDGOxEzYIn6CGAOMjNmYEfAp9xbUjJEVILBCXIFzwas9EqoLHPljZP4M7GSffvJMP+IU+aiL3Gc+JV3l8hpmYm4Y4Srl29Ibl7RlcfMPqAFmnHmpR/S1LhuxYLyR5zfS1IM8s3CLoJO+7SIO7CzGS16m1LI2MmK4bkkPz0bAj/nOL6DSf9YdWJ5WsAYsc/8AAAAASUVORK5CYII="
@@ -91,14 +97,14 @@
       <span class="content">
         {{ $t('message.home["恭喜 Deepcoin新用戶,限時活動等你來"]') }}
       </span>
-    </div>
-    <div class="more-icon">
+    </div> -->
+  <!-- <div class="more-icon">
       {{ $t("message.jiaoyi.more") }}
       <img
         src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhBAMAAABKCLRiAAAAAXNSR0IArs4c6QAAACpQTFRFAAAAICAwICAwICgwJCgwIyMwIicuIyYvIyUvIiUvIiYvIyYvIyYvIyYv5hRuVQAAAA10Uk5TABAgIEBQcK+/z9/f76t+r8MAAABKSURBVCjPY2AYQCCCLlA7EU2g96YAqoDV3UmoAsxrbyugK9lESIkkuhLGuQSVMJ+9hl8FhhkkK8BwKIZXem+iObMXPcRMBWgbZwAuXx53AuEkAwAAAABJRU5ErkJggg=="
       />
-    </div>
-  </div>
+    </div> -->
+  <!-- </div> -->
   <div class="css-ph4aey">
     <div class="css-tq0shg">
       <main class="css-1wr4jig" style="background-color: #181a20">
@@ -163,7 +169,7 @@
                     <div class="item" @click="goDetail('btc', {})">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/75f196b437f9d87fdc198bc904c66c4c.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/btc.png"
                           alt=""
                         />
                         <div class="bigTetx">BTC</div>
@@ -444,7 +450,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/856bfdb63dc0d6fad6b92fc6a29719e1.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/eth.png"
                           alt=""
                         />
                         <div class="bigTetx">ETH</div>
@@ -725,7 +731,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/906d7d07a15083e2836a33523f4d5cc2.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/etc.png"
                           alt=""
                         />
                         <div class="bigTetx">ETC</div>
@@ -1006,10 +1012,10 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/a53cfb070eebb9a41e942328db6f08b7.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/dai.png"
                           alt=""
                         />
-                        <div class="bigTetx">DOT</div>
+                        <div class="bigTetx">DAI</div>
                         <div class="sTetx">/USDT</div>
                       </div>
                       <div class="chart">
@@ -1287,7 +1293,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/2d574c6f9c38368f9f06e63d29b18039.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/shib.png"
                           alt=""
                         />
                         <div class="bigTetx">SHIB</div>
@@ -1568,7 +1574,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/5e22a9302a4383454bfe530f0ddffb53.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/sol.png"
                           alt=""
                         />
                         <div class="bigTetx">SOL</div>
@@ -1849,7 +1855,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/64a44d7828e858cad297351046932348.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/icp.png"
                           alt=""
                         />
                         <div class="bigTetx">ICP</div>
@@ -2130,7 +2136,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/dd64732cb0db125d4578bd173857a6f6.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ada.png"
                           alt=""
                         />
                         <div class="bigTetx">ADA</div>
@@ -2407,14 +2413,14 @@
                       </div>
                     </div>
                   </div>
-                  <div class="list">
+                  <!-- <div class="list">
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/5726071a2a3dbf7e17339451a5f8194b.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ah.png"
                           alt=""
                         />
-                        <div class="bigTetx">ACH</div>
+                        <div class="bigTetx">AH</div>
                         <div class="sTetx">/USDT</div>
                       </div>
                       <div class="chart">
@@ -2687,12 +2693,12 @@
                         <div class="valom">0.001m</div>
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                   <div class="list">
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/92f9d15be55070c0f267e7b9609211da.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/xrp.png"
                           alt=""
                         />
                         <div class="bigTetx">XRP</div>
@@ -2969,11 +2975,11 @@
                       </div>
                     </div>
                   </div>
-                  <div class="list">
+                  <!-- <div class="list">
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/cb84d3ca48a52e3df1025731a8bef4ec.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/bnb.png"
                           alt=""
                         />
                         <div class="bigTetx">BNB</div>
@@ -3254,7 +3260,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/762d515d3ec1d46a7a34938f44d43006.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ply.png"
                           alt=""
                         />
                         <div class="bigTetx">PLY</div>
@@ -3535,7 +3541,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/06c8f4b2be7ea8aa987f22330a2d6d9b.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ltk.png"
                           alt=""
                         />
                         <div class="bigTetx">LTK</div>
@@ -3811,12 +3817,12 @@
                         <div class="valom">2.150m</div>
                       </div>
                     </div>
-                  </div>
-                  <div class="list">
+                  </div> -->
+                  <!-- <div class="list">
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/2314fdc27201d8f9ee0af2e81a9cecf9.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/dgc.png"
                           alt=""
                         />
                         <div class="bigTetx">DGC</div>
@@ -4097,7 +4103,7 @@
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/fc977f12892ad8f2cc6daa4f1bbb1241.jpg"
+                          src="https://coin.usadeepcoin.com/wap/symbol/lmct.png"
                           alt=""
                         />
                         <div class="bigTetx">LMCT</div>
@@ -4373,12 +4379,12 @@
                         <div class="valom">0.287m</div>
                       </div>
                     </div>
-                  </div>
-                  <div class="list">
+                  </div> -->
+                  <!-- <div class="list">
                     <div class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/c02947362ebfea47d5ee330de9f4bbc3.jpg"
+                          src="https://coin.usadeepcoin.com/wap/symbol/aclu.png"
                           alt=""
                         />
                         <div class="bigTetx">ACLU</div>
@@ -4653,8 +4659,8 @@
                       <div class="right">
                         <div class="valom">0.091m</div>
                       </div>
-                    </div>
-                  </div>
+                    </div> 
+                  </div> -->
                 </div>
                 <!---->
               </div>
@@ -4678,7 +4684,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/906d7d07a15083e2836a33523f4d5cc2.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/etc.png"
                           alt=""
                         />
                         <div class="bigTetx">ETC</div>
@@ -4959,7 +4965,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/856bfdb63dc0d6fad6b92fc6a29719e1.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/eth.png"
                           alt=""
                         />
                         <div class="bigTetx">ETH</div>
@@ -5240,7 +5246,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/5e22a9302a4383454bfe530f0ddffb53.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/sol.png"
                           alt=""
                         />
                         <div class="bigTetx">SOL</div>
@@ -5521,7 +5527,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/2d574c6f9c38368f9f06e63d29b18039.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/shib.png"
                           alt=""
                         />
                         <div class="bigTetx">SHIB</div>
@@ -5802,7 +5808,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/64a44d7828e858cad297351046932348.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/icp.png"
                           alt=""
                         />
                         <div class="bigTetx">ICP</div>
@@ -6083,7 +6089,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/75f196b437f9d87fdc198bc904c66c4c.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/btc.png"
                           alt=""
                         />
                         <div class="bigTetx">BTC</div>
@@ -6364,10 +6370,10 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/a53cfb070eebb9a41e942328db6f08b7.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/dai.png"
                           alt=""
                         />
-                        <div class="bigTetx">DOT</div>
+                        <div class="bigTetx">DAI</div>
                         <div class="sTetx">/USDT</div>
                       </div>
                       <div class="chart">
@@ -6645,7 +6651,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/92f9d15be55070c0f267e7b9609211da.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/xrp.png"
                           alt=""
                         />
                         <div class="bigTetx">XRP</div>
@@ -6926,7 +6932,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/dd64732cb0db125d4578bd173857a6f6.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ada.png"
                           alt=""
                         />
                         <div class="bigTetx">ADA</div>
@@ -7203,11 +7209,11 @@
                       </div>
                     </div>
                   </div>
-                  <div data-v-0aa0c653="" class="list">
+                  <!-- <div data-v-0aa0c653="" class="list">
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/cb84d3ca48a52e3df1025731a8bef4ec.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/bnb.png"
                           alt=""
                         />
                         <div class="bigTetx">BNB</div>
@@ -7483,12 +7489,12 @@
                         <div class="valom">0.086m</div>
                       </div>
                     </div>
-                  </div>
-                  <div data-v-0aa0c653="" class="list">
+                  </div> -->
+                  <!-- <div data-v-0aa0c653="" class="list">
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/5726071a2a3dbf7e17339451a5f8194b.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ach.png"
                           alt=""
                         />
                         <div class="bigTetx">ACH</div>
@@ -7764,12 +7770,12 @@
                         <div class="valom">0.001m</div>
                       </div>
                     </div>
-                  </div>
-                  <div data-v-0aa0c653="" class="list">
+                  </div> -->
+                  <!--   <div data-v-0aa0c653="" class="list">
                     <div data-v-0aa0c653="" class="item">
-                      <div class="lotteryName">
+                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/06c8f4b2be7ea8aa987f22330a2d6d9b.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ltk.png"
                           alt=""
                         />
                         <div class="bigTetx">LTK</div>
@@ -8050,7 +8056,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/c02947362ebfea47d5ee330de9f4bbc3.jpg"
+                          src="https://coin.usadeepcoin.com/wap/symbol/aclu.png"
                           alt=""
                         />
                         <div class="bigTetx">ACLU</div>
@@ -8331,7 +8337,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/762d515d3ec1d46a7a34938f44d43006.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/ply.png"
                           alt=""
                         />
                         <div class="bigTetx">PLY</div>
@@ -8612,7 +8618,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/2314fdc27201d8f9ee0af2e81a9cecf9.png"
+                          src="https://coin.usadeepcoin.com/wap/symbol/dgc.png"
                           alt=""
                         />
                         <div class="bigTetx">DGC</div>
@@ -8893,7 +8899,7 @@
                     <div data-v-0aa0c653="" class="item">
                       <div class="lotteryName">
                         <img
-                          src="https://api.usdeepcoin.com/uploads/BillOfCredit/fc977f12892ad8f2cc6daa4f1bbb1241.jpg"
+                          src="https://coin.usadeepcoin.com/wap/symbol/lmct.png"
                           alt=""
                         />
                         <div class="bigTetx">LMCT</div>
@@ -9169,7 +9175,7 @@
                         <div class="valom">0.287m</div>
                       </div>
                     </div>
-                  </div>
+                  </div>  -->
                 </div>
                 <!---->
               </div>
@@ -9651,7 +9657,10 @@
 export default {
   data() {
     return {
-      imgLists: [img1, img2, img3],
+      imgLists: [
+        // [img1, img2, img3],
+        // [img1, img2, img3],
+      ],
       ConfigURL,
       fixData,
       allSymbol: "", //所有symbol
@@ -9725,9 +9734,23 @@
     this.getSymbol();
     this.getItemOptionalList();
     window.scrollTo(0, 0);
+    this.getBanner();
   },
   methods: {
     handleSymbolImg,
+    getBanner() {
+      // let language;
+      // if (this.$i18n.locale === "en-US") {
+      //   language = "en";
+      // } else if (this.$i18n.locale.indexOf("CN") >= 0) {
+      //   language = "CN";
+      // } else {
+      //   language = this.$i18n.locale;
+      // }
+      Axios.getBanner({ model: "top" }).then((res) => {
+        this.imgLists[0] = res.data;
+      });
+    },
     // 获取所有symbol
     getSymbol() {
       API.url("wap/api/item!list.action", {}).then((res) => {
diff --git a/src/views/market/page.vue b/src/views/market/page.vue
index 26df084..eacab1f 100644
--- a/src/views/market/page.vue
+++ b/src/views/market/page.vue
@@ -755,7 +755,7 @@
         .avatar {
           width: 40px;
           height: 40px;
-          background: url(../../assets/logo.jpeg) no-repeat center center;
+          background: url(../../assets/logo.png) no-repeat center center;
           background-size: 40px 40px;
         }
         .text {
diff --git a/src/views/my/center.vue b/src/views/my/center.vue
index 8cc52f1..b217d0f 100644
--- a/src/views/my/center.vue
+++ b/src/views/my/center.vue
@@ -10,10 +10,8 @@
           />
           <div data-v-1a056e44="" class="header-content">
             <p data-v-1a056e44="" class="header-content__title">
-              <span data-v-1a056e44="">{{ userStore.userInfo.username }}</span
-              ><span data-v-1a056e44="" class="header-content__title-tag"
-                >VIP5</span
-              >
+              <span data-v-1a056e44="">{{ userStore.userInfo.username }}</span>
+              <!-- <span data-v-1a056e44="" class="header-content__title-tag">VIP5</span> -->
             </p>
             <p data-v-1a056e44="" class="header-content__desc">
               UID: {{ userStore.userInfo.usercode }}
@@ -21,9 +19,10 @@
             <p data-v-1a056e44="" class="header-content__desc">
               Credit Score: 100
             </p>
-            <p data-v-1a056e44="" class="header-content__desc">
-              {{ $t("message.user.ma34") }}: 71136375
-            </p>
+            <!-- {{ userStore.userInfo }} -->
+            <!-- <p data-v-1a056e44="" class="header-content__desc">
+              {{ $t("message.user.ma34") }}: {{ userStore.userInfo.usercode }}
+            </p> -->
           </div>
         </section>
         <section data-v-1a056e44="" class="plane plane1">
diff --git a/src/views/my/change-password.vue b/src/views/my/change-password.vue
index 19fd748..45d2fe6 100644
--- a/src/views/my/change-password.vue
+++ b/src/views/my/change-password.vue
@@ -24,7 +24,12 @@
         </i>
         <p data-v-5ac03575="" class="header-content">
           <!----><span data-v-5ac03575=""
-            >修改 {{ $route.params.id == 1 ? "登录密碼" : "資金密码" }}</span
+            >{{ $t("message.user.xiugai") }}
+            {{
+              $route.params.id == 1
+                ? $t("message.user.cp1")
+                : $t("message.user.cp2")
+            }}</span
           >
         </p>
       </section>
@@ -32,7 +37,12 @@
         <div data-v-5ac03575="" class="form">
           <p data-v-5ac03575="" class="form-title">
             <!----><span data-v-5ac03575=""
-              >修改 {{ $route.params.id == 1 ? "登录密碼" : "資金密码" }}</span
+              >{{ $t("message.user.xiugai") }}
+              {{
+                $route.params.id == 1
+                  ? $t("message.user.cp1")
+                  : $t("message.user.cp2")
+              }}</span
             >
           </p>
           <form
@@ -54,7 +64,7 @@
                       autocomplete="off"
                       v-model="formData.password"
                       tabindex="0"
-                      placeholder="請輸入原始密碼"
+                      :placeholder="$t('message.user.qsr_xinmima')"
                       id="el-id-8983-100"
                     /><!-- suffix slot --><!--v-if-->
                   </div>
@@ -78,7 +88,7 @@
                       v-model="formData.password1"
                       autocomplete="off"
                       tabindex="0"
-                      placeholder="請輸入新密碼"
+                      :placeholder="$t('message.user.qsr_xinmima')"
                       id="el-id-8983-101"
                     /><!-- suffix slot --><!--v-if-->
                   </div>
@@ -101,7 +111,7 @@
                       v-model="formData.password2"
                       autocomplete="off"
                       tabindex="0"
-                      placeholder="確認新密碼"
+                      :placeholder="$t('message.user.querenxinmima')"
                       id="el-id-8983-102"
                     /><!-- suffix slot --><!--v-if-->
                   </div>
@@ -111,7 +121,7 @@
             </div>
           </form>
           <button data-v-5ac03575="" class="form-btn" @click="onsubmit">
-            提交
+            {{ $t("message.user.cp3") }}
           </button>
         </div>
       </section>
diff --git a/src/views/wallet/recharge.vue b/src/views/wallet/recharge.vue
index 81d8d7b..d0c45b2 100644
--- a/src/views/wallet/recharge.vue
+++ b/src/views/wallet/recharge.vue
@@ -125,7 +125,7 @@
                                   ref="copytxt"
                                   readonly
                                   class="css-vurnku noborder"
-                                  style="width: 320px"
+                                  style="width: 320px; color: #fff"
                                 />
                                 <!-- 复制icon -->
                                 <div class="css-c1olmu">
@@ -164,7 +164,7 @@
                               </div>
                             </div>
                             <!-- 预计到账 -->
-                            <div class="my24">
+                            <!-- <div class="my24">
                               <div class="css-4cffwv">
                                 <div class="css-15slc0p">
                                   <div class="css-1hufmyh">
@@ -203,13 +203,17 @@
                                   </div>
                                 </div>
                               </div>
-                            </div>
+                            </div> -->
                           </div>
 
                           <div class="css-1mky3oo my24">
                             <div>
                               {{ $t("message.user.ti4")
-                              }}<span class="css-vr1wsl">{{ coin }}</span>
+                              }}<span
+                                class="css-vr1wsl"
+                                style="color: rgb(187 187 187)"
+                                >{{ coin }}</span
+                              >
                             </div>
                             <div>
                               {{ $t("message.user.ti5")
@@ -223,7 +227,7 @@
                     </div>
                   </div>
                   <!-- 充币数量 -->
-                  <div class="css-1oi6dii">
+                  <!-- <div class="css-1oi6dii">
                     <div class="css-1x9w05y">
                       {{ $t("message.user.ti6") }}
                     </div>
@@ -236,10 +240,10 @@
                         v-model="quantity"
                       ></el-input>
                     </div>
-                  </div>
+                  </div> -->
                   <!-- 上传凭证 -->
-                  <div class="css-1oi6dii">
-                    <div class="css-1x9w05y">
+                  <!-- <div class="css-1oi6dii"> -->
+                  <!-- <div class="css-1x9w05y">
                       {{ $t("message.home.shangchuanfukuanpingzheng") }}
                     </div>
                     <div class="text-center">
@@ -256,12 +260,12 @@
                         <el-icon v-else class="avatar-uploader-icon"
                           ><Plus
                         /></el-icon>
-                      </el-upload>
-                      <!--                      <p>{{ $t("message.home.fukuanpingzheng") }}</p>-->
-                    </div>
-                  </div>
+                      </el-upload> -->
+                  <!--                      <p>{{ $t("message.home.fukuanpingzheng") }}</p>-->
+                  <!-- </div> -->
+                  <!-- </div> -->
                   <!-- 充币按钮 -->
-                  <div class="css-1oi6dii">
+                  <!-- <div class="css-1oi6dii">
                     <div class="css-1x9w05y"></div>
                     <div style="display: flex; width: 100%">
                       <el-button
@@ -272,7 +276,7 @@
                         {{ $t("message.user.ti8") }}</el-button
                       >
                     </div>
-                  </div>
+                  </div> -->
                 </div>
                 <!-- 充值未到账 -->
                 <div class="css-107bu5v">
diff --git a/src/views/wallet/withdraw.vue b/src/views/wallet/withdraw.vue
index e9c1844..86a7e78 100644
--- a/src/views/wallet/withdraw.vue
+++ b/src/views/wallet/withdraw.vue
@@ -290,7 +290,7 @@
                           <div class="css-rjs222">{{ feeFee }} USDT</div>
                         </div>
                         <!-- 24H剩余提现额度 -->
-                        <div class="css-1hythwr">
+                        <!-- <div class="css-1hythwr">
                           <div class="css-v0h2s1">
                             {{ $t("message.user.xian17") }}
                           </div>
@@ -301,7 +301,7 @@
                               </div>
                             </div>
                           </div>
-                        </div>
+                        </div> -->
                       </div>
                     </div>
                   </div>
@@ -499,8 +499,8 @@
       listTitle: this.$t("message.user.xian30"),
       coinList: [
         { icon: "usdt", name: "USDT", min: 10 },
-        { icon: "btc", name: "BTC", min: 0.0000094 },
-        { icon: "eth", name: "ETH", min: 0.000094 },
+        { icon: "btc", name: "BTC", min: 0.0001 },
+        { icon: "eth", name: "ETH", min: 0.004 },
       ], //币种
       biChooseIndex: 0,
       m_menuchoose: 0,
@@ -518,7 +518,7 @@
       reciveMoney: "",
       itemAllMoney: "",
       moneymap: null,
-      inputNum: "1",
+      inputNum: "0",
       session_token: "",
       inputPwd: "",
       listData: [], //提现记录列表数据
@@ -584,6 +584,7 @@
     },
     // 获取手续费和可用余额
     getFee() {
+      if (this.inputNum <= 0) return;
       var channel = this.coinList[this.biChooseIndex].name;
       Axios2.url("wap/api/withdraw!fee.action", {
         amount: this.inputNum,
diff --git a/src/views/wealth/transactionRecord.vue b/src/views/wealth/transactionRecord.vue
index 119dbc5..6828fce 100644
--- a/src/views/wealth/transactionRecord.vue
+++ b/src/views/wealth/transactionRecord.vue
@@ -19,7 +19,14 @@
             <div class="item" v-for="(item, index) in tableData" :key="index">
               <div class="el-row">
                 <div class="el-col el-col-8">
-                  <div>{{ $t("message.user.shijian") }}</div>
+                  <div>
+                    {{
+                      activeName
+                        ? $t("message.home.pingcang") +
+                          $t("message.home.shijian")
+                        : $t("message.user.shijian")
+                    }}
+                  </div>
                   <div class="value">{{ formatterDate(item) }}</div>
                 </div>
                 <div class="el-col el-col-8">
@@ -42,8 +49,18 @@
               </div>
               <div class="el-row">
                 <div class="el-col el-col-8">
-                  <div>{{ $t("message.user.pingcangjiage") }}</div>
-                  <div class="value">{{ item.close_avg_price }}</div>
+                  <div>
+                    {{
+                      activeName
+                        ? $t("message.user.pingcangjiage")
+                        : $t("message.user.kaicangjiage")
+                    }}
+                  </div>
+                  <div class="value">
+                    {{
+                      activeName ? item.close_avg_price : item.close_avg_price
+                    }}
+                  </div>
                 </div>
                 <div class="el-col el-col-8">
                   <div>{{ $t("message.user.chengjiaoshuliang") }}</div>
@@ -57,6 +74,34 @@
                         ? $t("message.user.yipingcang")
                         : $t("message.user.chicang")
                     }}
+                  </div>
+                </div>
+              </div>
+              <div class="el-row">
+                <div class="el-col el-col-8">
+                  <div>
+                    {{ $t("message.home.gangganbeishu") }}
+                  </div>
+                  <div class="value">{{ item.lever_rate }}</div>
+                </div>
+                <div class="el-col el-col-8">
+                  <div>{{ $t("message.home.shouxufei") }}</div>
+                  <div class="value">{{ item.fee }}</div>
+                </div>
+                <div class="el-col el-col-8">
+                  <div>{{ $t("message.home.yingkui") }}</div>
+                  <div class="value">
+                    {{ item.profit }}/{{
+                      (() => {
+                        const base =
+                          item.trade_avg_price * item.amount_open || 1;
+                        let percent = (parseFloat(item.profit) / base) * 100;
+                        if (percent !== 0 && Math.abs(percent) < 0.000001) {
+                          percent = percent > 0 ? 0.000001 : -0.000001;
+                        }
+                        return percent.toFixed(6);
+                      })()
+                    }}%
                   </div>
                 </div>
               </div>
@@ -126,7 +171,7 @@
       const data = {
         page_no: this.pageNum,
         type: this.activeName ? "orders" : "hisorders",
-        symbol: "",
+        // symbol: "",
       };
       const res = await getContractOrder(data);
       this.tableData = res.data;
@@ -203,7 +248,11 @@
   font-size: 18px !important;
   font-weight: 600;
 }
-
+.list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
 .list .item {
   width: 47%;
   background: #112639;

--
Gitblit v1.9.3