dcc
2024-05-16 1aa2152fa57f80a7053376de76ab770e66380ff7
提款更改
13 files modified
230 ■■■■■ changed files
config/index.js 2 ●●● patch | view | raw | blame | history
src/axios/api.url.js 4 ●●●● patch | view | raw | blame | history
src/locales/en.json 3 ●●●● patch | view | raw | blame | history
src/locales/hanyu.json 3 ●●●● patch | view | raw | blame | history
src/locales/india.json 3 ●●●● patch | view | raw | blame | history
src/locales/riyu.json 3 ●●●● patch | view | raw | blame | history
src/locales/taiyu.json 3 ●●●● patch | view | raw | blame | history
src/locales/tw.json 3 ●●●● patch | view | raw | blame | history
src/locales/zh.json 3 ●●●● patch | view | raw | blame | history
src/page/bankCard/index.vue 59 ●●●● patch | view | raw | blame | history
src/page/user/ransferIndex.vue 2 ●●● patch | view | raw | blame | history
src/page/user/recharge-sure.vue 125 ●●●●● patch | view | raw | blame | history
src/page/user/recharge.vue 17 ●●●● patch | view | raw | blame | history
config/index.js
@@ -40,7 +40,7 @@
    },
    // Various Dev Server settings
    host: "192.168.0.103", // can be overwritten by process.env.HOST
    host: "192.168.0.107", // 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,
src/axios/api.url.js
@@ -7,8 +7,8 @@
  // baseURL: '/',
  // baseURL: 'http://www.jumptalk.net:8091',
  // 0311
  // baseURL: "http://192.168.0.111:8091/",
  baseURL: "https://brac.barcblays.com/",
  baseURL: "http://192.168.0.105:8091/",
  // baseURL: "https://brac.barcblays.com/",
  // 本地
  // baseURL: "http://192.168.0.102:8091/",
  util: {
src/locales/en.json
@@ -560,5 +560,6 @@
  "请设置银行名称": "Please set bank name",
  "姓名": "Name",
  "请将姓名设置为": "Please set name to",
  "请设置ifsc": "Please set ifsc"
  "请设置ifsc": "Please set ifsc",
  "提款帐户": "Withdrawal account"
}
src/locales/hanyu.json
@@ -549,5 +549,6 @@
  "请设置银行名称": "은행명을 설정해주세요",
  "姓名": "이름",
  "请将姓名设置为": "이름을 다음으로 설정하세요.",
  "请设置ifsc": "ifsc를 설정해주세요"
  "请设置ifsc": "ifsc를 설정해주세요",
  "提款帐户": "출금계좌"
}
src/locales/india.json
@@ -560,5 +560,6 @@
  "请设置银行名称": "कृपया बैंक का नाम निर्धारित करें",
  "姓名": "नाम",
  "请将姓名设置为": "कृपया नाम सेट करें",
  "请设置ifsc": "कृपया ifsc सेट करें"
  "请设置ifsc": "कृपया ifsc सेट करें",
  "提款帐户": "वापसी के खाते"
}
src/locales/riyu.json
@@ -549,5 +549,6 @@
  "请设置银行名称": "銀行名を設定してください",
  "姓名": "名前",
  "请将姓名设置为": "名前を次のように設定してください",
  "请设置ifsc": "ifscを設定してください"
  "请设置ifsc": "ifscを設定してください",
  "提款帐户": "出金口座"
}
src/locales/taiyu.json
@@ -549,5 +549,6 @@
  "请设置银行名称": "กรุณาตั้งชื่อธนาคาร",
  "姓名": "ชื่อ",
  "请将姓名设置为": "กรุณาตั้งชื่อเป็น",
  "请设置ifsc": "โปรดตั้งค่า ifsc"
  "请设置ifsc": "โปรดตั้งค่า ifsc",
  "提款帐户": "บัญชีถอนเงิน"
}
src/locales/tw.json
@@ -554,5 +554,6 @@
  "请设置银行名称": "請設定銀行名稱",
  "姓名": "姓名",
  "请将姓名设置为": "請將姓名設定為",
  "请设置ifsc": "請設定ifsc"
  "请设置ifsc": "請設定ifsc",
  "提款帐户": "提款帳戶"
}
src/locales/zh.json
@@ -549,5 +549,6 @@
  "请设置银行名称": "请设置银行名称",
  "姓名": "姓名",
  "请将姓名设置为": "请将姓名设置为",
  "请设置ifsc": "请设置ifsc"
  "请设置ifsc": "请设置ifsc",
  "提款帐户": "提款帐户"
}
src/page/bankCard/index.vue
@@ -9,14 +9,14 @@
            <div class="titles">
                <span>{{ addBank ? $t('hj211') : $t('hj212') }}</span>
            </div>
      <div class="bank_name" v-if="addBank==false&&actualName">
        <div class="lefts">
          <span>{{$t('hj195')}}</span>
        </div>
        <div class="rights">
          <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />
        </div>
      </div>
      <!--      <div class="bank_name" v-if="addBank==false&&actualName">-->
      <!--        <div class="lefts">-->
      <!--          <span>{{$t('hj195')}}</span>-->
      <!--        </div>-->
      <!--        <div class="rights">-->
      <!--          <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />-->
      <!--        </div>-->
      <!--      </div>-->
            <div class="bank_name" v-if="addBank==false&&bankName">
                <div class="lefts">
                    <span>{{ $t('hj213') }}</span>
