From 999e295f26c329697465fdce37d627795e0fc00e Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Mon, 22 Apr 2024 22:16:58 +0800
Subject: [PATCH] 1

---
 src/page/user/compontents/cash-list.vue |    2 
 src/locales/en.json                     |    5 +
 src/locales/zh.json                     |  134 +++++++++++++++++----------------
 src/locales/de.json                     |    5 +
 src/locales/jp.json                     |    5 +
 src/page/newUser/index.vue              |   60 ++++++++++++++
 src/axios/api.js                        |    3 
 src/axios/api.url.js                    |    4 
 src/page/trading/buy.vue                |    4 
 src/locales/hi.json                     |    5 +
 src/router/index.js                     |    8 +-
 src/locales/fra.json                    |    5 +
 12 files changed, 160 insertions(+), 80 deletions(-)

diff --git a/src/axios/api.js b/src/axios/api.js
index 239ff2e..0f99dcb 100644
--- a/src/axios/api.js
+++ b/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);
 }
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 1d7d148..7d36807 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -7,9 +7,9 @@
   // baseURL: '/',
   // baseURL: 'http://www.jumptalk.net:8091',
   // 0311
-  baseURL: "https://api.essencefunds.com/",
+  // baseURL: "https://api.essencefunds.com/",
   // 本地
-  // baseURL: "http://192.168.0.110:8091/",
+  baseURL: "http://192.168.0.110:8091/",
   util: {
     image: "/util/image.html" // 图片上传
   }
diff --git a/src/locales/de.json b/src/locales/de.json
index a750a0a..9fff318 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -555,5 +555,8 @@
   "配售结束时间": "Endzeit der Zuweisung",
   "hj261": "Insiderhandel",
   "hj300": "Insiderhandel",
-  "hj268": "Insider-Handelsaufzeichnungen"
+  "hj268": "Insider-Handelsaufzeichnungen",
+  "确认": "bestätigen",
+  "申请杠杠": "Hebelwirkung beantragen",
+  "申请杠杠成功,请联系客服!": "Wenn Sie sich erfolgreich für Hebel beworben haben, wenden Sie sich bitte an den Kundenservice!"
 }
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index af36783..11abee0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -567,5 +567,8 @@
   "配售结束时间": "End time of allocation",
   "hj261": "Insider trading",
   "hj300": "Insider trading",
-  "hj268": "Insider trading records"
+  "hj268": "Insider trading records",
+  "确认": "confirm",
+  "申请杠杠": "Apply for leverage",
+  "申请杠杠成功,请联系客服!": "Successfully applied for leverage, please contact customer service!"
 }
\ No newline at end of file
diff --git a/src/locales/fra.json b/src/locales/fra.json
index 886b2c8..1fd0471 100644
--- a/src/locales/fra.json
+++ b/src/locales/fra.json
@@ -555,5 +555,8 @@
   "配售结束时间": "Heure de fin de placement",
   "hj261": "Transactions d'initiés",
   "hj300": "Transactions d'initiés",
-  "hj268": "Enregistrement des transactions d'initiés"
+  "hj268": "Enregistrement des transactions d'initiés",
+  "确认": "Confirmation",
+  "申请杠杠": "Appliquer barre",
+  "申请杠杠成功,请联系客服!": "Demande de barre de barre réussie, s'il vous plaît contacter le service à la clientèle!"
 }
\ No newline at end of file
diff --git a/src/locales/hi.json b/src/locales/hi.json
index a3c46cb..7e75b7c 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -566,5 +566,8 @@
   "配售结束时间": "रखने का अंतिम समय",
   "hj261": "इनसाइडर ट्रेडिंग",
   "hj300": "इनसाइडर ट्रेडिंग",
-  "hj268": "इनसाइडर ट्रेडिंग रिकॉर्ड"
+  "hj268": "इनसाइडर ट्रेडिंग रिकॉर्ड",
+  "确认": "सुदृढ़ करना",
+  "申请杠杠": "लीवरेज के लिए आवेदन करें",
+  "申请杠杠成功,请联系客服!": "यदि आवेदन सफल होता है, तो कृपया ग्राहक सेवा से संपर्क करें!"
 }
