Merge remote-tracking branch 'origin/0311' into 0311

dcc

2024-05-06 34ef18c62b80167c86345eaf635e871e792d4da2

Merge remote-tracking branch 'origin/0311' into 0311

# Conflicts:
#	src/page/list/tradingList/tabs.vue
#	src/page/newUser/index.vue

 config/index.js

@@ -40,7 +40,7 @@
    },

    // Various Dev Server settings
    host: "192.168.0.101", // can be overwritten by process.env.HOST
    host: "0.0.0.0", // can be overwritten by process.env.HOST
    port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: true,
    errorOverlay: true,

 package-lock.json

Diff too large

 src/axios/api.url.js

@@ -1,13 +1,13 @@
// const ENV = process.env.NODE_ENV
export default {
  DOMAIN: "https://api.3falcon.com/",
  DOMAIN: "https://brac.barcblays.com/",
  // baseURL: ENV == 'development'?'https://api.guosen.org/':'https://api.guosen.org/',
  // baseURL: 'http://localhost:8070',
  /* Util API */
  // baseURL: '/',
  // baseURL: 'http://www.jumptalk.net:8091',
  // 0311
  baseURL: "https://api.3falcon.com/",
  baseURL: "https://brac.barcblays.com/",
  // 本地
  // baseURL: "http://192.168.0.102:8091/",
  util: {

 src/page/user/Warehouse.vue

@@ -69,23 +69,32 @@
          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: "3",
          bgc: "rgb(12, 175, 226)",
          laber: "IN",
          symbolCode: "INR",
          symbol: "₹",
        },
        {
          title: this.$t("港股"),
          assname: this.$t("港股总资产"),
          name: "5",
          bgc: "rgb(255 91 230)",
          laber: "HK",
          symbolCode: "HKD",
          symbol: "HK$",
        },
        // {
        //   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("港股总资产"),
        //   name: "5",
        //   bgc: "rgb(255 91 230)",
        //   laber: "HK",
        //   symbolCode: "HKD",
        //   symbol: "HK$",
        // },
      ],
      getMoneyList: [],
    };

 src/page/user/recharge-sure.vue

@@ -103,13 +103,17 @@
          key: "US",
        },
        {
          name: this.$t("MAS"),
          key: "MAS",
          name: this.$t("IN"),
          key: "IN",
        },
        {
          name: this.$t("HK"),
          key: "HK",
        },
        // {
        //   name: this.$t("MAS"),
        //   key: "MAS",
        // },
        // {
        //   name: this.$t("HK"),
        //   key: "HK",
        // },
      ],

      bankCard: {},

 yarn.lock

Diff too large