From 04cd652e2aab05ff5a6cde1c3a6e0a18f4d6bf1c Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Mon, 02 Sep 2024 15:26:12 +0800
Subject: [PATCH] 1

---
 src/page/user/Warehouse.vue             |   53 +++++++++++++++-----------
 src/locales/zh.json                     |   22 ++++++++---
 src/page/list/tradingList/tabs.vue      |   10 ++--
 src/page/home/home.vue                  |    4 +-
 src/page/list/tradingList/data.list.vue |    4 +-
 favicon.ico                             |    0 
 src/axios/api.url.js                    |    4 +-
 src/assets/img/aba.jpg                  |    0 
 src/assets/img/img_log_home.png         |    0 
 9 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/favicon.ico b/favicon.ico
index 640b46b..5386149 100644
--- a/favicon.ico
+++ b/favicon.ico
Binary files differ
diff --git a/src/assets/img/aba.jpg b/src/assets/img/aba.jpg
new file mode 100644
index 0000000..6ffd9bf
--- /dev/null
+++ b/src/assets/img/aba.jpg
Binary files differ
diff --git a/src/assets/img/img_log_home.png b/src/assets/img/img_log_home.png
index f328d09..8a31800 100644
--- a/src/assets/img/img_log_home.png
+++ b/src/assets/img/img_log_home.png
Binary files differ
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index b68b642..b09b5cd 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -9,8 +9,8 @@
   // 0311
   // baseURL: "https://api.essencefunds.com/",
   // 本地