\ No newline at end of file
diff --git a/src/locales/jp.json b/src/locales/jp.json
index 989f4af..90510bb 100644
--- a/src/locales/jp.json
+++ b/src/locales/jp.json
@@ -556,5 +556,8 @@
   "配售结束时间": "配給終了時間",
   "hj261": "インサイダー取引",
   "hj300": "インサイダー取引",
-  "hj268": "インサイダー取引記録"
+  "hj268": "インサイダー取引記録",
+  "确认": "確認",
+  "申请杠杠": "鉄棒を申請する",
+  "申请杠杠成功,请联系客服!": "鉄棒の申し込みに成功しました。カスタマーサービスに連絡してください。"
 }
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 8829643..6e1d970 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -8,6 +8,7 @@
   "zgzs": "资格证书",
   "ysmrz": "已实名认证",
   "dlan": "登录",
+  "申请杠杠成功,请联系客服!": "申请杠杠成功,请联系客服!",
   "dltips": "登录后即可开启真实/模拟交易",
   "usertop": "账户总资产(美元)",
   "pcje": "平仓金额",
@@ -419,7 +420,7 @@
   "hj308": "请输入银行IFSC",
   "hj309": "请输入银行UPI",
   "hj313": "股票",
-  "hj314": "最新價格",
+  "hj314": "最新价格",
   "hj315": "漲跌率",
   "US": "美股账户",
   "IN": "印股账户",
@@ -427,106 +428,106 @@
   "提款": "提款",
   "安全": "安全",
   "用戶手冊": "用戶手冊",
-  "平臺": "平臺",
-  "申購記錄": "申購記錄",
+  "平臺": "平台",
+  "申購記錄": "申购记录",
   "資訊": "資訊",
   "数字货币": "数字货币",
   "马股": "马股",
   "美股": "美股",
-  "名稱": "名稱",
-  "最大購買": "最大購買",
-  "單筆價格": "單筆價格",
+  "名稱": "名称",
+  "最大購買": "最大购买",
+  "單筆價格": "币币价格",
   "马来西亚": "马来西亚",
   "全部平仓": "全部平仓",
-  "浮動盈虧": "浮動盈虧",
-  "可用資產": "可用資產",
-  "累計盈虧": "累計盈虧",
-  "凍結資產": "凍結資產",
-  "總手續費": "總手續費",
-  "盈虧": "盈虧",
-  "持倉價": "持倉價",
-  "訂單金額": "訂單金額",
-  "開倉手續費": "開倉手續費",
-  "止損價": "止損價",
-  "止盈價": "止盈價",
-  "持倉時間": "持倉時間",
-  "訂單編號": "訂單編號",
-  "美股總資產": "美股總資產",
-  "印股總資產": "印股總資產",
-  "馬股總資產": "馬股總資產",
+  "浮動盈虧": "浮动盈亏",
+  "可用資產": "可用资产",
+  "累計盈虧": "累计盈亏",
+  "凍結資產": "冻结资产",
+  "總手續費": "总手续费",
+  "盈虧": "盈亏",
+  "持倉價": "持仓价",
+  "訂單金額": "订单金额",
+  "開倉手續費": "开仓手续费",
+  "止損價": "止损价",
+  "止盈價": "止盈价",
+  "持倉時間": "持仓时间",
+  "訂單編號": "订单编号",
+  "美股總資產": "美股总资产",
+  "印股總資產": "印股总资产",
+  "馬股總資產": "马股总资产",
   "平仓": "平仓",
   "确认平仓": "确认平仓",
-  "市價": "市價",
-  "賬戶總資產": "賬戶總資產",
-  "類型": "類型",
-  "總浮動盈虧": "總浮動盈虧",
-  "美股資產": "美股資產",
+  "市價": "市价",
+  "賬戶總資產": "帐户总资产",
+  "類型": "类型",
+  "總浮動盈虧": "总浮动盈亏",
+  "美股資產": "美股资产",
   "美股总资产": "美股总资产",
   "印股总资产": "印股总资产",
