jhzh
2024-05-26 fb74850a21ec54c3c67fceb31d038b2cf402c6c6
修改:客户反馈文档 5.24
13 files modified
2 files added
121 ■■■■■ changed files
index.html 4 ●●●● patch | view | raw | blame | history
src/assets/img/20240518-225348.jpg patch | view | raw | blame | history
src/assets/img/max.jpg patch | view | raw | blame | history
src/axios/api.js 5 ●●●● patch | view | raw | blame | history
src/axios/api.url.js 2 ●●● patch | view | raw | blame | history
src/components/Language/index.vue 10 ●●●● patch | view | raw | blame | history
src/locales/en.json 4 ●●●● patch | view | raw | blame | history
src/page/authentication/index.vue 12 ●●●● patch | view | raw | blame | history
src/page/home/home.vue 9 ●●●●● patch | view | raw | blame | history
src/page/kline/index.vue 8 ●●●● patch | view | raw | blame | history
src/page/login/register.vue 34 ●●●● patch | view | raw | blame | history
src/page/user/Warehouse/data.list.vue 2 ●●● patch | view | raw | blame | history
src/page/user/Warehouse/item.card.vue 2 ●●● patch | view | raw | blame | history
src/page/user/compontents/cash-list.vue 4 ●●●● patch | view | raw | blame | history
src/page/user/recharge.vue 25 ●●●● patch | view | raw | blame | history
index.html
@@ -5,7 +5,7 @@
    <meta charset="utf-8">
    <meta name="viewport"
        content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
    <title>首页</title>
    <title>Brac</title>
    <link rel="shortcut icon" href=./favicon.ico type=image/x-icon>
    <link href="static/css/public1.css" rel="stylesheet">
    <link href="//at.alicdn.com/t/c/font_4480663_5e9rjcl352x.css" rel="stylesheet">
@@ -45,4 +45,4 @@
    <!-- built files will be auto injected -->
