jhzh
2024-04-07 fe1a028d6ad03860a9836951eaf4de6165d073d7
修改:客户问题处理
10 files modified
1 files deleted
18298 ■■■■■ changed files
chinese_data.json 62 ●●●●● patch | view | raw | blame | history
package-lock.json 18112 ●●●●● patch | view | raw | blame | history
src/locales/en.js 4 ●●●● patch | view | raw | blame | history
src/page/home/home.vue 2 ●●● patch | view | raw | blame | history
src/page/list/tradingList/tabs.vue 2 ●●● patch | view | raw | blame | history
src/page/newUser/setting.vue 72 ●●●●● patch | view | raw | blame | history
src/page/trading/buy.vue 15 ●●●●● patch | view | raw | blame | history
src/page/user/Warehouse.vue 10 ●●●●● patch | view | raw | blame | history
src/page/user/Warehouse/data.list.vue 13 ●●●● patch | view | raw | blame | history
src/page/user/Warehouse/item.card.vue patch | view | raw | blame | history
src/page/user/recharge-sure.vue 6 ●●●● patch | view | raw | blame | history
chinese_data.json
File was deleted
package-lock.json
Diff too large
src/locales/en.js
@@ -791,7 +791,7 @@
  hj221: "Welcome back",
  hj222: "Log in using your mobile phone number",
  hj223: "Don’t have an account yet? Register!",
  hj224: "front page",
  hj224: "home",
  hj225: "trade",
  hj226: "position",
  hj227: "mine",
@@ -869,7 +869,7 @@
  平臺: "platform",
  申購記錄: "Subscription records",
  資訊: "information",
  数字货币: "digital currency",
  数字货币: "DC",
  马股: "MY stocks",
  美股: "US stocks",
  名稱: "name",
src/page/home/home.vue
@@ -395,6 +395,7 @@
          icon: require("@/assets/ico/english.png"),
          lang: "zh-CN",
        },
        { text: "繁体中文", icon: require("@/assets/ico/tw.png"), lang: "tw" },
        { text: "हिंदी", icon: require("@/assets/ico/india.png"), lang: "en" },
        { text: "한국인", icon: require("@/assets/ico/india.png"), lang: "hy" },
        {
@@ -408,7 +409,6 @@
          lang: "ry",
        },
        { text: "繁体中文", icon: require("@/assets/ico/tw.png"), lang: "tw" },
      ],
      // language,
      Logo,
