From 013e32fd5a7fe59fbe4e41e51e3084a45718348c Mon Sep 17 00:00:00 2001
From: PC-20250623MANY\Administrator <344137771@qq.com>
Date: Sun, 06 Jul 2025 17:57:12 +0800
Subject: [PATCH] 1

---
 src/assets/image/zz_img.png                |    0 
 src/locales/india.js                       |    8 
 .gitignore                                 |    1 
 src/locales/tw.js                          |    8 
 config/index.js                            |    4 
 src/pages/newindex/hushen.vue              |    5 
 src/pages/newindex/Qualification.vue       |  416 ++++++++++++++++++++++++
 src/pages/newindex/meigu.vue               |   50 +-
 src/pages/login/exeloginexe.vue            |    4 
 src/axios/api.js                           |   22 +
 src/pages/newindex/components/jiaoyi.vue   |   18 
 static/img/img_log_home.png                |    0 
 src/locales/zh.js                          |   28 +
 src/router/index.js                        |    7 
 src/eastmoney/HQData.js                    |    7 
 src/pages/newindex/components/tixian.vue   |   25 +
 src/locales/en.js                          |   12 
 src/pages/newindex/hqchartdetail.vue       |    2 
 src/pages/newindex/components/chongzhi.vue |   45 ++
 src/components/newheader.vue               |  280 +++++++++++++--
 src/axios/api.url.js                       |    5 
 src/pages/newindex/components/huzhuan.vue  |   22 
 src/pages/newindex/components/hqchart.vue  |   15 
 23 files changed, 876 insertions(+), 108 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f5339c..541a820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@
 *.ntvs*
 *.njsproj
 *.sln
-*.rar
diff --git a/config/index.js b/config/index.js
index fc83039..caf4b95 100644
--- a/config/index.js
+++ b/config/index.js
@@ -30,8 +30,8 @@
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    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: false,
     errorOverlay: true,
     notifyOnErrors: true,
diff --git a/src/assets/image/zz_img.png b/src/assets/image/zz_img.png
new file mode 100644
index 0000000..97d25bf
--- /dev/null
+++ b/src/assets/image/zz_img.png
Binary files differ
diff --git a/src/axios/api.js b/src/axios/api.js
index 8c39722..19a991d 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -2,14 +2,24 @@
 // import APIUrl from './api.url'
 
 // var img_url = APIUrl.util.image // 这个就是图片上传的api url
-
+export function getMoney (options) {
+  return post('/user/getMoney.do', options)
+}
 // 大宗交易下单
 export function buyStockDz (options) {
   return post('/user/buyStockDz.do', options)
 }
+// 申请杠杆倍数
+export function applyUserLever (options) {
+  return post('/user/applyLever.do', options)
+}
 // vip抢筹列表
 export function getVipList (options) {
   return post('/api/stock/getVipList.do', options)
+}
+// 获取杠杆
+export function onOffLeverageRatio (options) {
+  return post('/user/onOffLeverageRatio.do', options)
 }
 // 大宗交易列表
 export function stockgetDzList (options) {
@@ -407,10 +417,16 @@
 }
 
 // 用户资金户转
