zzzz
2024-04-18 f2ef26bea6a230a75ecc4dd56a5ccaacf9117b03
fanyi
17 files modified
155 ■■■■ changed files
src/axios/api.url.js 4 ●●●● patch | view | raw | blame | history
src/components/foot.vue 4 ●●●● patch | view | raw | blame | history
src/locales/cht.json 5 ●●●● patch | view | raw | blame | history
src/locales/en.json 5 ●●●● patch | view | raw | blame | history
src/locales/hi.json 7 ●●●● patch | view | raw | blame | history
src/locales/index.js 24 ●●●● patch | view | raw | blame | history
src/locales/jp.json 5 ●●●● patch | view | raw | blame | history
src/locales/kor.json 5 ●●●● patch | view | raw | blame | history
src/locales/th.json 5 ●●●● patch | view | raw | blame | history
src/locales/zh.json 3 ●●●● patch | view | raw | blame | history
src/main.js 2 ●●●●● patch | view | raw | blame | history
src/page/home/home.vue 14 ●●●● patch | view | raw | blame | history
src/page/kline/components/kLine.vue 4 ●●●● patch | view | raw | blame | history
src/page/newUser/index.vue 32 ●●●●● patch | view | raw | blame | history
src/page/user/compontents/cash-list.vue 11 ●●●● patch | view | raw | blame | history
src/page/user/recharge-sure.vue 22 ●●●● patch | view | raw | blame | history
src/utils/allocation.js 3 ●●●● patch | view | raw | blame | history
src/axios/api.url.js
@@ -7,9 +7,9 @@
  // baseURL: '/',
  // baseURL: 'http://www.jumptalk.net:8091',
  // 0311
  baseURL: "https://api.3falcon.com/",
  // baseURL: "https://api.3falcon.com/",
  // 本地
  // baseURL: "http://192.168.0.102:8091/",
  baseURL: "http://192.168.0.109:8091/",
  util: {
    image: "/util/image.html" // 图片上传
  }
src/components/foot.vue
@@ -65,7 +65,7 @@
    </div> -->
    <div
      :class="touch == 4 ? 'footDemos' : 'footDemo'"
      @click="goRouter('/warehouse', 3)"
      @click="goRouter('/warehouse', 4)"
    >
      <div class="footImgDeft">
        <img
@@ -83,7 +83,7 @@
    </div>
    <div
      :class="touch == 5 ? 'footDemos' : 'footDemo'"
      @click="goRouter('/user', 4)"
      @click="goRouter('/user', 5)"
    >
      <div class="footImgDeft">
        <img
