修改：客户反馈问题

jhzh

2024-04-28 3da2a498c24b2846649cbbe468910899a6f11a98

修改：客户反馈问题

 .gitignore

@@ -13,3 +13,4 @@
*.njsproj
*.sln
*.zip
cc_wap.rar

 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

@@ -23,6 +23,7 @@
        "lib-flexible": "^0.3.2",
        "mint-ui": "^2.2.13",
        "moment": "^2.29.4",
        "moment-timezone": "^0.5.45",
        "pdfjs-dist": "2.2.228",
        "qrcode": "^1.4.4",
        "qrcodejs2": "0.0.2",
@@ -8542,6 +8543,17 @@
      "version": "2.29.4",
      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
      "engines": {
        "node": "*"
      }
    },
    "node_modules/moment-timezone": {
      "version": "0.5.45",
      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.45.tgz",
      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
      "dependencies": {
        "moment": "^2.29.4"
      },
      "engines": {
        "node": "*"
      }
@@ -24944,6 +24956,14 @@
      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
    },
    "moment-timezone": {
      "version": "0.5.45",
      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.45.tgz",
      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
      "requires": {
        "moment": "^2.29.4"
      }
    },
    "move-concurrently": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",

 src/axios/api.url.js

 src/page/list/tradingList/dazy.vue

@@ -20,7 +20,7 @@
        </div>
        <p class="plm">
          <span>{{ $t("hj263") }}</span>
          <a>{{ currentItem.nowPrice | _toString }}</a>
          <a>{{ currentItem.nowPrice*num | _toString }}</a>
        </p>
        <div class="erty">
          <input

 src/page/trading/buy.vue

@@ -27,19 +27,11 @@
            </div>
            <div class="rights">
              <div class="ese">
                <div
                  class="mc"
                  @click="handleTradingClick(0)"
                  :class="tabsCurrentIndex === 0 ? 'actives' : ''"
                >
                <div class="mc" @click="handleTradingClick(0)" :class="tabsCurrentIndex === 0 ? 'actives' : ''">
                  <span>{{ $t("hj84") }}</span>
                </div>

                <div
                  class="mr"
                  @click="handleTradingClick(1)"
                  :class="tabsCurrentIndex === 1 ? 'active' : ''"
                >
                <div class="mr" @click="handleTradingClick(1)" :class="tabsCurrentIndex === 1 ? 'active' : ''">
                  <span>{{ $t("hj85") }}</span>
                </div>
              </div>
@@ -50,13 +42,8 @@

      <div class="price_tabs">
        <div class="tabs">
          <div
            class="tab_item"
            v-for="(item, index) in priceTabs"
            :key="index"
            @click="handleTabsClick(item, index)"
            :class="priceTabsCurrentIndex === index ? 'active' : ''"
          >
          <div class="tab_item" v-for="(item, index) in priceTabs" :key="index" @click="handleTabsClick(item, index)"
            :class="priceTabsCurrentIndex === index ? 'active' : ''">
            <span>{{ item }}</span>
          </div>
        </div>
@@ -73,14 +60,11 @@
                <img src="@/assets/img/ic_number_jian.png" alt />
              </div>
              <div class="addorj"></div>
              <div
                class="addorj"
                @click="
              <div class="addorj" @click="
                  typeof nums == 'string'
                    ? (nums = Number(Number(nums) + 1).toFixed(2))
                    : (nums = (Number(nums) + 1).toFixed(2))
                "
              >
                ">
                <img src="@/assets/img/ic_number_add.png" />
              </div>
            </div>
@@ -90,12 +74,7 @@
          </div>
          <div class="tr_es flexJy">
            <div class="top_input">
              <input
                type="number"
                onkeyup="value=value.replace(/[^\d]/g,'')"
                v-model="num"
                @input="numInput"
              />
              <input type="number" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="num" @input="numInput" />
            </div>
            <div class="right_sw flexJy" style="width: auto">
              <div class="addorj" @click="jyslJian">
@@ -148,21 +127,16 @@
        </div>
        <div class="zy" v-show="checkedZy">
          <div class="left_zy">
            <input
              v-model="profitTarget"
              onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
              @input="zyInt"
            />
            <input v-model="profitTarget" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
              @input="zyInt" />
          </div>
          <div class="right_sw" style="width: auto">
            <div class="addorj" @click="zYjian">
              <img src="@/assets/img/ic_number_jian.png" />
            </div>
            <div class="addorj"></div>
            <div
              class="addorj"
              @click="profitTarget = (Number(profitTarget) + 1).toFixed(2)"
            >
            <div class="addorj"
              @click="tabsCurrentIndex==0?profitTarget = (Number(profitTarget) + 1).toFixed(2):profitTarget = (Number(profitTarget) + 1).toFixed(2)">
              <img src="@/assets/img/ic_number_add.png" />
            </div>
          </div>