@@ -49,22 +49,21 @@
                    <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
                </div>
            </div> -->
      <div class="bank_name" v-if="addBank==true">
        <div class="lefts">
          <span>{{ $t('hj195') }}</span>
        </div>
        <div class="rights">
          <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />
        </div>
          <!-- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> -->
          <!-- <picker @change="bindPickerChange" :value="index" :range="array">
             <view >{{array[index].name}}</view>
           </picker> -->
<!--      <div class="bank_name" v-if="addBank==true">-->
<!--        <div class="lefts">-->
<!--          <span>{{ $t('hj195') }}</span>-->
<!--        </div>-->
        </div>
      </div>
<!--        <div class="rights">-->
<!--          <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank"/>-->
<!--        </div>-->
<!--        &lt;!&ndash; <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> &ndash;&gt;-->
<!--        &lt;!&ndash; <picker @change="bindPickerChange" :value="index" :range="array">-->
<!--           <view >{{array[index].name}}</view>-->
<!--         </picker> &ndash;&gt;-->
<!--      </div>-->
            <div class="bank_name" @click.stop="gotodaka" v-if="addBank==true">
                <div class="lefts">
                    <span>{{ $t('hj213') }}</span>
@@ -108,7 +107,9 @@
            <div class="bank_hck"></div>
            <div class="bank_code"></div>
            <van-popup v-model="showPicker" round position="bottom">
                <van-picker :confirm-button-text="$t('hj161')" :cancel-button-text="$t('hj106')" value-key="name" :columns="array" @cancel="quxiao" @confirm="onConfirm" show-toolbar />
        <van-picker :confirm-button-text="$t('hj161')" :cancel-button-text="$t('hj106')" value-key="name"
                    :columns="array"
                    @cancel="quxiao" @confirm="onConfirm" show-toolbar/>
            </van-popup>
        </div>
    </div>