src/locales/cht.json
@@ -539,5 +539,8 @@
  "订单详情": "訂單詳情",
  "港股總資產": "港股總資產",
  "一鍵平倉": "一鍵平倉",
  "审核中": "取消充值"
  "审核中": "取消充值",
  "印股": "印股",
  "印股冻结": "印股凍結",
  "印度新闻": "印度新聞"
}
src/locales/en.json
@@ -546,5 +546,8 @@
  "订单详情": "Order details",
  "港股總資產": "Hong Kong Stock Total Assets",
  "审核中": "Cancel recharge",
  "一鍵平倉": "One click closing position"
  "一鍵平倉": "One click closing position",
  "印股": "Printing stocks",
  "印股冻结": "Freezing of printing stocks",
  "印度新闻": "Indian News"
}
src/locales/hi.json
@@ -544,6 +544,9 @@
  "港股冻结": "हांगकांग के स्टॉक जमे हुए",
  "订单详情": "ऑर्डर का विवरण",
  "港股總資產": "हांगकांग शेयरों की कुल संपत्ति",
  "审核中": "取消充值",
  "一鍵平倉": "一键平仓"
  "审核中": "टॉप-अप रद्द करें",
  "一鍵平倉": "एक क्लिक के साथ पोजीशन बंद करें",
  "印股": "प्रिंटिंग स्टॉक",
  "印股冻结": "प्रिंटिंग स्टॉक जमे हुए",
  "印度新闻": "इंडिया न्यूज"
}
src/locales/index.js
@@ -9,28 +9,28 @@
Vue.use(VueI18n);
const DEFAULT_LANG = "zh-CN";
const DEFAULT_LANG = "hi";
const LOCALE_KEY = "language";
const locales = {
  en: {
    ...en,
    ...en
  },
  hi: {
    ...india,
    ...india
  },
  "zh-TW": {
    ...tw,
    ...tw
  },
  th: {
    ...ty,
    ...ty
  },
  ja: {
    ...ry,
    ...ry
  },
  ko: {
    ...hy,
  },
    ...hy
  }
};
// en-us  zh-cn
// let langLocale = getCookie(LOCALE_KEY) || 'en';
@@ -43,17 +43,17 @@
const i18n = new VueI18n({
  locale: langLocale,
  messages: locales,
  silentTranslationWarn: true,
  silentTranslationWarn: true
});
const init = Vue.prototype._init;
Vue.prototype._init = function (options) {
Vue.prototype._init = function(options) {
  init.call(this, {
    i18n,
    ...options,
    ...options
  });
};
export const setup = (lang) => {
export const setup = lang => {
  if (lang === undefined) {
    // lang = window.localStorage.getItem(LOCALE_KEY);
    // const language = getCookie(LOCALE_KEY);
src/locales/jp.json
@@ -534,5 +534,8 @@
  "订单详情": "注文の詳細",
  "港股總資產": "香港株式総資産",
  "审核中": "チャージ解除",
  "一鍵平倉": "ワンクリック平倉"
  "一鍵平倉": "ワンクリック平倉",
  "印股": "いんさつ株",
  "印股冻结": "いんさつとうけつ",
  "印度新闻": "インドニュース"
}
src/locales/kor.json
@@ -534,5 +534,8 @@
  "港股冻结": "홍콩 주식 동결",
  "订单详情": "주문 상세 정보",
  "港股總資產": "홍콩 주식 총자산",
  "审核中": "충전 취소"
  "审核中": "충전 취소",
  "印股": "인주",
  "印股冻结": "인주가 동결되다",
  "印度新闻": "인도 뉴스"
}
src/locales/th.json
@@ -534,5 +534,8 @@
  "订单详情": "รายละเอียดการสั่งซื้อ",
  "港股總資產": "สินทรัพย์รวมของหุ้นฮ่องกง",
  "审核中": "ยกเลิกการเติมเงิน",
  "一鍵平倉": "การปิดเพียงคลิกเดียว"
  "一鍵平倉": "การปิดเพียงคลิกเดียว",
  "印股": "หุ้นพิมพ์",
  "印股冻结": "แช่แข็งหุ้นพิมพ์",
  "印度新闻": "ข่าวอินเดีย"
}
src/locales/zh.json
@@ -535,5 +535,6 @@
  "港股總資產": "港股总资产",
  "一鍵平倉": "一键平仓",
  "印股": "印股",
  "印股冻结": "印股冻结"
  "印股冻结": "印股冻结",
  "印度新闻": "印度新闻"
}
src/main.js
@@ -41,6 +41,8 @@
import echarts from "echarts";
Vue.prototype.$echarts = echarts;
Vue.prototype.$USD = allocation.$USD;
Vue.prototype.$USDT = allocation.$USDT;
Vue.prototype.$moment = moment;
// import VueTouch from 'vue-touch'
Vue.use(Swipe);
src/page/home/home.vue
@@ -267,17 +267,17 @@
      // 新闻导航
      newListHeader: [
        {
          title: "美国新闻",
          title: "印度新闻",
          id: "tab_0",
          data: [],
          type: 1,
        },
        {
          title: "马来西亚新闻",
          id: "tab_1",
          data: [],
          type: 2,
        },
        // {
        //   title: "马来西亚新闻",
        //   id: "tab_1",
        //   data: [],
        //   type: 2,
        // },
      ],
      // 公告 icon 地址
