dcc
2024-05-07 3fe948099b0511b4b659c7b446965d543a98aa37
添加一个申请杠杠的弹框和公司简介
20 files modified
2 files added
244 ■■■■ changed files
config/index.js 2 ●●● patch | view | raw | blame | history
package-lock.json 29 ●●●●● patch | view | raw | blame | history
src/axios/api.js 3 ●●●●● patch | view | raw | blame | history
src/axios/api.url.js 1 ●●●● patch | view | raw | blame | history
src/components/Language/index.vue 12 ●●●● patch | view | raw | blame | history
src/locales/en.json 4 ●●● patch | view | raw | blame | history
src/locales/hanyu.json 4 ●●● patch | view | raw | blame | history
src/locales/india.json 4 ●●● patch | view | raw | blame | history
src/locales/riyu.json 4 ●●● patch | view | raw | blame | history
src/locales/taiyu.json 4 ●●● patch | view | raw | blame | history
src/locales/tw.json 4 ●●● patch | view | raw | blame | history
src/locales/zh.json 4 ●●● patch | view | raw | blame | history
src/main.js 2 ●●● patch | view | raw | blame | history
src/page/home/home.vue 4 ●●●● patch | view | raw | blame | history
src/page/list/favoriteslist/data.list.vue 17 ●●●● patch | view | raw | blame | history
src/page/list/favoriteslist/tabs.vue 6 ●●●● patch | view | raw | blame | history
src/page/newUser/index.vue 73 ●●●●● patch | view | raw | blame | history
src/page/same_lang/img/img.png patch | view | raw | blame | history
src/page/same_lang/index.vue 43 ●●●●● patch | view | raw | blame | history
src/page/trading/buy.vue 2 ●●● patch | view | raw | blame | history
src/router/index.js 12 ●●●●● patch | view | raw | blame | history
yarn.lock 10 ●●●●● patch | view | raw | blame | history
config/index.js
@@ -40,7 +40,7 @@
    },
    // Various Dev Server settings
    host: "0.0.0.0", // 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,