-  "馬股总资产": "馬股总资产",
+  "馬股总资产": "马股总资产",
   "美股可用": "美股可用",
   "美股冻结": "美股冻结",
   "印股資產": "印股資產",
   "印股可用": "印股可用",
-  "馬股資產": "馬股資產",
-  "馬股可用": "馬股可用",
-  "馬股冻结": "馬股冻结",
-  "請選擇": "請選擇",
-  "轉換得到金額": "轉換得到金額",
-  "輸入金額": "輸入金額",
-  "劃轉": "劃轉",
-  "平倉": "平倉",
-  "持倉": "持倉",
+  "馬股資產": "马股资产",
+  "馬股可用": "马股可用",
+  "馬股冻结": "马股冻结",
+  "請選擇": "请选择",
+  "轉換得到金額": "划转得到金额",
+  "輸入金額": "输入金额",
+  "劃轉": "划转",
+  "平倉": "平仓",
+  "持倉": "持仓",
   "最大": "最大",
-  "可用餘額": "可用餘額",
-  "確認劃轉": "確認劃轉",
+  "可用餘額": "可用余额",
+  "確認劃轉": "确认划转",
   "划转成功": "划转成功",
   "提款成功,等待审核": "不能选择一样的",
   "不能选择一样的": "不能选择一样的",
-  "總資產": "總資產",
-  "請選擇提款账户": "請選擇提款账户",
-  "請選擇銀行卡": "請選擇銀行卡",
-  "請選擇充值金額": "請選擇充值金額",
-  "買漲/買跌": "買漲/買跌",
-  "倉位(股)": "倉位(股)",
-  "您確定一鍵平倉所有訂單嗎?": "您確定一鍵平倉所有訂單嗎?",
-  "打新日曆": "打新日曆",
+  "總資產": "总资产",
+  "請選擇提款账户": "请选择提款账户",
+  "請選擇銀行卡": "请选择银行卡",
+  "請選擇充值金額": "请选择充值金额",
+  "買漲/買跌": "买涨/买跌",
+  "倉位(股)": "仓位(股)",
+  "您確定一鍵平倉所有訂單嗎?": "您确定一键平仓所有订单吗?",
+  "打新日曆": "打新日历",
   "立即登录": "立即登录",
   "記住帳戶密碼": "記住帳戶密碼",
-  "還沒賬號?": "還沒賬號?",
-  "已有賬號?": "已有賬號?",
-  "免費註冊": "免費註冊",
-  "馬上登錄": "馬上登錄",
-  "我已閱讀並同意": "我已閱讀並同意",
-  "《用戶服務協議》": "《用戶服務協議》",
+  "還沒賬號?": "還沒账号?",
+  "已有賬號?": "已有账号?",
+  "免費註冊": "免费注册",
+  "馬上登錄": "马上登录",
+  "我已閱讀並同意": "我已阅读并同意",
+  "《用戶服務協議》": "《用戶服务协议》",
   "立即注册": "立即注册",
   "新股记录": "新股记录",
-  "登錄賬號": "登錄賬號",
+  "登錄賬號": "登录账号",
   "买跌": "买跌",
   "买涨": "买涨",
   "韩国股市": "韩国股市",
   "韩股总资产": "韩股总资产",
-  "韩股資產": "韩股資產",
+  "韩股資產": "韩股资产",
   "韩股可用": "韩股可用",
   "韩股冻结": "韩股冻结",
   "支持得支付渠道": "支持得支付渠道",
   "充值中心": "充值中心",
   "最小充值金額": "最小充值金額",
-  "收款卡號": "收款卡號",
-  "收款銀行": "收款銀行",
+  "收款卡號": "收款卡号",
+  "收款銀行": "收款银行",
   "收款人名字": "收款人名字",
-  "請選擇充值賬戶": "請選擇充值賬戶",
-  "上傳憑證": "上傳憑證",
+  "請選擇充值賬戶": "请选择充值帐户",
+  "上傳憑證": "上传凭证",
   "HG": "韩股账户",
   "支持得提款渠道": "支持得提款渠道",