</body>
</html>
</html>
src/assets/img/20240518-225348.jpg
src/assets/img/max.jpg
src/axios/api.js
@@ -95,7 +95,10 @@
export function getCode(options) {
  return get("/api/sms/sendRegSms.do", options);
}
// 获取验证码  -- 注册
export function getyzmCode(options) {
  return post("/api/user/sendSms.do", options);
}
// 获取验证码  -- 忘记密码
export function sendForgetSms(options) {
  return get("/api/sms/sendForgetSms.do", options);
src/axios/api.url.js
@@ -9,7 +9,7 @@
  // 0311
  // baseURL: "http://192.168.0.111:8091/",
  // baseURL: "https://brac.barcblays.com/",
  // baseURL: "http://192.168.0.105:8091/",
  // baseURL: "http://192.168.10.4:8091/",
  baseURL: "https://brac.barcblays.com/",
  // 本地
  // baseURL: "http://192.168.0.105:8091/",
src/components/Language/index.vue
@@ -35,11 +35,11 @@
      language: "",
      // 多语言配置
      actions: [
        {
          text: "繁体中文",
          icon: require("@/assets/ico/tw.png"),
          lang: "zh-TW",
        },
        // {
        //   text: "繁体中文",
        //   icon: require("@/assets/ico/tw.png"),
        //   lang: "zh-TW",
        // },
        {
          text: "English",
          icon: require("@/assets/ico/english.png"),
src/locales/en.json
@@ -142,7 +142,7 @@
  "hj24": "Log in",
  "hj25": "verification code",
  "hj26": "Mobile phone number registration",
  "hj27": "Phone number",
  "hj27": "ID number",
  "hj28": "please enter a valid phone number",
  "hj29": "Mobile phone number cannot be empty",
  "hj30": "Please enter password",
@@ -317,7 +317,7 @@
  "hj193": "Confirm the transfer to the index account",
  "hj194": "Confirm the transfer to the financing account",
  "hj195": "Actual name",
  "hj196": "Phone number",
  "hj196": "ID number",
  "hj197": "The front of the ID card",
  "hj198": "Uploading...",
  "hj199": "the back of the ID card",
src/page/authentication/index.vue
@@ -62,7 +62,7 @@
          <el-upload
            :with-credentials="true"
            class="avatar-uploader"
            :action="admin + '/user/upload.do'"
            :action="admin + 'user/upload.do'"
            list-type="picture-card"
            name="upload_file"
            :show-file-list="false"
@@ -88,7 +88,7 @@
          <el-upload
            :with-credentials="true"
            class="avatar-uploader"
            :action="admin + '/user/upload.do'"
            :action="admin + 'user/upload.do'"
            list-type="picture-card"
            name="upload_file"
            :show-file-list="false"
@@ -204,6 +204,14 @@
    },
    beforeAvatarUpload(file) {
      this.imgStatus = true;
      const isLt10M = file.size / 1024 / 1024 < 10;
      if (!isLt10M) {
        this.$message.error(this.$t("hj205"));
        return false;
      } else {
        this.form.img1key = URL.createObjectURL(file);
        compress(file, function (val) {});
      }
    },
    handleError() {
      this.imgStatus = false;
src/page/home/home.vue
@@ -15,7 +15,7 @@
        </div>
        <!-- 公告 -->
        <!-- <van-skeleton title :row="1" :loading="loading" /> -->
        <div class="announcement">
        <div class="announcement" v-if="artList">
          <div class="an_content" @click="$router.push('/newGg')">
            <div class="an_left_icon">
              <img :src="Announcement" alt />
@@ -287,13 +287,10 @@
      currentIndex: 0,
      bannerImgsArr: [
        {
          img: "https://api.trowegroup.com/bs/image/20240305/06eb4602ba7b3e570ccd70c0415884ec.png",
          img: require("@/assets/img/max.jpg"),
        },
        {
          img: "https://api.trowegroup.com/bs/image/20240305/b923c7645712aeaeb93d660ce846f448.png",
        },
        {
          img: "https://api.trowegroup.com/bs/image/20240305/06eb4602ba7b3e570ccd70c0415884ec.png",
          img: require("@/assets/img/20240518-225348.jpg"),
        },
      ],
      // 公告列表
src/page/kline/index.vue
@@ -63,7 +63,7 @@
                  </span>
                </div>
                <div class="sanjiao">
                </div>
              </div>
              <div class="bottom_balance">
@@ -107,7 +107,7 @@
                <!-- <span v-else>({{ singDetails.nowPrice - singDetails.preclose_px > 0 ? '+' : '' }}
                  {{ singDetails.hcrate ? singDetails.hcrate : '0' }}%)</span> -->
                <span v-else
                  >({{ singDetails.hcrate > 0 ? "+" : "" }}
                  >(
                  {{ singDetails.hcrate ? singDetails.hcrate : "0" }}%)</span
                >
              </div>
@@ -436,7 +436,7 @@
            <span>{{ $t("hj84") }}</span>
          </div>
          <div class="bottom_buy">
            <span>{{ singDetails.nowPrice }}</span>
            <span>{{ singDetails.nowPrice=='0'?singDetails.price:singDetails.nowPrice }}</span>
          </div>
        </div>
        <div class="sell_btn" @click="goBuy(1)">
@@ -444,7 +444,7 @@
            <span>{{ $t("hj85") }}</span>
          </div>
          <div class="bottom_sell">
            <span>{{ singDetails.nowPrice }}</span>
            <span>{{ singDetails.nowPrice=='0'?singDetails.price:singDetails.nowPrice }}</span>
          </div>
        </div>
      </div>
src/page/login/register.vue
@@ -8,6 +8,7 @@
      <div class="login_forms">
        <div class="top_forms">
          <el-input
          style="width: 80%;"
            :placeholder="placeholder"
            size="medium"
            v-model="phone"
@@ -15,6 +16,12 @@
            @input="handleInput()"
          >
          </el-input>
          <van-button
            :disabled="(phone&&!countdown)?false:true"
            type="info"
            class="sendMailCode"
            @click="sendCode"
          >{{ $t("获取验证码") }}</van-button>
          <!-- <el-input style="margin-top: 0.46rem;" :placeholder="verification" :size="medium" v-model="code" clearable>
          </el-input> -->
          <el-input
@@ -44,7 +51,7 @@
            @input="handleInput()"
          >
          </el-input>
          <div>
         <!-- <div>
            <el-input
              style="margin-top: 0.46rem"
              :placeholder="$t('请输入邮箱号')"
@@ -59,7 +66,7 @@
              class="sendMailCode"
              @click="sendCode"
            >{{ $t("获取验证码") }}</van-button>
          </div>
          </div> -->
          <el-input
            style="margin-top: 0.46rem"
@@ -117,7 +124,8 @@
      checked: false,
      verification: this.$t("hj25"),
      loginWay: this.$t("hj26"),
      placeholder: this.$t("hj27"),
      placeholder: this.$t("regPhone2"),
      // placeholder: 'phone',
      phone: "",
      userName: "",
      code: "",
@@ -135,16 +143,27 @@
      : "";
  },
  methods: {
    async sendCode(){
      if (!this.email){
        Notify({ type: "warning", message: this.$t("请输入邮箱号") })
      if (!this.phone){
        Notify({ type: "warning", message: this.$t("hj25") })
      }else {
        // 启动计时器
        this.startCountdown();
        let data = await api.sendMailCode({email: this.email});
        let data = await api.getyzmCode({phone: this.phone});
        console.log(data)
      }
    },
    // async sendCode(){
    //   if (!this.email){
    //     Notify({ type: "warning", message: this.$t("请输入邮箱号") })
    //   }else {
    //     // 启动计时器
    //     this.startCountdown();
    //     let data = await api.sendMailCode({email: this.email});
    //     console.log(data)
    //   }
    // },
    startCountdown() {
      this.countdown = 30; // 设置倒计时时间
      const intervalId = setInterval(() => {
@@ -191,7 +210,8 @@
            yzmCode: this.mailCode,
            userPwd: this.userPassword,
            agentCode: this.userName,
            email: this.email
            email: this.email,
            phoneCode:this.mailCode,
          };
          let data = await api.register(opts);
          if (data.status === 0) {
src/page/user/Warehouse/data.list.vue
@@ -43,7 +43,7 @@
              <div class="sport-content-title2">
                {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
              </div>
              <div class="sport-content-text" style="color: #d04b64">
              <div class="sport-content-text" :style="item.profitAndLose>0?'color: #03AD8F;':'color: #d04b64;'">
                {{ item.profitAndLose }}
              </div>
            </div>
src/page/user/Warehouse/item.card.vue
@@ -10,7 +10,7 @@
          ≈ {{ $USD }} {{ activeObj.totalMoneyUSD || "0.0000" }}
        </div>
      </div>
      <div class="right" @click="closeAll">{{ $t("全部平仓") }}</div>
      <!-- <div class="right" @click="closeAll">{{ $t("全部平仓") }}</div> -->
    </div>
    <div class="item-card-itembox">
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">₹{{ item.withAmt }}</span>
              <span class="red pull-right">
                {{
                  item.withStatus == 1
@@ -48,7 +48,7 @@
              <p class="clearfix">
                <span class="col-xs-6"
                  >{{ $t("hj44") }}:<b class="space"
                    >${{ item.withFee }}</b
                    >₹{{ item.withFee }}</b
                  ></span
                >
                <!-- <span class="col-xs-6">实际到账金额:<b class="space" style="font-size:0.26rem">{{item.withAmt - item.withFee}}</b>元</span>                         -->
src/page/user/recharge.vue
@@ -113,18 +113,15 @@
                {{ $t("上傳憑證:") }}
              </div>
              <el-upload
                v-loading="loading"
                :with-credentials="true"
                class="avatar-uploader"
                :action="admin + '/user/upload.do'"
                :action="admin + 'user/upload.do'"
                list-type="picture-card"
                name="upload_file"
                :show-file-list="false"
                :on-success="handleAvatarSuccess"
                :on-error="handleError"
                :before-upload="beforeAvatarUpload"
                :disabled="!showBtn"
                :limit="1"
              >
                <img
                  v-if="form.img1key"
@@ -154,6 +151,7 @@
import apiUrl from "@/axios/api.url.js";
import { siteGetPayInfo, selCzFn } from "../../axios/api";
import { Notify } from "vant";
import { compress } from "@/utils/imgupload";
import { rechargeAccountActions } from "@/utils/rechargeActions";
// baseURL
export default {
@@ -231,13 +229,26 @@
    handleAvatarSuccess(res, file) {
      this.imgStatus = false;
      this.form.img1key = res.data.url;
      this.loading = false;
      this.judgeValue();
      // this.loading = false;
      // this.judgeValue();
    },
    beforeAvatarUpload(file) {
      this.loading = true;
      this.judgeValue();
      // this.imgStatus = true;
      this.imgStatus = true;
      const isLt10M = file.size / 1024 / 1024 < 10;
      if (!isLt10M) {
        this.$message.error(this.$t("hj205"));
        return false;
      } else {
        this.form.img1key = URL.createObjectURL(file);
        console.log(this.form.img1key );
        compress(file, function (val) {
          console.log(val);
        });
        // this.judgeValue();
      }
    },
    handleError() {
      this.loading = false;