-  baseURL: "https://api.coinbtcs.com/",
-  // baseURL: "http://192.168.10.7:8091/",
+  // baseURL: "https://api.coinbtcs.com/",
+  baseURL: "http://192.168.10.7:8091/",
   util: {
     image: "/util/image.html" // 图片上传
   }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 487b32d..f5eaf57 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,4 +1,11 @@
 {
+  "新股总资产":"新股总资产",
+  "秘钥":"秘钥",
+  "描述":"描述",
+  "操作时间":"操作时间",
+  "请输入电子邮箱":"请输入电子邮箱",
+  "银行卡户主名称":"银行卡户主名称",
+  "请输入银行卡户主名称":"请输入银行卡户主名称",
   "tips_sb": "有问题请通过Telegram联系我们",
   "top_s": "如果您有任何问题,请通过电子邮件与我们联系",
   "zc": "支持",
@@ -21,7 +28,7 @@
   "whpb": "订单金额(INR)",
   "ldgl": "获利价格/止损价格(INR)",
   "ssdd": "仓位价格/最新价格(INR)",
-  "yy": "Language",
+  "yy": "语言",
   "tolaszasdf": "总手续费(USD)",
   "accumbn": "累积P/L (USD)",
   "djzjmg": "冻结资产(USD)",
@@ -31,7 +38,7 @@
   "aym": "累计P/L(INR)",
   "disana": "冻结资产(INR)",
   "disan": "可用资产(INR)",
-  "setting": "Set up",
+  "setting": "设置",
   "caidan": "资质",
   "bz": "帮助",
   "kf": "客服",
@@ -272,11 +279,11 @@
   "hj141": "盈亏率",
   "hj142": "切换指数账户",
   "hj143": "切换沪深账户",
-  "hj144": "Change Password",
+  "hj144": "更改密码",
   "hj145": "资金划转",
-  "hj146": "Verify",
+  "hj146": "核实",
   "hj1461": "下载App",
-  "hj147": "Bind Bank Card",
+  "hj147": "绑定银行卡",
   "hj148": "退出登录",
   "hj149": "您确定要退出登录吗?",
   "hj150": "旧密码",
@@ -564,5 +571,8 @@
   "周期": "周期",
   "市场": "市场",
   "配售结束时间": "配售结束时间",
-  "请选择提现金额": "请选择提现金额"
+  "请选择提现金额": "请选择提现金额",
+  "关于我们": "关于我们",
+  "贷款": "贷款",
+  "hj621": "大宗交易"
 }
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 4008066..aa5527d 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -270,10 +270,10 @@
       currentIndex: 0,
       bannerImgsArr: [
         {
-          img: require("@/assets/img/max.jpg"),
+          img: require("@/assets/img/aba.jpg"),
         },
         {
-          img: require("@/assets/img/20240518-225348.jpg"),
+          img: require("@/assets/img/aba.jpg"),
         },
         // {
         //   img: "https://api.trowegroup.com/bs/image/20240305/06eb4602ba7b3e570ccd70c0415884ec.png",
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 7281e50..97601ea 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -226,7 +226,7 @@
       } else {
         let array = this.zxtabsList.filter((item) => item.key === b);
         console.log(this.zxtabsList, b);
-        stockType = array[0].name;
+        // stockType = array[0].name;
       }
       let pageNumVal = c || this.pageNumVal;
       let opt = {
@@ -346,4 +346,4 @@
   text-align: left;
   color: #14181f;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/page/list/tradingList/tabs.vue b/src/page/list/tradingList/tabs.vue
index 2e067b3..99b01f8 100644
--- a/src/page/list/tradingList/tabs.vue
+++ b/src/page/list/tradingList/tabs.vue
@@ -44,19 +44,19 @@
 export default {
   components: { dataList },
   mounted() {
-    this.active = this.$route.query.type || "IN";
+    this.active = this.$route.query.type || "MAS";
   },
   data() {
     return {
       tabsList: [
         { title: this.$t("hj61"), key: "" },
-        { title: this.$t("印股"), key: "IN", name: "IN" },
-        { title: this.$t("美股"), key: "US", name: "US" },
+        { title: this.$t("马股"), key: "MAS", name: "MAS" },
+        { title: this.$t("新股"), key: "SGP", name: "SGP" },
         { title: this.$t("hj261"), key: "DZ", name: "DZ" },
       ],
-      zxtabsList: [{ title: this.$t("印股"), key: "IN", name: "IN" }],
+      zxtabsList: [{ title: this.$t("马股"), key: "MAS", name: "MAS" }],
       active: "",
-      zxactive: "IN",
+      zxactive: "",
       sousuo: "",
     };
   },
diff --git a/src/page/user/Warehouse.vue b/src/page/user/Warehouse.vue
index 5ca9c22..3b47a82 100644
--- a/src/page/user/Warehouse.vue
+++ b/src/page/user/Warehouse.vue
@@ -54,8 +54,8 @@
   components: { card, itemCard, dataList },
   data() {
     return {
-      actives: "2",
-      active: "2",
+      actives: "1",
+      active: "1",
       activeObj: {},
       tabsArr: [
         // {
@@ -66,24 +66,24 @@
         //   symbolCode: "USD",
         //   symbol: "$",
         // },
-        {
-          title: this.$t("ydgs"),
-          assname: this.$t("印股总资产"),
-          name: "2",
-          bgc: "rgb(12, 175, 226)",
-          laber: "IN",
-          symbolCode: "INR",
-          symbol: "₹",
-        },
         // {
-        //   title: this.$t("马来西亚"),
-        //   assname: this.$t("馬股总资产"),
-        //   name: "4",
-        //   bgc: "rgb(163, 91, 255)",
-        //   laber: "MAS",
-        //   symbolCode: "MYR",
-        //   symbol: "RM",
+        //   title: this.$t("ydgs"),
+        //   assname: this.$t("印股总资产"),
+        //   name: "2",
+        //   bgc: "rgb(12, 175, 226)",
+        //   laber: "IN",
+        //   symbolCode: "INR",
+        //   symbol: "₹",
         // },
+        {
+          title: this.$t("马来西亚"),
+          assname: this.$t("馬股总资产"),
+          name: "4",
+          bgc: "rgb(163, 91, 255)",
+          laber: "MAS",
+          symbolCode: "MYR",
+          symbol: "RM",
+        },
         // {
         //   title: this.$t("港股"),
         //   assname: this.$t("港股总资产"),
@@ -94,14 +94,23 @@
         //   symbol: "HK$",
         // },
         {
-          title: this.$t("美股"),
-          assname: this.$t("美股总资产"),
+          title: this.$t("hj3"),
+          assname: this.$t("新股总资产"),
           name: "3",
             bgc: "rgb(255 91 230)",
-          laber: "US",
-          symbolCode: "USD",
+          laber: "SGP",
+          symbolCode: "SGD",
           symbol: "$",
         },
+        // {
+        //   title: this.$t("美股"),
+        //   assname: this.$t("美股总资产"),
+        //   name: "3",
+        //     bgc: "rgb(255 91 230)",
+        //   laber: "US",
+        //   symbolCode: "USD",
+        //   symbol: "$",
+        // },
       ],
       getMoneyList: [],
     };

--
Gitblit v1.9.3