src/page/kline/components/kLine.vue
@@ -130,7 +130,7 @@
  var option = {
    Type: "分钟走势图", // 创建图形类型
    // Type:'分钟走势图横屏',
    Language: 1, // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
    Language: "EN", // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
    // 窗口指标
    Windows: [
      // { Index:"KDJ", Modify: false, Change: true, Close: true},
@@ -922,7 +922,7 @@
DefaultData.GetKLineOption = function () {
  var option = {
    Type: "历史K线图", // 创建图形类型
    Language: 1, // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
    Language: "EN", // 英文 'EN' 简体中文:'CN' 繁体中文:"TC"
    // 窗口指标
    Windows: [
      { Index: "MA", Modify: true, Change: false, height: 20 },
src/page/newUser/index.vue
@@ -73,16 +73,13 @@
            >
          </van-col>
          <!-- transferIndex -->
          <van-col span="8" style="display: flex; justify-content: center">
          <!-- <van-col span="8" style="display: flex; justify-content: center">
            <van-button
              @click="$router.push('/transferIndex')"
              class="btn-two"
              type="default"
              >{{ $t("hj245") }}</van-button
            >
          </van-col>
          <!-- <van-col span="6" style="display: flex; justify-content: center">
            <van-button class="btn-two" type="default">資金明細</van-button>
          </van-col> -->
        </van-row>
      </div>
@@ -157,33 +154,6 @@
          symbolCode: "INR",
          symbol: "₹",
        },
        // {
        //   title: this.$t("美股資產"),
        //   title3: this.$t("美股總資產"),
        //   title1: this.$t("美股可用"),
        //   title2: this.$t("美股冻结"),
        //   accectType: "US",
        //   symbol: "$",
        //   symbolCode: "USD",
        // },
        // {
        //   title: this.$t("馬股資產"),
        //   title3: this.$t("馬股總資產"),
        //   title1: this.$t("馬股可用"),
        //   title2: this.$t("馬股冻结"),
        //   accectType: "MAS",
        //   symbol: "RM",
        //   symbolCode: "MYR",
        // },
        // {
        //   title: this.$t("港股资产"),
        //   title3: this.$t("港股總資產"),
        //   title1: this.$t("港股可用"),
        //   title2: this.$t("港股冻结"),
        //   accectType: "HK",
        //   symbol: "HK$",
        //   symbolCode: "HKD",
        // },
      ],
      active: this.$t("印股資產"),
      name: "",
src/page/user/compontents/cash-list.vue
@@ -14,7 +14,7 @@
          <div class="order-info-box">
            <div class="order-title">
              <span class="main"> {{ $t("hjtxyhk") }} </span>
              <span class="payNumber">${{ item.withAmt }}</span>
              <span class="payNumber">{{ $USD }}{{ item.withAmt }}</span>
              <span class="red pull-right">
                {{
                  item.withStatus == 1
@@ -46,11 +46,10 @@
            </div>
            <div class="order-info">
              <p class="clearfix">
                <span class="col-xs-6"
                  >{{ $t("hj44") }}:<b class="space"
                    >${{ item.withFee }}</b
                  ></span
                >
                <span class="col-xs-6">
                  {{ $t("hj44") }}:
                  <b class="space"> {{ $USD }} {{ item.withFee }} </b>
                </span>
                <!-- <span class="col-xs-6">实际到账金额:<b class="space" style="font-size:0.26rem">{{item.withAmt - item.withFee}}</b>元</span>                         -->
              </p>
              <p class="clearfix">
src/page/user/recharge-sure.vue
@@ -85,7 +85,7 @@
    return {
      value: 0,
      paymentSelectData: "US",
      paymentSelectData: "IN",
      show: false,
@@ -99,17 +99,17 @@
      rechargeAccountData: {},
      rechargeAccountActions: [
        {
          name: this.$t("US"),
          key: "US",
          name: this.$t("IN"),
          key: "IN",
        },
        {
          name: this.$t("MAS"),
          key: "MAS",
        },
        {
          name: this.$t("HK"),
          key: "HK",
        },
        // {
        //   name: this.$t("MAS"),
        //   key: "MAS",
        // },
        // {
        //   name: this.$t("HK"),
        //   key: "HK",
        // },
      ],
      bankCard: {},
src/utils/allocation.js
@@ -1 +1,2 @@
export const $USD = "USD";
export const $USD = "₹";
export const $USDT = "INR";