@@ -177,14 +151,11 @@
        </div>
        <div class="zy" v-show="checkedZs">
          <div class="left_zy">
            <input
              v-model="zhisun"
              onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
              @input="zsInt"
            />
            <input v-model="zhisun" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" @input="zsInt" />
          </div>
          <div class="right_sw" style="width: auto">
            <div class="addorj" @click="zhisun--">
            <div class="addorj"
              @click="zSjian">
              <img src="@/assets/img/ic_number_jian.png" />
            </div>
            <div class="addorj"></div>
@@ -200,20 +171,16 @@
        </div>
      </div>
    </div>
    <van-action-sheet
      v-model="showGg"
      :actions="siteLeverList"
      :cancel-text="$t('hj106')"
      :description="$t('hj107')"
      close-on-click-action
      @select="onSelect"
    />
    <van-action-sheet v-model="showGg" :actions="siteLeverList" :cancel-text="$t('hj106')" :description="$t('hj107')"
      close-on-click-action @select="onSelect" />
  </div>
</template>

<script>
import * as api from "@/axios/api";
import { mapActions } from "vuex";
  import {
    mapActions
  } from "vuex";

export default {
  name: "trBuy",
@@ -275,13 +242,20 @@
      if_us: 0,
      bayType: "",
      id: "",
      actions: [
        { name: "100X", subname: this.$t("hj102") },
        { name: "200X", subname: this.$t("hj102") },
        { name: "300X", subname: this.$t("hj102") },
      ],
      profitArr: [
        actions: [{
            name: "100X",
            subname: this.$t("hj102")
          },
        {
            name: "200X",
            subname: this.$t("hj102")
          },
          {
            name: "300X",
            subname: this.$t("hj102")
          },
        ],
        profitArr: [{
          name: this.$t("hj104"),
          checked: false,
        },
@@ -298,6 +272,7 @@
      gid: "",
    };
  },

  mounted() {
    this.bayType = this.$route.query.bayType;
    this.gid = this.$route.query.gid;
@@ -325,6 +300,14 @@
    },
  },
  methods: {
      zSjian(){
        var newzishu = (Number(this.zhisun)-1).toFixed(2)
        if(Number(newzishu)<1){

        }else{
          this.zhisun = newzishu
        }
      },
    ...mapActions(["setUseInfo"]),
    numInput(e) {
      // this.nowPrice / this.selectCycle.replace("X", "")
@@ -339,6 +322,10 @@
      }
      // if()
      console.log(e.target.value);
      },
      handleDoubleClick(event) {
        console.log(1);
        // console.log('Input field was double-clicked', event);
    },
    async getMoneyData() {
      let data = await api.getMoney();
@@ -367,9 +354,9 @@
          this.nowPrice /
          this.selectCycle.replace("X", "")
      );
      typeof this.num == "string"
        ? (this.num = Number(Number(this.num) + 1))
        : (this.num = Number(Number(this.num) + 1));
        typeof this.num == "string" ?
          (this.num = Number(Number(this.num) + 1)) :
          (this.num = Number(Number(this.num) + 1));

      console.log(this.num, numbs);
      if (this.num >= numbs) {
@@ -403,18 +390,38 @@
      }
    },
    zYjian() {
      if ((Number(this.profitTarget) - 1).toFixed(2) < this.nowPrice) {
        this.profitTarget = this.nowPrice;
      var newzishu = (Number(this.profitTarget)-1).toFixed(2)
      if(Number(newzishu)<1){

      } else {
        this.profitTarget = (Number(this.profitTarget) - 1).toFixed(2);
        this.profitTarget = newzishu
      }
        // this.profitTarget = (Number(this.profitTarget) - 1).toFixed(2);
        // if(this.tabsCurrentIndex==0){
        //   console.log( this.nowPrice);
        //   if ((Number(this.profitTarget) - 1).toFixed(2) < this.nowPrice) {
        //     this.profitTarget = (Number(this.profitTarget) - 1).toFixed(2);
        //   } else {
        //     this.profitTarget = this.nowPrice;
        //   }
        // }else{
        //   console.log(123);
        //   if ((Number(this.profitTarget) - 1).toFixed(2) < this.nowPrice) {
        //     this.profitTarget = this.nowPrice;
        //   } else {
        //     this.profitTarget = (Number(this.profitTarget) - 1).toFixed(2);
        //   }
        // }


    },
    zSjia() {
      if ((Number(this.zhisun) + 1).toFixed(2) > this.nowPrice) {
        this.zhisun = this.nowPrice;
      } else {
        this.zhisun++;
      }
        // if ((Number(this.zhisun) + 1).toFixed(2) > this.nowPrice) {
        //   this.zhisun = this.nowPrice;
        // } else {
        //   this.zhisun++;
        // }
    },
    zsInt(e) {
      if (typeof e.target.value === "string") {
@@ -440,8 +447,10 @@
    },
    gdOrSetBuy() {
      if (this.priceTabsCurrentIndex == 0) {

        this.setBuy();
      } else {

        this.gdBuy();
      }
      if (navigator.vibrate) {
@@ -633,12 +642,13 @@

          this.siteLeverList = [];
          for (
            let i = 0;
            i < this.$store.state.userInfo.siteLever.split("/").length;
            i++
              let i = 0; i < this.$store.state.userInfo.siteLever.split("/").length; i++
          ) {
            let val = this.$store.state.userInfo.siteLever.split("/")[i];
            let item = { label: val, name: val + "X" };
              let item = {
                label: val,
                name: val + "X"
              };
            this.siteLeverList.push(item);
          }
          console.log(this.siteLeverList, " this.selectCycle");
@@ -1069,6 +1079,7 @@
    transform: skew(-10deg, 0deg);
  }
}

/deep/.van-overlay {
  z-index: 10000 !important;
}

 src/page/user/Warehouse/Stockdetail.vue

@@ -13,11 +13,11 @@

    <div class="bottomIfr">
      <div class="pagebox">
        <div class="pagebox_left">{{ $t("盈虧") }} ({{ pages.stockGid }})</div>
        <div class="pagebox_left">{{ $t("盈虧") }} (INR)</div>
        <div class="pagebox_right">{{ pages.profitAndLose | _toString }}</div>
      </div>
      <div class="pagebox">
        <div class="pagebox_left">{{ $t("hj141") }} ({{ pages.stockGid }})</div>
        <div class="pagebox_left">{{ $t("hj141") }} (INR)</div>
        <div class="pagebox_right">{{ pages.profitAndLoseParent }}</div>
      </div>
      <div class="pagebox">
@@ -25,23 +25,23 @@
        <div class="pagebox_right">{{ pages.orderNum }}</div>
      </div>
      <div class="pagebox" v-if="pages.now_price">
        <div class="pagebox_left">{{ $t("hj40") }}({{ pages.stockGid }})</div>
        <div class="pagebox_left">{{ $t("hj40") }}(INR)</div>
        <div class="pagebox_right">{{ pages.now_price | _toString }}</div>
      </div>
      <div class="pagebox">
        <div class="pagebox_left">
          {{ $t("持倉價") }} ({{ pages.stockGid }})
          {{ $t("持倉價") }} (INR)
        </div>
        <div class="pagebox_right">{{ pages.buyOrderPrice | _toString }}</div>
      </div>
      <div class="pagebox">
        <div class="pagebox_left">
          {{ $t("訂單金額") }} ({{ pages.stockGid }})
          {{ $t("訂單金額") }} (INR)
        </div>
        <div class="pagebox_right">{{ pages.orderTotalPrice | _toString }}</div>
      </div>
      <div class="pagebox">
        <div class="pagebox_left">{{ $t("hj44") }} ({{ pages.stockGid }})</div>
        <div class="pagebox_left">{{ $t("hj44") }} (INR)</div>
        <div class="pagebox_right">{{ pages.orderFee | _toString }}</div>
      </div>
      <div class="pagebox">

 src/page/user/Warehouse/card.vue

 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" >
                {{ item.profitAndLose | _toLocaleString }}
              </div>
            </div>

 src/page/user/Warehouse/item.card.vue

@@ -93,7 +93,6 @@
      default: () => {},
    },
  },

  methods: {
    async confirm() {
      console.log(this.activeObj.laber);

 src/page/user/yeb.vue

@@ -42,6 +42,7 @@
      :confirmButtonText="$t('qr')"
      :cancelButtonText="$t('qx')"
      @confirm="tosubmit(1, form.account1)"
      @close="form.account1 = ''"
    >
      <div class="dialog-box">
        <van-field
@@ -56,13 +57,13 @@
          v-model="form.account1"
          type="number"
          name="amt"
          :label="$t('gm') + $t('sl')"
          :placeholder="$t('gm') + $t('sl')"
          :label="$t('gm') + $t('je')"
          :placeholder="$t('gm') + $t('je')"
          :border="false"
        >
          <template #button>
         <!-- <template #button>
            <span @click="selectAll1">{{ $t("hj160") }}</span>
          </template>
          </template> -->
        </van-field>
      </div>
    </van-dialog>
@@ -151,6 +152,7 @@
      this.$router.go(-1);
    },
    selectAll1() {
      console.log("====");
      // 选择全部
      this.form.account1 = this.$store.state.userInfo.enableAmt;
    },
@@ -184,10 +186,11 @@
      let data1 = await api.BuyYeb(opt);
      console.log(data1, "====");
      if (data1.status === 0) {
        Notify({ type: "success", message: data1.data });
        Notify({ type: "success", message: data1.msg });
        this.form.account1 = ''
        this.$router.push("/yebs");
      } else {
        Notify({ type: "warning", message: data1.data });
        Notify({ type: "warning", message: data1.msg });
      }
    },
    async getUserInfo() {

 yarn.lock

Diff too large