src/page/list/tradingList/tabs.vue
@@ -74,7 +74,7 @@
.title {
  // color: red;
  font-size: 18px;
  padding: 10px 20px 10px;
  // padding: 10px 20px 10px;
}
/deep/ .van-tabs--line .van-tabs__wrap {
  height: 50px;
src/page/newUser/setting.vue
@@ -65,21 +65,9 @@
        <div style="margin-right: 10px">{{ language }}</div>
      </div>
    </div>
    <van-popup
      v-model="settingDialog"
      position="bottom"
      :style="{ height: '35%' }"
      @close="popClose"
    >
      <div
        class="lang_box"
        v-for="(item, index) in actions"
        :key="index"
        @click="qkclick(item)"
      >
        <div
          :class="$i18n.locale == item.lang ? 'lang_box_txt' : 'lang_box_txta'"
        >
    <van-popup v-model="settingDialog" position="bottom" :style="{ height: '35%' }" @close="popClose">
      <div class="lang_box" v-for="(item, index) in actions" :key="index" @click="qkclick(item)">
        <div :class="$i18n.locale == item.lang ? 'lang_box_txt' : 'lang_box_txta'">
          {{ item.text }}
        </div>
      </div>
@@ -125,10 +113,20 @@
<script>
import * as api from "@/axios/api";
import { Toast, MessageBox } from "mint-ui";
import { isNull, pwdReg } from "@/utils/utils";
import { mapMutations } from "vuex";
import { Notify } from "vant";
  import {
    Toast,
    MessageBox
  } from "mint-ui";
  import {
    isNull,
    pwdReg
  } from "@/utils/utils";
  import {
    mapMutations
  } from "vuex";
  import {
    Notify
  } from "vant";
export default {
  name: "newUser",
@@ -144,14 +142,21 @@
      userInfo: [],
      onlineService: "",
      language: "",
      actions: [
        {
        actions: [{
          text: "English",
          icon: require("@/assets/ico/english.png"),
          lang: "zh-CN",
        },
        { text: "हिंदी", icon: require("@/assets/ico/india.png"), lang: "en" },
        { text: "한국인", icon: require("@/assets/ico/india.png"), lang: "hy" },
          {
            text: "हिंदी",
            icon: require("@/assets/ico/india.png"),
            lang: "en"
          },
          {
            text: "한국인",
            icon: require("@/assets/ico/india.png"),
            lang: "hy"
          },
        {
          text: "ภาษาไทย",
          icon: require("@/assets/ico/india.png"),
@@ -163,7 +168,11 @@
          lang: "ry",
        },
        { text: "繁体中文", icon: require("@/assets/ico/tw.png"), lang: "tw" },
          {
            text: "繁体中文",
            icon: require("@/assets/ico/tw.png"),
            lang: "tw"
          },
      ],
    };
  },
@@ -359,7 +368,11 @@
            this.pswDialog = false;
            this.settingDialog = false;
            Notify({ type: "success", message: this.$t("密码修改成功") });
              Notify({
                type: "success",
                message: this.$t("密码修改成功")
              });
              this.toRegister()
          } else {
            Toast(data.msg);
            this.settingDialog = false;
@@ -382,6 +395,7 @@
.right_gos_txt {
  margin-right: 15px;
}
.setting_content {
  width: 100%;
  height: 5rem;
@@ -439,6 +453,7 @@
    }
  }
}
.lang_box_txta {
  width: 100%;
  height: 100px;
@@ -446,6 +461,7 @@
  line-height: 100px;
  border-bottom: 1px solid #ecf5ff;
}
.lang_box_txt {
  width: 100%;
  height: 100px;
@@ -454,6 +470,7 @@
  border-bottom: 1px solid #ecf5ff;
  color: #2196f3;
}
.lang_box {
  width: 100%;
  display: flex;
@@ -461,6 +478,7 @@
  align-items: center;
  flex-direction: column;
}
.btn_s_box {
  border: none;
  background: #409eff;
@@ -474,12 +492,14 @@
  font-weight: 600;
  margin: 40px 20px 0 20px;
}
.btn_s {
  width: 100%;
  display: flex;
  justify-content: center;
  align-items: center;
}
.jy {
  width: 100%;
  height: 1.5rem;
@@ -538,6 +558,7 @@
    }
  }
}
body {
  background-color: #f8f8f8;
}
@@ -603,6 +624,7 @@
    height: 2rem;
    display: flex;
    background-color: #fff;
    > div {
      width: 10%;
      height: 100%;
src/page/trading/buy.vue
@@ -538,7 +538,20 @@
          elAlertType: "success",
        });
        this.getUserInfo();
        this.$router.push("/warehouse?index=0");
        var buyType = ''
        if (this.tabsCurrentIndex == 0) {
          buyType = 1;
        } else {
          buyType = 0;
        }
        if(this.bayType=='US'){
          this.$router.push("/warehouse?index=1&buyType="+buyType);
        }else if(this.bayType=='MAS'){
          this.$router.push("/warehouse?index=0&buyType="+buyType);
        }else {
          this.$router.push("/warehouse");
        }
      } else {
        if (data.msg.indexOf("不在交易时段内") > -1) {
          this.$store.commit("elAlertShow", {
src/page/user/Warehouse.vue
@@ -86,6 +86,15 @@
  created() {
    this.getMoneys();
  },
  mounted(){
    if(this.$route.query.index=='0'){
      this.onClick({name:4})
    }else if(this.$route.query.index=='1'){
      this.onClick({name:2})
    }else{
    }
  },
  methods: {
    itemClick() {
      this.$refs.dataListref.getList(this.activeObj.laber);
@@ -107,6 +116,7 @@
      }
    },
    onClick(e) {
      console.log(e);
      this.active = e.name;
      this.activeObj = e;
      this.getMoneys();
src/page/user/Warehouse/data.list.vue
@@ -32,15 +32,22 @@
          </div>
        </div>
        <van-row>
          <van-col span="12">
          <van-col span="8">
            <div style="text-align: left">
              <div class="sport-content-title2">{{ $t("盈虧") }} (USD)</div>
              <div class="sport-content-text" style="color: #d04b64">
                {{ item.profitAndLose }}
              </div>
            </div></van-col
            </div>
            </van-col
          >
          <van-col span="12">
          <van-col span="8">
            <div style="text-align: center">
              <div class="sport-content-title2">{{ $t("hj141") }} (USD)</div>
              <div class="sport-content-text2">{{ item.profitAndLoseParent }}</div>
            </div>
          </van-col>
          <van-col span="8">
            <div style="text-align: right">
              <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
              <div class="sport-content-text">{{ item.orderNum }}</div>
src/page/user/Warehouse/item.card.vue
src/page/user/recharge-sure.vue
@@ -57,10 +57,14 @@
      <div>
        <div class="dz-title" v-if="rechargeAccountData.key !== undefined">
          <div>{{ $t("可用餘額") }}</div>
          <div class="balance-text">
          <div class="balance-text" v-if="rechargeAccountData.key=='US'">
            {{ availableBalanceUSD }} USD
            <!-- {{ symbolCode }} -->
          </div>
          <div class="balance-text" v-else>
            {{ availableBalanceUSD }} MYR
            <!-- {{ symbolCode }} -->
          </div>
        </div>
      </div>
      <van-button