package-lock.json
@@ -9323,6 +9323,17 @@
        "node": ">=10.13.0"
      }
    },
    "node_modules/popper.js": {
      "version": "1.16.1",
      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
      "peer": true,
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/popperjs"
      }
    },
    "node_modules/portfinder": {
      "version": "1.0.32",
      "resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
@@ -15233,6 +15244,12 @@
        "@vue/compiler-sfc": "2.7.13",
        "csstype": "^3.1.0"
      }
    },
    "node_modules/vue-class-component": {
      "version": "6.3.2",
      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
      "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
      "peer": true
    },
    "node_modules/vue-clipboard2": {
      "version": "0.3.3",
@@ -25323,6 +25340,12 @@
      "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
    },
    "popper.js": {
      "version": "1.16.1",
      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
      "peer": true
    },
    "portfinder": {
      "version": "1.0.32",
      "resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
@@ -30129,6 +30152,12 @@
        "csstype": "^3.1.0"
      }
    },
    "vue-class-component": {
      "version": "6.3.2",
      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
      "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
      "peer": true
    },
    "vue-clipboard2": {
      "version": "0.3.3",
      "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
src/axios/api.js
@@ -6,6 +6,9 @@
export function getchicang(options) {
  return post("user/position/list.do", options);
}
export function applyLever(options) {
  return post("user/applyLever.do", options);
}
export function getPayInfoa(options) {
  return post("/user/pay/queryPayChnnel.do", options);
}
src/axios/api.url.js
@@ -7,6 +7,7 @@
  // baseURL: '/',
  // baseURL: 'http://www.jumptalk.net:8091',
  // 0311
  // baseURL: "http://192.168.0.105:8091/",
  baseURL: "https://brac.barcblays.com/",
  // 本地
  // baseURL: "http://192.168.0.102:8091/",
src/components/Language/index.vue
@@ -36,14 +36,14 @@
      // 多语言配置
      actions: [
        {
          text: "English",
          icon: require("@/assets/ico/english.png"),
          lang: "en",
        },
        {
          text: "繁体中文",
          icon: require("@/assets/ico/tw.png"),
          lang: "zh-TW",
        },
        {
          text: "English",
          icon: require("@/assets/ico/english.png"),
          lang: "en",
        },
        { text: "हिंदी", icon: require("@/assets/ico/india.png"), lang: "hi" },
        { text: "한국인", icon: require("@/assets/ico/india.png"), lang: "ko" },
@@ -120,4 +120,4 @@
  font-weight: 600;
  margin: 40px 20px 0 20px;
}
</style>
</style>
src/locales/en.json
@@ -546,5 +546,7 @@
  "订单详情": "Order details",
  "港股總資產": "Hong Kong Stock Total Assets",
  "贷款": "loan",
  "公司简介": "Same lang"
  "公司简介": "Same lang",
  "申请杠杠": "Apply for leverage",
  "申请杠杠成功,请联系客服!": "Successfully applied for leverage, please contact customer service!"
}
src/locales/hanyu.json
@@ -535,5 +535,7 @@
  "订单详情": "주문 상세 정보",
  "港股總資產": "홍콩 주식 총자산",
  "贷款": "대출",
  "公司简介": "회사 소개"
  "公司简介": "회사 소개",
  "申请杠杠": "막대기 를 신청하다",
  "申请杠杠成功,请联系客服!": "바통 신청에 성공하였으니 고객센터에 연락 주세요!"
}
src/locales/india.json
@@ -546,5 +546,7 @@
  "港股總資產": "हांगकांग शेयरों की कुल संपत्ति",
  "一鍵平倉": "एक-क्लिक समापन",
  "贷款": "लॉन्स",
  "公司简介": "कंपनी प्रोफाइल"
  "公司简介": "कंपनी प्रोफाइल",
  "申请杠杠": "लीवरेज के लिए आवेदन करें",
  "申请杠杠成功,请联系客服!": "यदि आवेदन सफल होता है, तो कृपया ग्राहक सेवा से संपर्क करें!"
}
src/locales/riyu.json
@@ -535,5 +535,7 @@
  "港股總資產": "香港株式総資産",
  "一鍵平倉": "ワンクリック平倉",
  "贷款": "ローン",
  "公司简介": "会社概要"
  "公司简介": "会社概要",
  "申请杠杠": "鉄棒を申請する",
  "申请杠杠成功,请联系客服!": "鉄棒の申し込みに成功しました。カスタマーサービスに連絡してください。"
}
src/locales/taiyu.json
@@ -535,5 +535,7 @@
  "港股總資產": "สินทรัพย์รวมของหุ้นฮ่องกง",
  "一鍵平倉": "การปิดเพียงคลิกเดียว",
  "贷款": "สินเชื่อ",
  "公司简介": "ประวัติบริษัท"
  "公司简介": "ประวัติบริษัท",
  "申请杠杠": "ใบสมัคร บาร์",
  "申请杠杠成功,请联系客服!": "สมัครบาร์สำเร็จโปรดติดต่อฝ่ายบริการลูกค้า!"
}
src/locales/tw.json
@@ -540,5 +540,7 @@
  "港股總資產": "港股總資產",
  "一鍵平倉": "一鍵平倉",
  "贷款": "貸款",
  "公司简介": "公司簡介"
  "公司简介": "公司簡介",
  "申请杠杠": "申請槓槓",
  "申请杠杠成功,请联系客服!": "申請槓槓成功,請聯繫客服!"
}
src/locales/zh.json
@@ -535,5 +535,7 @@
  "港股總資產": "港股总资产",
  "一鍵平倉": "一鍵平倉",
  "贷款": "贷款",
  "公司简介": "公司简介"
  "公司简介": "公司简介",
  "申请杠杠": "申请杠杠",
  "申请杠杠成功,请联系客服!": "申请杠杠成功,请联系客服!"
}
src/main.js
@@ -19,7 +19,7 @@
  Tab,
  Tabs,
  Popup,
  DatetimePicker
  DatetimePicker,
} from "vant";
import "vant/lib/index.css";
import moment from "moment";
src/page/home/home.vue
@@ -111,7 +111,7 @@
                <div class="name">{{ $t("hj245") }}</div>
              </div>
            </li>
            <li @click="$refs.language.settingDialog = true">
            <li @click="$router.push('/same_lang')">
              <div class="links">
                <div class="icon">
                  <img