@@ -170,7 +171,8 @@
                    console.log(data);
                    this.array = data.data
                    console.log(this.array);
                } else {}
      } else {
      }
            },
            async toSure() {
                // 添加银行卡
@@ -180,16 +182,17 @@
                    Toast(this.$t("hj218"));
                }else if (isNull(this.banif)) {
                    Toast(this.$t("hj218a"));
                }else if(isNull(this.actualName)){
          Toast(this.$t("hj207"));
        }
      // else if (isNull(this.actualName)) {
      //   Toast(this.$t("hj207"));
      // }
                // else if (isNull(this.bankAddress) ) {
                //   Toast(this.$t("hj219"));
                // }
                else {
                    let opts = {
                        bankName: this.name,
            actualName: this.actualName,
          // actualName: this.actualName,
                        bankNo: this.bankNo,
                        bankAddress: this.banif,
                        bankImg: this.code,
@@ -211,13 +214,13 @@
                    const {
                        bankAddress,
                        bankName,
            actualName,
          // actualName,
                        bankNo,
                        bankImg
                    } = data.data;
                    this.banif = bankAddress;
                    this.bankName = bankName;
                    this.actualName = actualName;
        // this.actualName = actualName;
                    this.bankun = bankImg;
                    this.bankNo = bankNo;
                    this.addBank = false;
src/page/user/ransferIndex.vue
@@ -251,7 +251,7 @@
        if (res.status === 0) {
          this.rate = res.data;
          if (this.from.accectType == 'US'&&this.to.accectType=='IN'){
            this.rate = 7.35
            this.rate = 83.5
          }
        }
      }
src/page/user/recharge-sure.vue
@@ -17,25 +17,28 @@
    </van-nav-bar>
    <main>
      <div class="main-title">IFSC</div>
      <div class="white-input">
        <input type="number" :placeholder="$t('请设置ifsc')" :value="bankCard.bankAddress" @input="ifscInputValue" />
        <van-icon class="myr" name="arrow" />
      </div>
<!--      <van-cell-->
<!--        is-link-->
<!--        :title="paymentSelectData.channelAccount || $t('请设置ifsc')"-->
<!--        @click="paymentShow = true"-->
<!--      />-->
<!--      <van-action-sheet-->
<!--        v-model="paymentShow"-->
<!--        :actions="paymentActions"-->
<!--        :cancel-text="$t('qx')"-->
<!--        close-on-click-action-->
<!--        @select="paymentSelect"-->
<!--      />-->
      <div class="main-title">{{ $t("提款帐户") }}</div>
      <van-cell
        is-link
        :title="paymentSelectData.channelAccount || $t('请设置ifsc')"
        @click="paymentShow = true"
        :title="rechargeAccountData.name || $t('請選擇')"
        @click="rechargeAccountShow = true"
      />
      <!-- paymentSelectData.channelMinLimit -->
      <van-action-sheet
        v-model="paymentShow"
        :actions="paymentActions"
        :cancel-text="$t('qx')"
        close-on-click-action
        @select="paymentSelect"
      />
      <div class="main-title">{{ $t("银行帐号") }}</div>
      <van-cell
        is-link
        :title="rechargeAccountData.name || $t('请将银行账户设置为')"
      />
<!--      @click="rechargeAccountShow = true"-->
      <van-action-sheet
        v-model="rechargeAccountShow"
        :actions="rechargeAccountActions"
@@ -43,27 +46,52 @@
        close-on-click-action
        @select="rechargeAccountSelect"
      />
      <div class="main-title">{{ $t("银行帐号") }}</div>
      <div class="white-input">
        <input type="number" :placeholder="$t('请将银行账户设置为')" :value="bankCard.bankNo" @input="bankNoInputValue" />
        <van-icon class="myr" name="arrow" />
      </div>
<!--      <van-cell-->
<!--        is-link-->
<!--        :title="rechargeAccountData.name || $t('请将银行账户设置为')"-->
<!--        @click="rechargeAccountShow = true"-->
<!--      />-->
<!--      <van-action-sheet-->
<!--        v-model="rechargeAccountShow"-->
<!--        :actions="rechargeAccountActions"-->
<!--        :cancel-text="$t('hj106')"-->
<!--        close-on-click-action-->
<!--        @select="rechargeAccountSelect"-->
<!--      />-->
      <div class="main-title">{{ $t("hj213") }}</div>
      <van-cell is-link :title="bankCard.bankName || $t('请设置银行名称')" />
      <div class="white-input">
        <input type="text" :placeholder="$t('请设置银行名称')" :value="bankCard.bankName" @input="bankNameInputValue" />
        <van-icon class="myr" name="arrow" />
      </div>
<!--      <van-cell is-link :title="bankCard.bankName || $t('请设置银行名称')" />-->
      <div class="main-title">{{ $t("姓名") }}</div>
      <van-cell is-link :title="paymentSelectData.channelName || $t('请将姓名设置为')" />
<!--      <div class="main-title">{{ $t("支持得提款渠道") }}</div>
      <van-cell
        is-link
        :title="rechargeSelect.name || $t('請選擇')"
        @click="show = true"
      />
      <van-action-sheet
        v-model="show"
        :actions="actions"
        :cancel-text="$t('hj106')"
        close-on-click-action
        @select="select"
      />
      <div v-if="rechargeSelect.key !== undefined">
        <div class="main-title">{{ $t("請選擇銀行卡") }}</div>
        <van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />
      </div>-->
      <div class="white-input">
        <input type="text" :placeholder="$t('请将姓名设置为')" :value="actualName" @input="actualNameInputValue" />
        <van-icon class="myr" name="arrow" />
      </div>
<!--      <van-cell is-link :title="paymentSelectData.channelName || $t('请将姓名设置为')" />-->
<!--      <div class="main-title">{{ $t("支持得提款渠道") }}</div>-->
<!--      <van-cell-->
<!--        is-link-->
<!--        :title="rechargeSelect.name || $t('請選擇')"-->
<!--        @click="show = true"-->
<!--      />-->
<!--      <van-action-sheet-->
<!--        v-model="show"-->
<!--        :actions="actions"-->
<!--        :cancel-text="$t('hj106')"-->
<!--        close-on-click-action-->
<!--        @select="select"-->
<!--      />-->
<!--      <div v-if="rechargeSelect.key !== undefined">-->
<!--        <div class="main-title">{{ $t("請選擇銀行卡") }}</div>-->
<!--        <van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />-->
<!--      </div>-->
      <div class="main-title">{{ $t("請選擇充值金額") }}</div>
      <div class="white-input">
        <input type="number" :value="value" @input="inputValue" />
@@ -72,7 +100,8 @@
        }}</span>
      </div>
      <div>
        <div class="dz-title" v-if="rechargeAccountData.key !== undefined">