-  "銀行卡充值": "銀行卡充值",
-  "韩股總資產": "韩股總資產",
-  "上傳憑證:": "上傳憑證:",
+  "銀行卡充值": "银行卡充值",
+  "韩股總資產": "韩股总资产",
+  "上傳憑證:": "上传凭证:",
   "从": "从",
   "到": "到",
   "密码修改成功": "密码修改成功",
-  "劃轉记录": "劃轉记录",
-  "馬股账户": "馬股账户",
+  "劃轉记录": "划转记录",
+  "馬股账户": "马股账户",
   "美股账户": "美股账户",
   "美国新闻": "美国新闻",
   "马来西亚新闻": "马来西亚新闻",
@@ -548,6 +549,8 @@
   "是否认缴": "是否认缴",
   "确定": "确定",
   "取消": "取消",
+  "确认": "确认",
+  "申请杠杠": "申请杠杠",
   "认购成功": "认购成功",
   "待补金额": "待补金额",
   "待上市": "待上市",
@@ -555,5 +558,6 @@
   "申购开启时间": "申购开启时间",
   "配售开启时间": "配售开启时间",
   "申购结束时间": "申购结束时间",
-  "配售结束时间": "配售结束时间"
+  "配售结束时间": "配售结束时间",
+  "申请杠杠": "申请杠杠"
 }
\ No newline at end of file
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 3d27f0e..d608227 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -61,7 +61,50 @@
               >{{ $t("提款") }}</van-button
             >
           </van-col>
+          <van-col span="8" style="display: flex; justify-content: center">
+            <van-button
+              @click="leverShow = true"
+              class="btn-two"
+              type="default"
+            >
+              {{ $t("申请杠杠") }}
+            </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="1X" clickable @click="radio = '1'">
+                <template #right-icon>
+                  <van-radio name="1" />
+                </template>
+              </van-cell>
+              <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-group>
+          </van-radio-group>
+        </van-dialog>
       </div>
       <div class="content-list-box">
         <div class="divider div-shrink"></div>
@@ -117,11 +160,15 @@
 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: [
@@ -154,12 +201,23 @@
     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 });
+      }
+    },
     kefu() {
       window.open(this.onlineService);
     },
     async getMoneyData() {
       let data = await api.getMoney();
-      console.log(data);
       if (data.status === 0) {
         // 判断是否登录
         this.moneyList = data.data;
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index bbeccae..243e4f8 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -437,7 +437,7 @@
       let opts = {
         stockId: this.code,
         buyNum: this.num,
-        lever: 1,
+        lever: this.selectCycle ? this.selectCycle : 0,
         targetPrice: this.nums,
       };
       if (this.tabsCurrentIndex == 0) {
@@ -495,7 +495,7 @@
         // 买入是买涨buyType:0, 卖出是买跌buyType:1,卖出的状态是0,买入的状态是1
         buyNum: this.num, // 单位为手
         // buyNum: (this.num.match(/\d+/g))[0] * 100, // 单位为手
-        lever: 1,
+        lever: this.selectCycle ? this.selectCycle : 0,
       };
       if (this.tabsCurrentIndex == 0) {
         opts.buyType = 1;
diff --git a/src/page/user/compontents/cash-list.vue b/src/page/user/compontents/cash-list.vue
index 53f2a7a..8e5217e 100644
--- a/src/page/user/compontents/cash-list.vue
+++ b/src/page/user/compontents/cash-list.vue
@@ -187,7 +187,7 @@
 </script>
 <style lang="less" scoped>
 .wrapper {
-  // padding-top: 0.9rem;
+  background-color: #fff !important;
 }
 
 .payNumber {
diff --git a/src/router/index.js b/src/router/index.js
index 5190674..a0e4de3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -611,10 +611,10 @@
       path: "/rechargelist",
       name: "rechargelist",
       meta: {
-        title: i18n.t("hj168"),
         requireAuth: false,
         hasHeader: false,
-        index: 33
+        index: 56,
+        show: true
       },
       component: RechargeList
     },
@@ -644,10 +644,10 @@
       path: "/cashlist",
       name: "cashlist",
       meta: {
-        title: i18n.t("hj162"),
         requireAuth: false,
         hasHeader: false,
-        index: 36
+        index: 56,
+        show: true
       },
       component: Cashlist
     },

--
Gitblit v1.9.3