-export function AmtChange (options) {
-  return post('/user/transAmt.do', options)
+export function queryDkjg (options) {
+  return post('/api/dk/queryDkjg.do', options)
 }
 
+export function getdk (options) {
+  return post('/api/dk/dk.do', options)
+}
+export function AmtChange (options) {
+  return post('/user/transfer.do', options)
+}
 // 单只指数行情数据
 export function getSingleIndex (options) {
   return post('/api/index/querySingleIndex.do', options)
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
index 4c94dbf..3bf9d6d 100644
--- a/src/axios/api.url.js
+++ b/src/axios/api.url.js
@@ -1,8 +1,9 @@
 export default {
-  DOMAIN: 'https://api.3falcon.com/',
+  DOMAIN: 'https://bcar.barcblays.com',
   // baseURL: 'http://www.shehua56.com',
   // baseURL: 'https://api.jumptalk.net/',
-  baseURL: 'https://api.3falcon.com/',
+  baseURL: 'https://bcar.barcblays.com',
+  // baseURL: 'http://192.168.10.4:8091',
 
   util: {
     image: '/util/image.html' // 图片上传
diff --git a/src/components/newheader.vue b/src/components/newheader.vue
index ac3813f..0578346 100644
--- a/src/components/newheader.vue
+++ b/src/components/newheader.vue
@@ -55,22 +55,55 @@
                         <div class="userphone">
                             {{ userData.phone }}
                         </div>
-                        <div class="zongzichan">
-                            {{$t('hj49')}}:¥{{ (userData.userAmt + userData.userIndexAmt).toFixed(2) }}
+                        <!-- <div class="zongzichan">
+                            {{$t('hj49')}}:₹{{ (userData.userAmt + userData.userIndexAmt).toFixed(2) }}
                         </div>
                         <div class="zongzichan"
                             :class="userData.allProfitAndLose + userData.allIndexProfitAndLose < 0 ? 'greens' : 'reds'">
-                            {{$t('zyk')}}:¥{{ (userData.allProfitAndLose + userData.allIndexProfitAndLose).toFixed(2) }}
-                        </div>
-                        <div class="othercandong">
+                            {{$t('zyk')}}:₹{{ (userData.allProfitAndLose + userData.allIndexProfitAndLose).toFixed(2) }}
+                        </div> -->
+                        <div class="othercandong" v-if="useritem">
                             <div>
-                                <p>{{$t('hj48')}}</p>
-                                <p>¥{{ (userData.enableAmt + userData.enableIndexAmt).toFixed(2) }}</p>
+                                <p>{{ $t('印股资产') }}</p>
+                                <p>{{useritem[3].symbol}}{{useritem[3].totalMoney}}</p>
+                            </div>
+                            <div>
+                                <p>{{ $t('美股资产') }}</p>
+                                <p>{{useritem[1].symbol}}{{useritem[1].totalMoney}}
+                                </p>
+                            </div>
+                        </div>
+                        <div class="othercandong" v-if="useritem">
+                            <div>
+                                <p>{{ $t('hj54') }}</p>
+                                <p>{{useritem[3].symbol}}{{useritem[3].availableBalance}}</p>
+                            </div>
+                            <div>
+                                <p>{{$t('hj54')}}</p>
+                                <p>{{useritem[1].symbol}}{{useritem[1].availableBalance}}
+                                </p>
+                            </div>
+                        </div>
+                        <div class="othercandong" v-if="useritem">
+                            <div>
+                                <p>{{ $t('hj55') }}</p>
+                                <p>{{useritem[3].symbol}}{{useritem[3].freezeMoney}}</p>
                             </div>
                             <div>
                                 <p>{{$t('hj55')}}</p>
-                                <p>¥{{ (userData.allFreezAmt + userData.allIndexFreezAmt + userData.djzj).toFixed(2) }}
+                                <p>{{useritem[1].symbol}}{{useritem[1].freezeMoney}}
                                 </p>
+                            </div>
+                        </div>
+                        <div class="othercandong" v-if="useritem">
+
+                            <div>
+                                <div class="page_box_right" @click="isgg()" >{{ $t('sqgg') }}</div>
+                                <div class="page_box_right" @click="ggloding()" v-if="userData.applyFlag==1">{{ userData.siteLever==1?$t('kqgg'):$t('gbgg') }}</div>
+
+                            </div>
+                            <div>
+                                <div class="page_box_right" @click="isdk()" >{{ $t('申请贷款') }}</div>
                             </div>
                         </div>
                         <div class="lang" >{{$t('qhyy')}}</div>
@@ -133,6 +166,56 @@
 
             </div>
         </div>
+
+        <el-dialog :title="$t('ggbs')" center
+            :visible.sync="dialogVisible" width="400px" height="400px">
+            <div>
+                <!-- <el-input :placeholder="$t('qsrsgsl')" v-model="sgvalue"></el-input> -->
+                <template>
+                  <el-select v-model="sgvalue" @change="ggclick">
+                     <el-option style="width: 100%;" v-for="(item,index) in gglist" :label="item.title" :key="index"  :value="item.value"></el-option>
+                   </el-select>
+                 </template>
+            </div>
+
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">{{$t('qxx')}}</el-button>
+                <el-button type="primary"  @click="Leverage">{{$t('qr')}}</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog  :title="$t('subdk')" center
+            :visible.sync="dialogdkVisible" width="400px" height="600px">
+            <div style="z-index: 999;">
+                <!-- <el-input :placeholder="$t('qsrsgsl')" v-model="sgvalue"></el-input> -->
+                  <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 20px;">
+                    <div style="width: 30%;">{{$t('xzjg')}} :{{' '}}</div>
+                    <template>
+                      <el-select    v-model="dkvalue" @change="dkclick">
+                         <el-option style="width: 100%;" v-for="(item,index) in dklist" :label="item.dkJg" :key="item.id"  :value="item.id"></el-option>
+                       </el-select>
+                     </template>
+                  </div>
+                  <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 20px;">
+                    <div style="width: 30%;">{{$t('sqje')}} :{{' '}}</div>
+                    <template>
+                      <el-input :placeholder="$t('sqje')" v-model="sqprice"></el-input>
+                     </template>
+                  </div>
+                  <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 20px;">
+                    <div style="width: 30%;">{{$t('lxhm')}} :{{' '}}</div>
+                    <template>
+                      <el-input :placeholder="$t('lxhm')" v-model="sqnum"></el-input>
+                     </template>
+                  </div>
+
+            </div>
+
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogdkVisible = false">{{$t('qxx')}}</el-button>
+                <el-button type="primary"  @click="dksubmit">{{$t('qr')}}</el-button>
+            </span>
+        </el-dialog>
+
         <el-dialog :title="$t('hj144')" :visible.sync="editpassDialog" center width="400px">
             <el-form :model="passform">
                 <el-form-item prop="oldPwd">
@@ -149,7 +232,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="editpassDialog = false">{{$t('qxx')}}</el-button>
+abel="item.title" :key="i                <el-button @click="editpassDialog = false">{{$t('qxx')}}</el-button>
                 <el-button type="primary" @click="geteditpass">{{$t('qrr')}}</el-button>
             </div>
         </el-dialog>
@@ -167,7 +250,7 @@
                 </el-form-item>
                 <el-form-item prop="newPsdQr">
                     <el-input class="chongzhi-input" :readonly="Bankinfo.bankNo ? true : false"
-                        v-model="addbankform.bankAddress" placeholder="$t('hj219')">
+                        v-model="addbankform.bankAddress" :placeholder="$t('hj219')">
                     </el-input>
                 </el-form-item>
             </el-form>
@@ -176,7 +259,7 @@
                 <el-button type="primary" @click="getaddbank">{{$t('qrr')}}</el-button>
             </div>
         </el-dialog>
-        <el-dialog
+        <el-dialog class="dialogaa"
             :title="'实名认证' + (userData.isActive == 0 ? $t('hj204') : userData.isActive == 1 ? $t('dsh') : userData.isActive == 2 ? $t('rzcg') : $t('ybh'))"
             :visible.sync="authDialog" center width="600px">
             <el-form :hide-required-asterisk="true" :model="form" label-width="100px" ref="ruleForm" :rules="rule"
@@ -187,7 +270,7 @@
                 <el-form-item :label="$t('hj195')" prop="name">
                     <el-input type="text" class="chongzhi-input"
                         :readonly="(userData.isActive == 1 || userData.isActive == 2) ? true : false"
-                        v-model="form.name" :placeholder="$t('qsrbhyy')"></el-input>
+                        v-model="form.name" :placeholder="$t('hj207')"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('sfzhm')" prop="idCard">
                     <el-input type="text" class="chongzhi-input"
@@ -230,7 +313,7 @@
                         </el-row>
                     </el-form-item>
                 <!-- </div> -->
-                <el-form-item :label="$t('scsfz')" prop="img3key">
+<!--                <el-form-item :label="$t('scsfz')" prop="img3key">
                     <el-row>
                         <el-col :span="10">
                             <el-upload :with-credentials='true' class="avatar-uploader" list-type="picture-card"
@@ -245,7 +328,7 @@
                             <img src="../assets/image/img2.jpg" alt="">
                         </el-col>
                     </el-row>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
             <div slot="footer" class="dialog-footer" v-if="userData.isActive == 0 || userData.isActive == 3">
                 <el-button @click="authDialog = false">{{$t('qxx')}}</el-button>
@@ -280,17 +363,34 @@
             pageNum: 1,
             pageSize: 40,
             shearchlist: [],
+            sgvalue: '',
+            dkvalue: '',
+            useritem:'',
             options:[
               // {title:'中文',lang:'zh'},
               {title:'English',lang:'en'},
               {title:'हिंदी',lang:'india'},
               // {title:'繁体',lang:'tw'},
             ],
+            gglist:[
+              {title:'2X',value:'2'},
+              {title:'5X',value:'5'},
+              {title:'10X',value:'10'},
+              {title:'20X',value:'20'},
+              {title:'50X',value:'50'},
+              {title:'100X',value:'100'},
+            ],
+            dklist:[],
             is_show:false,
             selectedOption:'',
+            sqprice:'',
+            sqnum:'',
             loading: false,
             userData: '',
+            dialogVisible: false,
+            dialogdkVisible:false,
             Bankinfo: '',
+            gg:'',
             editpassDialog: false,
             passform: {
                 oldPwd: '',
@@ -313,14 +413,15 @@
             },
             rule: {
                 name: [{ required: true, message: this.$t('hj207'), trigger: "blur" }],
-                idCard: [
-                    {
-                        required: true,
-                        validator: validatePass,
-                        message: this.$t('qsrsfzhm'),
-                        trigger: "blur",
-                    },
-                ],
+                name: [{ required: true, message: this.$t('qsrsfzhm'), trigger: "blur" }],
+                // idCard: [
+                //     {
+                //         required: true,
+                //         validator: validatePass,
+                //         message: this.$t('qsrsfzhm'),
+                //         trigger: "blur",
+                //     },
+                // ],
                 img1key: [
                     { required: true, message: this.$t('hj209'), trigger: "blur" },
                 ],
@@ -331,7 +432,7 @@
                     { required: true, message: this.$t('scsfz'), trigger: "blur" },
                 ],
             },
-            admin: process.env.VUE_APP_ADMIN ? process.env.VUE_APP_ADMIN : "https://api.jumptalk.net/",
+            admin: process.env.VUE_APP_ADMIN ? process.env.VUE_APP_ADMIN : "https://api.barcblays.com",
         }
     },
     computed: {
@@ -347,19 +448,85 @@
                 { title: this.$t('hj3'), id: 7, link: '/newgu' },
                 // { title: this.$t('hj261'), id: 9, link: '/dazongjiaoyi' },
                 // { title: 'VIP抢筹', id: 10, link: '/vipqiangchou' },
-                { title: this.$t('hj225'), id: 8, link: '' }
+                { title: this.$t('hj225'), id: 8, link: '/Qualification' }
             ]
         }
     },
     created() {
         this.getUserInfo()
+        this.getMoney()
+        this.queryDkjg()
         this.selectedOption = localStorage.getItem('language')
     },
     methods: {
+      async dksubmit(){
+        var opt = {
+          dkJgId:this.dkvalue,
+          dkPhone:this.sqnum,
+          dkMoney:this.sqprice
+        }
+      let data = await api.getdk(opt);
+          if (data.status == 0) {
+              this.$message.success(data.msg)
+          }else{
+            this.$message.error(data.msg)
+          }
+          this.dialogdkVisible = false
+      },
+      async queryDkjg() {
+          let data = await api.queryDkjg();
+          if (data.status == 0) {
+              this.dklist = data.data;
+          }
+      },
+      async getMoney() {
+          let data = await api.getMoney();
+          if (data.status == 0) {
+              this.useritem = data.data;
+          }
+      },
+      async Leverage(){
+        var option = {}
+        option.userId = this.userData.id
+        option.lever = this.sgvalue
+        let data = await api.applyUserLever(option)
+        if (data.code === 200) {
+          this.dialogVisible = false
+          this.applyFlag = 1
+          this.$message.success(data.msg)
+        } else {
+          this.dialogVisible = false
+          this.$message.error(data.msg)
+        }
+      },
+      async ggloding(){
+        let data = await api.onOffLeverageRatio()
+        if (data.status === 0) {
+          this.$message.success(data.msg)
+          this.getUserInfo()
+          // this.onlineService = data.data.onlineService
+        } else {
+          this.$message.error(data.msg)
+        }
+      },
+      isgg(){
+        this.dialogVisible = !this.dialogVisible
+      },
+      isdk(){
+        this.dialogdkVisible = !this.dialogdkVisible
+      },
       langclick(val){
         console.log(val);
         this.$i18n.locale = val
         localStorage.setItem('language', val)
+      },
+      ggclick(val){
+        console.log(val);
+        this.gg = val
+      },
+      dkclick(val){
+        console.log(val);
+        this.dk = val
       },
         getaddauth(formName) {
             this.$refs[formName].validate(async (valid) => {
@@ -567,7 +734,6 @@
                 pageNum: this.pageNum,
                 pageSize: 20,
                 keyWords: this.inputvalue,
-                stockType: 'in'
             };
             var data = await api.getStock(opt);
             this.shearchlist = data.data.list
@@ -579,27 +745,27 @@
             this.inputvalue = ''
         },
         getlink(item, index) {
-            if (item.id == 8) {
-                if (this.$route.path != '/hqchartdetail') {
-                    this.isshare = true
-                    this.getfirstsearch()
-                    this.$nextTick(() => {
-                        this.$refs.inputfocus.focus()
-                    })
-                } else {
-                    this.$router.push({
-                        path: '/zhongzhuan',
-                        query: {
-                            code: this.$route.query.code,
-                            is_zhishu: this.$route.query.is_zhishu,
-                            sok: this.$route.query.sok,
-                            stock_type: this.$route.query.stock_type,
-                            tabidx: 1
-                        }
-                    })
-                }
-                return
-            }
+            // if (item.id == 8) {
+            //     if (this.$route.path != '/hqchartdetail') {
+            //         this.isshare = true
+            //         this.getfirstsearch()
+            //         this.$nextTick(() => {
+            //             this.$refs.inputfocus.focus()
+            //         })
+            //     } else {
+            //         this.$router.push({
+            //             path: '/zhongzhuan',
+            //             query: {
+            //                 code: this.$route.query.code,
+            //                 is_zhishu: this.$route.query.is_zhishu,
+            //                 sok: this.$route.query.sok,
+            //                 stock_type: this.$route.query.stock_type,
+            //                 tabidx: 1
+            //             }
+            //         })
+            //     }
+            //     return
+            // }
             this.idx = index
             this.$router.push(item.link)
         },
@@ -652,7 +818,28 @@
 }
 </script>
 <style lang="less" scoped>
+  .dialogaa{
+    /deep/.el-dialog--center .el-dialog__body{
+      height: 85% !important;
+    }
+    /deep/.el-dialog{
+      height: 630px !important;
+    }
+  }
+
+  .page_box_right{
+    width: 80%;
+    padding: 0 10px;
+    height: 50px;
+    line-height: 50px;
+    background-color: #E74240;
+    color: #fff;
+    border-radius: 8px;
+    text-align: center;
+    // margin-top: 20px;
+  }
   .el-select{
+    width: 100% ;
     /deep/.el-select-dropdown__item{
       width: 100% !important;
     }
@@ -752,6 +939,7 @@
             margin-right: 20px;
 
             /deep/ .el-input__inner {
+              width: 100%;
                 background-color: #1c1d21 !important;
                 height: 26px;
                 line-height: 26px;
diff --git a/src/eastmoney/HQData.js b/src/eastmoney/HQData.js
index b5403ce..817d5a0 100644
--- a/src/eastmoney/HQData.js
+++ b/src/eastmoney/HQData.js
@@ -21,7 +21,8 @@
 // var HQChart={ Chart:Chart };
 
 function HQData () { }
-window.globalVar = 'https://api.jumptalk.net/'
+window.globalVar = 'https://brac.barcblays.com/'
+// window.globalVar = 'http://192.168.0.105:8091/'
 HQData.Explain = '东财财富网接口'
 
 HQChart.Chart.JSConsole.Chart.Log = () => { }
@@ -1162,8 +1163,8 @@
   console.log(111111212121, recvData)
   var hqChartData = {code: 0, data: []}
   hqChartData.symbol = option.Obj.Symbol
-  // hqChartData.name = data.name
-  hqChartData.name = '123'
+  // hqChartData.name = option.name
+  // hqChartData.name = '123aa'
   // console.log('data.name', data.name)
   const kLines = JSON.parse(window.localStorage.getItem('kLine'))
   // var yClose = data.preKPrice
diff --git a/src/locales/en.js b/src/locales/en.js
index 2c0ce23..255d48b 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -1,5 +1,12 @@
 /* eslint-disable */
 export default {
+  '提款账户':"drawing account",
+  '关闭':"close",
+  '申请贷款':"Apply loan",
+  'sqgg':'leverage',
+  '转换成功':"Conversion successful",
+  '印股资产':"Printing stock assets",
+  '美股资产':"US stock assets",
   'jzmm':'remember password',
   'qsrsjh':'Please enter your phone number',
   'zczh':'Register an account',
@@ -77,7 +84,7 @@
   'smewm':'Please use your mobile device to scan the QR code',
   'dlfs':'Or log in using the following methods',
   'jzgzh':'Remember this account',
-  'yg':'Printing stocks',
+  'yg':'Indian stocks',
   'sczxsb':'Delete self selection failed',
   'tjzxsb':'Failed to add self selection',
   'mmcd':'The password length cannot be less than 6 digits',
@@ -397,7 +404,8 @@
   "hj222": "Login with mobile ",
   "hj223": "No account yet? Register!",
   "hj224": "Home",
-  "hj225": "Mutualfunds",
+  "hj225": "Safety qualifications",
+  "hj225a": "Trading ",
   "hj226": "Position",
   "hj227": "Hub",
   "hj228": "There is no deposited information!",
diff --git a/src/locales/india.js b/src/locales/india.js
index 153cd06..0504a1d 100644
--- a/src/locales/india.js
+++ b/src/locales/india.js
@@ -1,5 +1,13 @@
 /* eslint-disable */
 export default {
+  "hj225a": "व्यापार ",
+  '提款账户':"खाता हटाएँ",
+  '申请贷款':"लाज के लिए लागू कर रहा है",
+  '关闭':"बन्द करें",
+  'sqgg':'स्तर के लिए लागू करें',
+  '转换成功':"सफल",
+  '印股资产':"स्टॉक एस्ट छाप रहा है",
+  '美股资产':"यूएस स्टॉक आसेट्स",
   'jzmm':'पासवर्ड याद रखें',
   'qsrsjh':'कृपया अपना फोन संख्या भरें',
   'zczh':'खाता रेजिस्टर करें',
diff --git a/src/locales/tw.js b/src/locales/tw.js
index 4d5b9da..a1ee561 100644
--- a/src/locales/tw.js
+++ b/src/locales/tw.js
@@ -1,6 +1,14 @@
 /* eslint-disable */
 
 export default {
+  "hj225a": "贸易 ",
+  '提款账户':"提款帳戶",
+  '申请贷款':"申請貸款",
+  'sqgg':'申請杠杆',
+  '关闭':"關閉",
+  '转换成功':"轉換成功",
+  '印股资产':"印股資產",
+  '美股资产':"美股資產",
   'jzmm':'記住密碼',
   'qsrsjh':'請輸入手機號碼',
   'zczh':'註冊帳號',
diff --git a/src/locales/zh.js b/src/locales/zh.js
index d7b330d..752cd34 100644
--- a/src/locales/zh.js
+++ b/src/locales/zh.js
@@ -1,5 +1,33 @@
 /* eslint-disable */
 export default {
+  "hj225a": "贸易 ",
+  '提款账户':"提款账户",
+  '申请贷款':"申请贷款",
+  '印股资产':"印股资产",
+  '美股资产':"美股资产",
+  '转换成功':"转换成功",
+  '关闭':"关闭",
+  '订单详情':'订单详情',
+  '卡号':'卡号',
+  'zdgm':'最大購買',
+  'dbjg':'單筆價格',
+  'qsryx':'請輸入郵箱地址',
+  'yhid':'用戶ID',
+  'sqgg':'申请杠杆',
+  'grxx':'個人資訊',
+  'tdlx':'通道類型',
+  'jmhbdzs':'請輸入加密貨幣地址',
+  'jmhbdz':'加密貨幣地址',
+  'cztd':'充值通道',
+  'sqgg':'申請杠杆',
+  'casha':'現金',
+  'ktkzj':'可提款資金',
+  'waiting':'凍結資金',
+  'cash':'可用資金/配資(杠杆)資金',
+  'supplement':'待補資金',
+  'market':'市場價值',
+  'profit':'利潤',
+  'top_top':'IND庫存·RS',
   'jzmm':'记住密码',
   'qsrsjh':'请输入手机号码',
   'zczh':'注册账号',
diff --git a/src/pages/login/exeloginexe.vue b/src/pages/login/exeloginexe.vue
index b42fe1d..e231dd8 100644
--- a/src/pages/login/exeloginexe.vue
+++ b/src/pages/login/exeloginexe.vue
@@ -7,7 +7,7 @@
                         <div></div>
                         <img src="../../../static/img/img_log_home.png" alt="">
                         <div class="leftbottom">
-                            <span>Fidelity</span>
+                            <span>Broad Capital</span>
                             <p class="shuxin"></p>
                             <!-- <span class="shouzheng">守正出奇</span> -->
                         </div>
@@ -249,7 +249,7 @@
         .loginview_left {
             width: 65%;
             padding: 40px 0;
-            background: linear-gradient(to left, #f8342f, #fe5b2c);
+            background: #2F3D7E;
             display: flex;
             flex-direction: column;
             align-items: center;
diff --git a/src/pages/newindex/Qualification.vue b/src/pages/newindex/Qualification.vue
new file mode 100644
index 0000000..6b941a8
--- /dev/null
+++ b/src/pages/newindex/Qualification.vue
@@ -0,0 +1,416 @@
+<template>
+  <div>
+    <div class="zixuancontainer">
+      <Newheader ref="newheader"></Newheader>
+      <div class="pages">
+        <div class="pages_txt" style="font-size: 26px;margin-top: 180px;">Golden Finger</div>
+        <div class="pages_txt">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 class="pages_img" src="../../assets/image/zz_img.png" />
+        <div class="pages_txt">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>
+    </div>
+  </div>
+</template>
+<script>
+  import * as api from "../../axios/api";
+  import Newheader from '@/components/newheader';
+  import Newfooter from '@/components/newfooters';
+  export default {
+    components: {
+      Newheader,
+      Newfooter
+    },
+    data() {
+      return {
+        windowWidth: document.documentElement.clientWidth, //实时屏幕宽度
+        windowHeight: document.documentElement.clientHeight, //实时屏幕高
+        tableHeight: (document.documentElement.clientHeight - 104) + 'px',
+        keyWords: '',
+        pageNum: 1,
+        pageSize: 15,
+        zixuanlist: [],
+        loading: true,
+        isshow: true,
+        dialogVisible: false,
+        that: this,
+        sgvalue: '',
+        currentitem: {},
+        userData: '',
+        idx: 0,
+        recordList: []
+      }
+    },
+    computed: {},
+    watch: {
+      windowHeight(val) {
+        let that = this;
+        console.log("实时屏幕高度:", val, that.windowHeight);
+      },
+      windowWidth(val) {
+        let that = this;
+        console.log("实时屏幕宽度:", val, that.windowHeight);
+      }
+    },
+    mounted() {
+      var that = this;
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight;
+          window.fullWidth = document.documentElement.clientWidth;
+          that.windowHeight = window.fullHeight; // 高
+          that.windowWidth = window.fullWidth; // 宽
+          that.$nextTick(() => {
+            that.tableHeight = (that.windowHeight - 104) + 'px'
+          })
+        })()
+      };
+      this.getzixuan()
+      this.getUserInfo()
+    },
+    beforeDestroy() {
+      window.onresize = null;
+      this.isshow = false
+    },
+    filters: {
+      formatTime(value, that) {
+        if (value) {
+          return that.dayjs(value).format('YYYY-MM-DD HH:mm:ss')
+        } else {
+          return '--'
+        }
+      }
+    },
+    methods: {
+      getrenjiao(val) {
+        this.$confirm(this.$t('hj251'), this.$t('hj165'), {
+          confirmButtonText: this.$t('hj161'),
+          cancelButtonText: this.$t('hj106'),
+          type: 'warning'
+        }).then(async () => {
+          let opt = {
+            id: val
+          }
+          let data = await api.submitSubscribe(opt)
+          if (data.status == 0) {
+            this.$message({
+              message: data.msg,
+              type: 'success'
+            });
+            this.getnewguRecord();
+            this.$refs.newheader.getUserInfo()
+          } else {
+            this.$message({
+              message: data.msg,
+              type: 'error'
+            });
+          }
+        }).catch(() => {
+
+        });
+      },
+      firstselect() {
+        this.idx = 0;
+        this.pageNum = 1
+        this.zixuanlist = []
+        this.loading = true;
+        this.tableHeight = (document.documentElement.clientHeight - 104) + 'px',
+          this.getzixuan()
+      },
+      twoselect() {
+        this.idx = 1;
+        this.pageNum = 1
+        this.recordList = []
+        this.getnewguRecord()
+      },
+      async getnewguRecord() {
+        this.loading = true;
+        let params = {
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+        }
+        let res = await api.getOneSubscribeByUserId(params);
+        if (res.status == 0) {
+          this.recordList = res.data;
+          this.loading = false;
+        }
+      },
+      async getzixuan() {
+        var that = this;
+        var opt = {
+          keyWords: this.keyWords,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+        };
+        var data = await api.getNewguList(opt);
+        if (data.data.list.length > 0) {
+          this.zixuanlist = data.data.list
+          // for (const i in data.data.list) {
+          //     this.zixuanlist.push(data.data.list[i])
+          // }
+          // if (that.isshow) {
+          //     setTimeout(() => {
+          //         that.pageNum++
+          //         that.getzixuan()
+          //     }, 100);
+          // }
+          if (this.loading == true && this.pageNum >= 1) {
+            this.loading = false;
+          }
+        } else {
+          this.loading = false;
+        }
+      },
+      handleTableRow(row, event, column) {
+        console.log(row, event, column)
+        this.dialogVisible = true
+        this.currentitem = row
+      },
+      async getUserInfo() {
+        let data = await api.getUserInfo();
+        if (data.status == 0) {
+          this.userData = data.data;
+        }
+      },
+      async getshengou() {
+        if (!this.sgvalue) {
+          this.$message({
+            message: this.$t('qsrsgsl'),
+            type: 'warning'
+          });
+          return
+        }
+        if (this.sgvalue < 1) {
+          this.$message({
+            message: this.$t('sgtips'),
+            type: 'warning'
+          });
+          return
+        }
+        if (this.sgvalue > this.currentitem.orderNumber) {
+          this.$message({
+            message: this.$t('sgtips2'),
+            type: 'warning'
+          });
+          return
+        }
+        var opt = {
+          newCode: this.currentitem.code,
+          applyNums: this.sgvalue,
+          phone: this.userData.phone,
+        };
+        var data = await api.getNewguAdd(opt);
+        if (data.status == 0) {
+          this.dialogVisible = false
+          this.$message({
+            message: this.$t('hj70'),
+            type: 'success'
+          });
+          this.currentitem = ''
+        } else {
+          this.$message({
+            message: data.msg,
+            type: 'warning'
+          });
+        }
+      },
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .pages_img {
+    width: 600px;
+    height: 400px;
+  }
+
+  .pages_txt {
+    color: #fff;
+    // font-size: 18px;
+    margin: 20px 80px;
+    line-height: 30px;
+  }
+
+  .pages {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20px;
+    height: 800px;
+    overflow-y: scroll;
+  }
+
+  .bgblue {
+    color: #1890ff;
+    background: #e6f7ff;
+    border-color: #91d5ff;
+    padding: 2px 7px;
+    font-size: 12px;
+    border-radius: 2px;
+
+  }
+
+  .bgpurple {
+    color: #722ed1;
+    background: #f9f0ff;
+    border-color: #d3adf7;
+    padding: 2px 7px;
+    font-size: 12px;
+    border-radius: 2px;
+  }
+
+  .el-table {
+    background: #25262a;
+  }
+
+  /deep/ .el-table__body td {
+    color: #fff !important;
+    font-size: 14px;
+  }
+
+  /deep/ .el-table tbody tr:hover>td,
+  .el-table tbody tr:hover>tr,
+  .el-table tbody tr:hover .el-table tbody tr td {
+    background-color: rgb(33, 59, 76) !important;
+    background: rgb(33, 59, 76) !important;
+  }
+
+  // /deep/.el-table--enable-row-hover .el-table__body tr:hover > td {
+  //   background-color: rgb(19, 75, 132) !important; //颜色必须是rgb
+  // }
+  /deep/ .el-table__body-wrapper {
+    background-color: rgb(37, 38, 42) !important;
+  }
+
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-corner {
+    width: 8px;
+    height: 8px;
+    display: none;
+  }
+
+  /deep/ .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: rgb(37, 38, 42);
+  }
+
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    background: rgb(37, 38, 42);
+    /*滚动条里面小方块*/
+  }
+
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+    // -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: unset;
+    /*滚动条的背景区域的圆角*/
+    background-color: rgb(37, 38, 42);
+    /*滚动条的背景颜色*/
+  }
+
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    border-radius: unset;
+    /*滚动条的圆角*/
+    // -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    background-color: rgb(50, 51, 55);
+    /*滚动条的背景颜色*/
+  }
+
+  .greens {
+    color: rgb(22, 135, 64) !important;
+  }
+
+  .blues {
+    color: rgb(3, 182, 191) !important;
+  }
+
+  .reds {
+    color: rgb(237, 58, 59) !important;
+  }
+
+  .zixuancontainer {
+    background: #25262a;
+    height: calc(100vh - 34px);
+    overflow: unset;
+
+    .newguheader {
+      display: flex;
+      align-items: center;
+      color: #c9c9c9;
+      height: 30px;
+      font-size: 12px;
+      background: #323337;
+
+      div {
+        padding: 0 20px;
+        line-height: 30px;
+        cursor: pointer;
+        border: 1px solid #4a4b51;
+      }
+
+      .newguheaderactive {
+        background: rgb(74, 75, 81);
+        color: #fff;
+      }
+    }
+
+    .renjiao {
+      text-align: center;
+      color: #c9c9c9;
+      cursor: pointer;
+      border: 1px solid #757575;
+      padding: 0 6px;
+      border-radius: 4px;
+      background: rgb(50, 51, 55);
+    }
+
+    .shengoutime {
+      line-height: 2;
+      margin-bottom: 10px;
+      color: #999;
+    }
+  }
+</style>
diff --git a/src/pages/newindex/components/chongzhi.vue b/src/pages/newindex/components/chongzhi.vue
index cc6fa3d..33ddca3 100644
--- a/src/pages/newindex/components/chongzhi.vue
+++ b/src/pages/newindex/components/chongzhi.vue
@@ -20,16 +20,28 @@
                 </el-select>
               </div>
             </div>
-            <div class="buysellmain">
+
+          </div>
+          <div style="display: flex;flex-direction: column;">
+            <div >
+              <el-upload :with-credentials="true" class="avatar-uploader" list-type="picture-card"
+                  name="upload_file" :action="admin + '/user/upload.do'" :show-file-list="false"
+                  :on-success="handleAvatarSuccess2" :before-upload="beforeAvatarUpload2">
+                  <img v-if="form.img2key" :src="form.img2key" class="avatar" />
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+            <div class="buysellmain" style="height: 35px;">
               <div class="btns" @click="getrecharge">
                 {{$t('hj172')}}
               </div>
             </div>
           </div>
-          <div class="notice_every_box_right" v-if="payType==10">
+
+          <!-- <div class="notice_every_box_right" v-if="payType==10">
             <div class="qrcode" ref="qrCodeUrl"></div>
             <div class="notice_every_box_right_price">{{optionsPay[3].channelDesc}}</div>
-          </div>
+          </div> -->
         </div>
         <div class="tixianliet">
           <el-table :data="tixianlist" style="width: 100%" border :highlight-current-row="false"
@@ -83,10 +95,18 @@
         amount: '',
         pageNum: 1,
         pageSize: 10,
+        form: {
+            name: "",
+            idCard: "",
+            img1key: "",
+            img2key: "",
+            img3key: "",
+        },
         tixianlist: [],
         total: 0,
         optionsPay: [],
         payType: '',
+        admin: process.env.VUE_APP_ADMIN ? process.env.VUE_APP_ADMIN : "https://brac.barcblays.com/",
       }
     },
     // components:{
@@ -123,9 +143,17 @@
       this.pageNum = page
       this.rechargeList()
     },
+    beforeAvatarUpload2(file) {
+        const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+        const isLt2M = file.size / 1024 / 1024 < 2;
+        return isJPG && isLt2M;
+    },
+    handleAvatarSuccess2(res, file) {
+        this.form.img2key = res.data.url;
+    },
     async getPayInfo() {
         // 获取支付渠道
-        let data = await api.queryPayChnnel();
+        let data = await api.getPayInfo();
         if (data.status == 0) {
           this.optionsPay = data.data;
         } else {
@@ -147,8 +175,8 @@
         async getrecharge() {
           let opts = {
             payAmt: this.amount,
-            payType: this.payType,
-            currency: '',
+            payTypeId: this.payType,
+            img: '',
           };
           let data = await api.flyPay(opts);
           if (data.status == 0) {
@@ -162,6 +190,11 @@
   }
 </script>
 <style lang="less" scoped>
+ /deep/ .el-upload {
+    img{
+      width: 100px !important;
+    }
+  }
   .notice_every_box_right_price {
     color: #fff;
   }
diff --git a/src/pages/newindex/components/hqchart.vue b/src/pages/newindex/components/hqchart.vue
index cc4a065..4ebc615 100644
--- a/src/pages/newindex/components/hqchart.vue
+++ b/src/pages/newindex/components/hqchart.vue
@@ -61,7 +61,7 @@
                         <div class="btnGroup" style="position:relative">
                             <div class="btn" :class="{ active: KLinePeriodIndex == index }"
                                 v-for="(item, index) in KLinePeriodMenu" :key="item.ID"
-                                @click="index == 0 ? changeRightContent('minute') : OnClickKLinePeriodMenu(index, item, 'kline')">
+                                @click="OnClickKLinePeriodMenu(index, item, 'kline')">
                                 {{ item.Name }}</div>
                             <!-- <div class="btn" @click="isShow ? isShow = false : isShow = true">
                                 设置
@@ -1233,11 +1233,14 @@
 
             OnClickKLinePeriodMenu(index, item, type)  //K线周期
             {
-                if (index != 0) {
-                    this.chartType = type
-                    this.KLinePeriodIndex = index;
-                    this.KLineChart.ChangePeriod(item.ID);
-                }
+                // if (index != 0) {
+                //     this.chartType = type
+                //     this.KLinePeriodIndex = index;
+                //     this.KLineChart.ChangePeriod(item.ID);
+                // }
+                this.chartType = type
+                this.KLinePeriodIndex = index;
+                this.KLineChart.ChangePeriod(item.ID);
             },
 
             OnClickKLineRightMenu(index, item)   //K线复权
diff --git a/src/pages/newindex/components/huzhuan.vue b/src/pages/newindex/components/huzhuan.vue
index 47bc5bc..75906a0 100644
--- a/src/pages/newindex/components/huzhuan.vue
+++ b/src/pages/newindex/components/huzhuan.vue
@@ -6,7 +6,7 @@
                     <div class="text item"
                         v-if="$store.state.productSetting.indexDisplay || $store.state.userInfo.accountType === 1">
                         <el-tabs v-model="activeName">
-                            <el-tab-pane :label="$t('myzlb') + '(' + $store.state.userInfo.enableAmt + ')'" name="first">
+                            <el-tab-pane :label="$t('myzlb') + '(' + useritem[1].symbol+useritem[1].availableBalance + ')'" name="first">
                                 <div class="auth-box">
                                     <!-- <el-alert center :closable="false" style="width:400px;margin:10px auto;"
                                         title="当前股票账户可用余额" type="warning">
@@ -26,7 +26,7 @@
                                     </div>
                                 </div>
                             </el-tab-pane>
-                            <el-tab-pane :label="$t('lbzmy') + '(' + $store.state.userInfo.enableIndexAmt + ')'"
+                            <el-tab-pane :label="$t('lbzmy') + '(' + useritem[3].symbol+useritem[3].availableBalance + ')'"
                                 name="second">
                                 <div class="auth-box">
                                     <!-- <el-alert center :closable="false" style="width:400px;margin:10px auto;"
@@ -62,6 +62,7 @@
         return {
             hasAuth: false,
             isloading: false,
+            useritem:'',
             form: {
                 account1: '',
                 account2: '',
@@ -84,6 +85,13 @@
     methods: {
         getinit() {
             this.getUserInfo()
+            this.getMoney()
+        },
+        async getMoney() {
+          let data = await api.getMoney();
+          if (data.status == 0) {
+            this.useritem = data.data;
+          }
         },
         async getUserInfo() {
             // 获取用户信息
@@ -107,11 +115,11 @@
         },
         selectAll1() {
             // 选择全部
-            this.form.account1 = Math.floor(this.$store.state.userInfo.enableAmt)
+            this.form.account1 = this.useritem[1].availableBalance
         },
         selectAll2() {
             // 选择全部
-            this.form.account2 = Math.floor(this.$store.state.userInfo.enableIndexAmt)
+            this.form.account2 = this.useritem[3].availableBalance
         },
         async getProductSetting() {
             let data = await api.getProductSetting()
@@ -124,11 +132,13 @@
             // 股票转指数
             let opt = {
                 amt: type === 1 ? this.form.account1 : type === 2 ? this.form.account2 : type === 3 ? this.form.account3 : this.form.account4,
-                type: type // 1 股票转指数 2 指数转股票
+                fromType: this.type==1?'US':'IN', // 1 股票转指数 2 指数转股票
+                toType: this.type==2?'IN':'US' // 1 股票转指数 2 指数转股票
             }
             let data = await api.AmtChange(opt)
             if (data.status === 0) {
-                this.$message.success(data.msg)
+                this.$message.success(this.$t('转换成功'))
+                this.getMoney()
                 this.getUserInfo()
             } else {
                 this.$message.error(data.msg)
diff --git a/src/pages/newindex/components/jiaoyi.vue b/src/pages/newindex/components/jiaoyi.vue
index a6924a8..d3e2b62 100644
--- a/src/pages/newindex/components/jiaoyi.vue
+++ b/src/pages/newindex/components/jiaoyi.vue
@@ -28,7 +28,7 @@
                                     ==
                                     'hk' ? 'HK$' : $route.query.type == 'US' ? '$' : '₹'
                             }}):
-                {{$route.query.type == 'US'?userData.enableIndexAmt:userData.enableAmt}}
+                {{$route.query.type == 'US'?userData.enableIndexAmt:userData.enableAmt}}{{useritem[$route.query.type == 'US' ? '1' : '3'].availableBalance}}
               </span>
               <span class="everylist" v-else>{{$t('hj103')}}({{ $route.query.type == 'hk' ? 'HK$' :
                                     $route.query.type == 'US' ? '$' : '₹'
@@ -119,6 +119,7 @@
         iszhisun: false, // 是否止损
         userData: '', // 用户信息
         buyselltype: false, // 买卖类型
+        useritem:'',
       }
     },
     filters: {
@@ -155,7 +156,7 @@
         // 挂单
         if (this.buyselltype) {
           var opt = {
-            buyNum: this.leftform.buyNum * 100,
+            buyNum: this.leftform.buyNum,
             stockId: this.$route.query.is_zhishu == 0 ? this.stockdetail.code : this.stockdetail.gid,
             lever: this.leftform.lever,
             buyType: this.buyType,
@@ -173,7 +174,7 @@
           // 市单价  股票买入卖出
           if (this.$route.query.is_zhishu == 0) {
             var opt = {
-              buyNum: this.leftform.buyNum * 100,
+              buyNum: this.leftform.buyNum,
               stockId: this.stockdetail.id,
               lever: this.leftform.lever,
               buyType: this.buyType,
@@ -190,7 +191,7 @@
           } else {
             // 市单价 指数买入卖出
             var opt = {
-              buyNum: this.leftform.buyNum * 100,
+              buyNum: this.leftform.buyNum,
               stockId: this.stockdetail.id,
               lever: this.leftform.lever,
               buyType: this.buyType,
@@ -217,6 +218,13 @@
         // }
         this.getuserSetting()
         this.getUserInfo();
+        this.getMoney()
+      },
+      async getMoney() {
+        let data = await api.getMoney();
+        if (data.status == 0) {
+          this.useritem = data.data;
+        }
       },
       async getUserInfo() {
         let data = await api.getUserInfo();
@@ -239,7 +247,7 @@
           };
           this.siteLeverList.push(item);
         }
-        this.leftform.buyNum = this.settingdetail.buyMinNum / 100;
+        this.leftform.buyNum = this.settingdetail.buyMinNum;
       },
       async getstockdetail() {
         var opt = {
diff --git a/src/pages/newindex/components/tixian.vue b/src/pages/newindex/components/tixian.vue
index 8ffb02d..d2c561c 100644
--- a/src/pages/newindex/components/tixian.vue
+++ b/src/pages/newindex/components/tixian.vue
@@ -10,9 +10,18 @@
                             </el-input>
                         </div>
                     </div>
+                    <div class="twoinput">
+                      <div class="tixianjine">
+                        <span class="tixianwz">{{$t('提款账户')}}:</span>
+                        <el-select v-model="payType" :placeholder="$t('提款账户')">
+                          <el-option v-for="item in optionsPay" :key="item.id" :label="item.channelName" :value="item.id">
+                          </el-option>
+                        </el-select>
+                      </div>
+                    </div>
                     <div class="keyong">
-                        <span class="keyong_left">{{$t('hj158')}}:¥{{ userData.enableAmt }}</span>
-                        <span class="keyong_right" @click="amount = userData.enableAmt">{{$t('alltx')}}</span>
+                        <span class="keyong_left">{{$t('hj158')}}:{{$route.query.type == 'US' ? '$' : '₹'}}{{ useritem[$route.query.type == 'US' ? '1' : '3'].availableBalance }}</span>
+                        <span class="keyong_right" @click="amount = useritem[$route.query.type == 'US' ? '1' : '3'].availableBalance">{{$t('alltx')}}</span>
                     </div>
                     <div class="buysellmain">
                         <div class="btns" @click="gettixian">
@@ -88,8 +97,12 @@
             userData: '', // 用户信息
             pageNum: 1,
             pageSize: 10,
+            payType:'',
+            assetsType:'IN',
+            optionsPay: [{channelName:this.$t('美股账户'),id:'US'},{channelName:this.$t('印股账户'),id:'IN'}],
             tixianlist: [],
             total: 0,
+            useritem:'',
         }
     },
     created() {
@@ -101,6 +114,13 @@
             this.getCardDetail();
             this.getuserSetting()
             this.getUserInfo();
+            this.getMoney()
+        },
+        async getMoney() {
+          let data = await api.getMoney();
+          if (data.status == 0) {
+            this.useritem = data.data;
+          }
         },
         handleSizeChange(size) {
             this.pageSize = size
@@ -167,6 +187,7 @@
                 return
             }
             var opt = {
+                assetsType:this.payType,
                 amt: this.amount,
             };
             let data = await api.outMoney(opt);
diff --git a/src/pages/newindex/hqchartdetail.vue b/src/pages/newindex/hqchartdetail.vue
index fbe920b..09cb964 100644
--- a/src/pages/newindex/hqchartdetail.vue
+++ b/src/pages/newindex/hqchartdetail.vue
@@ -73,7 +73,7 @@
                     title: this.$t('zx')
                 },
                 {
-                    title: this.$t('hj225')
+                    title: this.$t('hj225a')
                 },
                 {
                     title: this.$t('hj172')
diff --git a/src/pages/newindex/hushen.vue b/src/pages/newindex/hushen.vue
index 8dd0159..34cb93f 100644
--- a/src/pages/newindex/hushen.vue
+++ b/src/pages/newindex/hushen.vue
@@ -18,6 +18,7 @@
                         <template slot-scope="scope">
                             <span class="contents">
                                 {{ scope.row.name ? scope.row.name : '--' }}
+                                (<span style="color: red;">{{ scope.row.gid ? scope.row.gid : '--' }}</span>)
                             </span>
                         </template>
                     </el-table-column>
@@ -65,13 +66,13 @@
                     </el-table-column>
                     <el-table-column prop="preclose_px" :label="$t('hj74')">
                     </el-table-column>
-                    <el-table-column prop="business_balance" :label="$t('cje')" width="300">
+                   <!-- <el-table-column prop="business_balance" :label="$t('cje')" width="300">
                         <template slot-scope="scope">
                             <span class="contents blues">
                                 {{ scope.row.business_balance ? scope.row.business_balance : '--' }}
                             </span>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
                 <div id="menu">
                     <ul>
diff --git a/src/pages/newindex/meigu.vue b/src/pages/newindex/meigu.vue
index 9a95fd5..a1782c0 100644
--- a/src/pages/newindex/meigu.vue
+++ b/src/pages/newindex/meigu.vue
@@ -4,77 +4,84 @@
             <Newheader></Newheader>
             <div>
                 <el-table :data="zixuanlist" :highlight-current-row="false" border style="width: 100%"
-                    v-loading="loading" element-loading-spinner="el-icon-loading" @row-contextmenu="rightClick"
-                    element-loading-background="rgba(37,38,42, 0.8)" :height="tableHeight" @row-click="handleTableRow"
+                    :height="tableHeight" @row-click="handleTableRow" v-loading="loading" @row-contextmenu="rightClick"
+                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(37,38,42, 0.8)"
                     :header-cell-style="{ 'padding': '2px 0', 'background': 'rgb(37,38,42)', 'color': '#9d9d9d', 'font-size': '12px' }">
-                    <el-table-column prop="date" label="排序">
+                    <el-table-column prop="date" :label="$t('px')">
                         <template slot-scope="scope">
                             <span>
                                 {{ scope.$index + 1 }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="name" label="名称">
+                    <el-table-column prop="name" :label="$t('MingCheng')">
                         <template slot-scope="scope">
                             <span class="contents">
                                 {{ scope.row.name ? scope.row.name : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="code" label="代码">
+                    <el-table-column prop="code" :label="$t('dm')">
                         <template slot-scope="scope">
                             <span class="contents">
                                 {{ scope.row.code ? scope.row.code : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="hcrate" label="涨幅%">
+                    <el-table-column prop="hcrate" :label="$t('zf')">
                         <template slot-scope="scope">
                             <span class="contents" :class="scope.row.hcrate < 0 ? 'greens' : 'reds'">
                                 {{ scope.row.hcrate ? scope.row.hcrate + '%' : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="nowPrice" label="现价">
+                    <el-table-column prop="nowPrice" :label="$t('xj')">
                         <template slot-scope="scope">
                             <span class="contents" :class="scope.row.hcrate < 0 ? 'greens' : 'reds'">
                                 {{ scope.row.nowPrice ? scope.row.nowPrice : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="today_max" label="最高">
+                    <el-table-column prop="today_max" :label="$t('hj73')">
                         <template slot-scope="scope">
                             <span class="contents" :class="scope.row.hcrate < 0 ? 'greens' : 'reds'">
                                 {{ scope.row.today_max ? scope.row.today_max : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="today_min" label="最低">
+                    <el-table-column prop="today_min" :label="$t('hj75')">
                         <template slot-scope="scope">
                             <span class="contents" :class="scope.row.hcrate < 0 ? 'greens' : 'reds'">
                                 {{ scope.row.today_min ? scope.row.today_min : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="open_px" label="开盘">
+                    <el-table-column prop="open_px" :label="$t('kp')">
                         <template slot-scope="scope">
                             <span class="contents" :class="scope.row.hcrate < 0 ? 'greens' : 'reds'">
                                 {{ scope.row.open_px ? scope.row.open_px : '--' }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="preclose_px" label="昨收">
+                    <el-table-column prop="preclose_px" :label="$t('hj74')">
                     </el-table-column>
+                   <!-- <el-table-column prop="business_balance" :label="$t('cje')" width="300">
+                        <template slot-scope="scope">
+                            <span class="contents blues">
+                                {{ scope.row.business_balance ? scope.row.business_balance : '--' }}
+                            </span>
+                        </template>
+                    </el-table-column> -->
                 </el-table>
                 <div id="menu">
                     <ul>
-                        <li @click="getaddzixuan"><span>添加自选</span></li>
-                        <li @click="getdelzixuan"><span>删除自选</span></li>
-                        <li @click="handleTableRow(currentRow)"><span>交易</span></li>
+                        <li @click="getaddzixuan"><span>{{$t('djtjzx')}}</span></li>
+                        <li @click="getdelzixuan"><span>{{$t('djsczx')}}</span></li>
+                        <li @click="handleTableRow(currentRow)"><span>{{$t('hj225')}}</span></li>
                     </ul>
                 </div>
             </div>
-            <Newfooter></Newfooter>
+            <!-- <Newfooter></Newfooter> -->
             <div class="zhezhao" v-if="iszhezhao" @click="getmenuclose"></div>
         </div>
     </div>
@@ -144,12 +151,12 @@
             api.addOption({ code: this.currentRow.code }).then(res => {
                 if (res.status == 0) {
                     this.$message({
-                        message: '添加自选成功',
+                        message: this.$t('hj96'),
                         type: 'success'
                     });
                 } else {
                     this.$message({
-                        message: '添加自选失败',
+                        message: this.$t('tjzxsb'),
                         type: 'error'
                     });
                 }
@@ -160,12 +167,12 @@
             api.delOption({ code: this.currentRow.code }).then(res => {
                 if (res.status == 0) {
                     this.$message({
-                        message: '删除自选成功',
+                        message: this.$t('hj97'),
                         type: 'success'
                     });
                 } else {
                     this.$message({
-                        message: '删除自选失败',
+                        message: this.$t('sczxsb'),
                         type: 'error'
                     });
                 }
@@ -226,6 +233,11 @@
                     type: row.stock_type || ''
                 }
             })
+            const obj = {
+              pid: row.code || '',
+              type: row.stock_type || ''
+            }
+            window.localStorage.setItem('kLine', JSON.stringify(obj))
         }
     }
 }
diff --git a/src/router/index.js b/src/router/index.js
index d4ae3e2..27e19d7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -52,6 +52,7 @@
 import Meigu from '../pages/newindex/meigu'
 import Ganggu from '../pages/newindex/ganggu'
 import Newgu from '../pages/newindex/newgu'
+import Qualification from '../pages/newindex/Qualification'
 import Zhongzhuan from '../pages/newindex/zhongzhuan'
 import Dazongjiaoyi from "../pages/newindex/dazongjiaoyi"; // 大宗交易
 import Vipqiangchou from "../pages/newindex/vipqiangchou"; // vip抢筹
@@ -112,6 +113,12 @@
       component: Newgu
     },
     {
+      path: '/Qualification',
+      name: 'Qualification',
+      meta: { title: '资质'},
+      component: Qualification
+    },
+    {
       path: '/dazongjiaoyi',
       name: 'dazongjiaoyi',
       meta: { title: '大宗交易'},
diff --git a/static/img/img_log_home.png b/static/img/img_log_home.png
index f328d09..59b8102 100644
--- a/static/img/img_log_home.png
+++ b/static/img/img_log_home.png
Binary files differ

--
Gitblit v1.9.3