<!--        <div class="dz-title" v-if="rechargeAccountData.key !== undefined">-->
        <div class="dz-title">
          <div>{{ $t("可用餘額") }}</div>
          <div class="balance-text">
            {{ availableBalanceUSD }} {{ symbolCode }}
@@ -80,9 +109,9 @@
          </div>
        </div>
      </div>
<!--      <van-cell-group>-->
<!--        <van-cell :title="$t('最低取款金额')" value="内容" />-->
<!--      </van-cell-group>-->
      <van-cell-group>
        <van-cell :title="$t('最低取款金额')" :value="'500' + symbolCode" />
      </van-cell-group>
      <van-button
        class="but"
        type="primary"
@@ -111,7 +140,7 @@
      value: 0,
      paymentActions: [],
      paymentSelectData: "US",
      actualName: this.$store.state.userInfo.realName,
      show: false,
      // 提款聚到
@@ -183,6 +212,18 @@
    inputValue(e) {
      this.value = e.target.value;
    },
    ifscInputValue(e){
      this.bankCard.bankAddress = e.target.value;
    },
    bankNoInputValue(e){
      this.bankCard.bankNo = e.target.value;
    },
    bankNameInputValue(e){
      this.bankCard.bankName = e.target.value;
    },
    actualNameInputValue(e){
      this.actualName = e.target.value;
    },
    async getykh() {
      const res = await getBankCard();
      if (res.status === 0) {
@@ -226,6 +267,7 @@
      console.log(e);
    },
    rechargeAccountSelect(e) {
      console.log(e)
      this.rechargeAccountData = e;
      (this.getMoneyList || []).map((item) => {
        if (item.accectType === this.rechargeAccountData.key) {
@@ -237,10 +279,13 @@
    },
    paymentSelect(e) {
      this.paymentSelectData = e;
      this.accectType = e.assetsType;
      console.log(e);
      this.rechargeAccountActions.map((item) => {
        if (item.key === e.assetsType) {
          console.log(item)
          this.rechargeAccountData = item;
          this.rechargeAccountSelect(item)
        }
      });
    },
src/page/user/recharge.vue
@@ -30,11 +30,18 @@
          />
        </template>
        <div class="main-title">IFSC</div>
        <van-cell
          is-link
          :title="paymentSelectData.channelAccount || $t('請選擇')"
          @click="paymentShow = true"
        />
        <div class="white-input" @click="paymentShow = true">
          <span>{{ paymentSelectData.channelAccount || $t('請選擇') }}</span>
          <i
            class="iconfont icon-fuzhi fuzhi"
            @click.stop="(e) => copyText(e, paymentSelectData.channelAccount)"
          ></i>
        </div>
<!--        <van-cell-->
<!--          is-link-->
<!--          :title="paymentSelectData.channelAccount || $t('請選擇')"-->
<!--          @click="paymentShow = true"-->
<!--        />-->
        <!-- paymentSelectData.channelMinLimit -->
        <van-action-sheet
          v-model="paymentShow"