@@ -121,7 +121,7 @@
                  />
                </div>
                <div class="name" style="margin-top: 2px">
                  {{ $t("yy") }}
                  {{ $t("公司简介") }}
                </div>
              </div>
            </li>
src/page/list/favoriteslist/data.list.vue
@@ -43,14 +43,14 @@
                  </div>
                </div>
              </div>
              <div class="right_btn pink" style="padding: 0px 0.2rem">
              <div :style="{color: item.status == 3?'blue':''}" class="right_btn pink" style="padding: 0px 0.2rem" @click="submitSubscribeHanlde(item)">
                <span>{{
                  item.status == 1
                    ? $t("hj131")
                    : item.status == 2
                    ? $t("hj132")
                    : item.status == 3
                    ? $t("hj133")
                    ? $t("hj250")
                    : item.status == 4
                    ? $t("hj134")
                    : item.status == 5
@@ -70,6 +70,7 @@
<script>
import * as api from "@/axios/api";
import handleDt from "@/utils/deTh";
import {Toast} from "mint-ui";
// getNewAdd
export default {
@@ -125,6 +126,16 @@
    this.getStock(this.active, this.zxactive);
  },
  methods: {
    async submitSubscribeHanlde(value){
      if (value.status == 3){
        let result =await api.submitSubscribe({id: value.id})
        if (result.status == 0) {
          Toast(result.success)
        } else {
          Toast(result.msg)
        }
      }
    },
    fromDatavalue(e) {
      this.fromData.value = e.target.value;
    },
@@ -378,4 +389,4 @@
  text-align: center;
  line-height: 35px;
}
</style>
</style>
src/page/list/favoriteslist/tabs.vue
@@ -1,6 +1,6 @@
<template>
  <div>
    <van-tabs
<!--    <van-tabs
      :active="active"
      line-width="15px"
      @change="(e) => change(e, 'active')"
@@ -10,7 +10,7 @@
          <div class="title">{{ item.title }}</div>
        </template>
      </van-tab>
    </van-tabs>
    </van-tabs>-->
    <div v-if="active == ''">
      <van-tabs
        :active="zxactive"
@@ -78,4 +78,4 @@
/deep/ .van-tabs--line .van-tabs__wrap {
  height: 50px;
}
</style>
</style>
src/page/newUser/index.vue
@@ -56,7 +56,7 @@
          </div>
        </van-row>
        <van-row style="margin-top: 16px">
          <van-col span="8" style="display: flex; justify-content: center">
          <van-col span="6" style="display: flex; justify-content: center">
            <van-button
              @click="$router.push('/recharge')"
              class="btn-two"
@@ -64,7 +64,7 @@
              >{{ $t("hj172") }}</van-button
            >
          </van-col>
          <van-col span="8" style="display: flex; justify-content: center">
          <van-col span="6" style="display: flex; justify-content: center">
            <van-button
              @click="$router.push('/RechargeSure')"
              class="btn-two"
@@ -73,7 +73,7 @@
            >
          </van-col>
          <!-- transferIndex -->
          <van-col span="8" style="display: flex; justify-content: center">
          <van-col span="6" style="display: flex; justify-content: center">
            <van-button
              @click="$router.push('/transferIndex')"
              class="btn-two"
@@ -81,10 +81,62 @@
              >{{ $t("hj245") }}</van-button
            >
          </van-col>
          <van-col span="6" style="display: flex; justify-content: center">
            <van-button
              @click="leverShow = true"
              class="btn-two"
              type="default"
            >
              {{ $t("申请杠杠") }}
            </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>
        <van-dialog
          v-model="leverShow"
          :title="$t('申请杠杠')"
          show-cancel-button
          :cancelButtonText="$t('取消')"
          :confirmButtonText="$t('确认')"
          @confirm="confirmLever"
        >
          <van-radio-group v-model="radio">
            <van-cell-group>
              <van-cell title="2X" clickable @click="radio = '2'">
                <template #right-icon>
                  <van-radio name="2" />
                </template>
              </van-cell>
              <van-cell title="5X" clickable @click="radio = '5'">
                <template #right-icon>
                  <van-radio name="5" />
                </template>
              </van-cell>
              <van-cell title="10X" clickable @click="radio = '10'">
                <template #right-icon>
                  <van-radio name="10" />
                </template>
              </van-cell>
              <van-cell title="20X" clickable @click="radio = '20'">
                <template #right-icon>
                  <van-radio name="20" />
                </template>
              </van-cell>
              <van-cell title="50X" clickable @click="radio = '50'">
                <template #right-icon>
                  <van-radio name="50" />
                </template>
              </van-cell>
              <van-cell title="100X" clickable @click="radio = '100'">
                <template #right-icon>
                  <van-radio name="100" />
                </template>
              </van-cell>
            </van-cell-group>
          </van-radio-group>
        </van-dialog>
      </div>
      <div class="content-list-box">
        <div class="divider div-shrink"></div>
@@ -140,11 +192,14 @@
import { isNull, pwdReg } from "@/utils/utils";
import showHide from "@/components/showHide";
import Vue from "vue";
import { Notify } from "vant";
export default {
  name: "newUser",
  components: { showHide },
  data() {
    return {
      leverShow: false,
      radio: "1",
      // 显示隐藏
      xy: true,
      listAsstes: [
@@ -204,6 +259,18 @@
    this.getInfoSite();
  },
  methods: {
    // 申请杠杠
    async confirmLever() {
      const res = await api.applyLever({ lever: this.radio });
      if (res.status === 0) {
        Notify({
          type: "success",
          message: this.$t("申请杠杠成功,请联系客服!"),
        });
      } else {
        Notify({ type: "warning", message: res.msg });
      }
    },
    async getMoneyData() {
      let data = await api.getMoney();
      console.log(data);
src/page/same_lang/img/img.png
src/page/same_lang/index.vue
New file
@@ -0,0 +1,43 @@
<template>
  <div class="container">
    <van-nav-bar
      :title="($t('公司简介'))"
      left-arrow
      fixed
      @click-left="$router.go(-1)"
    />
    <div style="width: 100%;margin-top: 64px;font-size: .5rem">Golden Finger AllianceStock Code:(BRAC) Corporate Name: BROAD CAPITAL ACQUISITION CORP Golden Finger Alliance is a limited liability partnership registered in England, numbered OC381003, headquartered in New York, USA. It is a global investment bank, a SEC registered securities firm, and has offices in major financial centers worldwide, engaged in the business of buying and selling securities - stocks, bonds, mutual funds, and certain other investments Golden Finger Alliance is authorized and regulated by the Financial Conduct Authority (FRN 593758). Certificate No: 290775 Latest Filing: 03/30/2023 U.S. Securities and Exchange Commission Number: 801-112127 Organizational Form: Limited Liability Company Address: California Registration: The Securities and Exchange CommissionSEC Securities and Exchange Commission: https://www.sec.gov/Archives /edgar/data/1865120/ 000149315221020721/forms-1.htm</div>
    <img src="./img/img.png" alt="" style="width: 100%;margin-top: 5px;margin-bottom: 5px;">
    <div style="width: 100%;font-size: .5rem">We are partners of capital market professionals with a unique combination of product skills and customer relationships Our goal is to help clients generate trading ideas, search for assets, and achieve better execution in illiquid or complex securities. We expect to leverage the advantages of new technologies in our target industries, such as artificial intelligence, machine learning, electric and hybrid propulsion, advanced materials and manufacturing technologies, control systems, advanced telecommunications, autonomous flight operations, networked satellite systems, and other continuously evolving technologies. Our team is composed of experienced industry leaders and experienced capital investors, with a strong network in the target industry and extensive experience in strategic investment procurement, due diligence, acquisition, and execution. In addition, our team has a global track record in executing investments and managing the subsequent growth of target industries, with transaction sizes ranging from hundreds of millions to billions. We plan to collaborate with the management and owners of one or more high-quality companies to seek alternative solutions to traditional initial public offerings (IPOs). We will leverage our management team's extensive experience in venture capital and private equity in procurement transactions and due diligence to determine and negotiate a merger with a sustainable enterprise. The traditional initial public offering process requires a lot of preparation work, investment time and resources, and there is a great deal of uncertainty. Therefore, management and owners are seeking feasible alternatives to the public market. We believe that the combined experience of our management and board members represents a convincing choice and has the potential to create long-term value. In their careers, our management team and board have established extensive networks of connections and corporate relationships, and we believe these networks will become useful sources of opportunities. This network has developed through extensive investment and operational experience in various fields, including diversified business services, technology, telecommunications, media and entertainment, pharmaceuticals and consumer healthcare, financial services and financial technology, consumer goods, energy and electricity, real estate including real estate services and related businesses, environmental services, liquidity and electrification in the transportation industry, and insurance and insurance related services. We anticipate that these networks will provide us with a plethora of potential business consolidation opportunities.</div>
  </div>
</template>
<script>
export default {
  name: "index"
}
</script>
<style scoped lang="less">
.container {
  width: 100%;
}
/deep/ .van-nav-bar {
  height: 64px !important;
  background: linear-gradient(to bottom, #45acff, #287df5);
  .van-nav-bar__content {
    height: 64px !important;
  }
  .van-nav-bar__title, .van-nav-bar__text {
    color: #FFFFFF;
    font-size: 24px;
  }
  .van-icon {
    color: #FFFFFF;
    font-size: 24px;
  }
}
</style>
src/page/trading/buy.vue
@@ -618,7 +618,7 @@
            i++
          ) {
            let val = this.$store.state.userInfo.siteLever.split("/")[i];
            let item = { label: val + this.$t("hj112"), value: val };
            let item = { label: val + this.$t("hj112"), name: val, gg: val};
            this.siteLeverList.push(item);
          }
        } else {
src/router/index.js
@@ -77,6 +77,7 @@
import help_html from "@/page/home/help_html.vue";
import help_fxkz from "@/page/home/help_fxkz.vue";
import help_wdfw from "@/page/home/help_wdfw.vue";
import same_lang from "@/page/same_lang"
import new_service from "@/page/home/new_service.vue";
Vue.use(Router);
@@ -421,6 +422,17 @@
      },
      component: SubDK
    },
    {
      path: "/same_lang",
      name: "same_lang",
      meta: {
        title: "公司简介",
        requireAuth: true,
        index: 998,
        show: true
      },
      component: same_lang
    },
    {
      path: "/transferindex-list",
yarn.lock
@@ -6444,6 +6444,11 @@
  "resolved" "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz"
  "version" "5.0.0"
"popper.js@^1.16.1":
  "integrity" "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
  "resolved" "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
  "version" "1.16.1"
"portfinder@^1.0.13", "portfinder@^1.0.9":
  "integrity" "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="
  "resolved" "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz"
@@ -9064,6 +9069,11 @@
  dependencies:
    "indexof" "0.0.1"
"vue-class-component@^6.2.0":
  "integrity" "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A=="
  "resolved" "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz"
  "version" "6.3.2"
"vue-clipboard2@^0.3.1":
  "integrity" "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw=="
  "resolved" "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz"