2022.3.9 文档修改

src/components/CommonHeader.vue

@@ -123,7 +123,8 @@
                                             <a href="#/profile/certification">{{$t('common.goTo')}}</a>
                                         </p>
                                         <div class="email text-muted mb-3">
-                                            <router-link to="/profile/index">{{signed.account}}</router-link>
+                                            <router-link to="/profile/index">{{userInfo.account}}</router-link>
+                                            <!-- <router-link to="/profile/index">{{signed.account}}</router-link> -->
                                             <!-- <div>UID:{{signed.user_id}}</div> -->
                                         </div>
                                     </div>

src/i18n/cn.json

@@ -908,7 +908,8 @@
         "k8": "请先登录进行申购",
         "k9":"请输入认购码",
         "l1":"涨幅比例",
-        "l2":"保证金"
+        "l2":"保证金",
+        "l3":"倍"
     },
     "otc": {
         "a0": "请选择交易类型",

src/views/contract/account.vue

@@ -20,26 +20,26 @@
                     <div>{{$t('contract.a3')}}（USDT）</div>
                     <div>{{accountInfo.usable_balance}}</div>
                 </div>
-        <div class="d-flex p-3 justify-content-between">
+                <!-- <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a4')}}（USDT）</div>
                     <div>{{accountInfo.position_margin}}</div>
-        </div>
-        <div class="d-flex p-3 justify-content-between">
+                </div> -->
+                <!-- <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a5')}}（USDT）</div>
                     <div>{{accountInfo.freeze_position}}</div>
                 </div>
                 <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a6')}}（USDT）</div>
                     <div class="increace">{{accountInfo.unRealProfit}}</div>
-        </div>
+                </div> -->
                 <div class="d-flex p-3 justify-content-between">
                     <div>{{$t('contract.a7')}}（USDT）</div>
                     <div class="decreace">{{ accountInfo.riskRate || "0%" }}</div>
                 </div>
-        <div class="d-flex p-3 justify-content-between" v-if="false">
+                <!-- <div class="d-flex p-3 justify-content-between" v-if="false">
                     <div>{{$t('contract.a8')}}（USDT）</div>
                     <div>{{ accountInfo.flatPrice || "--" }}</div>
-        </div>
+                </div> -->
             </div>
         </div>
     </div>

src/views/contract/exchange-store.vue

@@ -412,10 +412,12 @@ export default {
             : `${this.$t("contract.d6")}${this.form.amount}${this.$t(
                 "contract.e2"
                 )}`;
+            //  `${this.$t("contract.f3")}${typeStr}${this.form.lever_rate}${this.$t(
+            // "contract.f4"
+            // )}${decStr}?`
         this.$confirm(
-        `${this.$t("contract.f3")}${typeStr}${this.form.lever_rate}${this.$t(
-          "contract.f4"
-        )}${decStr}?`
+            `${this.$t("contract.f3")}${typeStr}${this.form.lever_rate}
+            ${this.$t("contract.f4")}${this.$t("contract.d5")}?`
         )
             .then(res => {
             if (this.tab == 1) {

src/views/contract/history-commission.vue

@@ -12,9 +12,9 @@
                 <th>{{$t('contract.b7')}}</th>
                 <th>{{$t('contract.b8')}}</th>
                 <th>{{$t('contract.j0')}}</th>
-          <th>{{$t('contract.k1')}}</th>
+                <!-- <th>{{$t('contract.k1')}}</th> -->
                 <th>{{$t('contract.b9')}}</th>
-          <th>{{$t('contract.c0')}}</th>
+                <!-- <th>{{$t('contract.c0')}}</th> -->
             </tr>
         </thead>
         <tbody>
@@ -30,15 +30,15 @@
                 <td>
                     {{item.profit||'--'}}
                 </td>
-          <td>
+                <!-- <td>
                     {{item.settle_profit||'--'}}
-          </td>
+                </td> -->
                 <td>{{ status(item.status) }}</td>
-          <td>
+                <!-- <td>
                     <button class="btn btn-sm btn-primary" @click="showDetail(item)">
                     {{$t('contract.g4')}}
                     </button>
-          </td>
+                </td> -->
             </tr>
             <tr v-if="!list.length">
                 <td colspan="12">

src/views/contract/hold-position.vue

@@ -23,13 +23,13 @@
       <thead>
         <tr>
             <th>{{ $t("contract.a9") }}</th>
+            <th>{{ $t("contract.b7") }}</th>
             <th>{{ $t("contract.b0") }}</th>
-          <th>{{ $t("contract.g7") }}</th>
+            <!-- <th>{{ $t("contract.g7") }}</th> -->
             <!-- <th>{{ $t("contract.g7") }}（{{ $t("contract.e2") }}）</th> -->
             <th>{{ $t("contract.i3") }}</th>
             <!-- <th>{{ $t("contract.g8") }}（{{ $t("contract.e2") }}）</th>
             <th>{{ $t("contract.a5") }}（{{ $t("contract.e2") }}）</th> -->
-          <th>{{ $t("contract.b7") }}</th>
             <th>{{ $t("contract.g9") }}</th>
             <th>{{ $t("contract.g3") }}</th>
             <th>{{ $t("contract.a8") }}</th>
@@ -42,12 +42,12 @@
       <tbody>
         <tr v-for="(item,index) in showList" :key="item.id" @click="getactiveItem(index)">
             <td>{{ item.pair_name }}</td>
+            <td>{{ item.position_margin }}</td>
             <td>{{ item.lever_rate }}X</td>
-          <td>{{ item.hold_position }}</td>
+            <!-- <td>{{ item.hold_position }}</td> -->
             <td>{{ item.side == 1 ? $t("contract.i4") : $t("contract.i5") }}</td>
             <!-- <td>{{ item.avail_position }}</td>
             <td>{{ item.freeze_position }}</td> -->
-          <td>{{ item.position_margin }}</td>
             <td>{{ item.avg_price * 1 }}</td>
             <td>{{ item.realtimePrice }}</td>
             <td>{{ item.flatPrice }}</td>

src/views/contract/index.vue

@@ -45,11 +45,12 @@
                         </tr>
                       </thead>
                       <tbody>
+                          <!-- @click="activeSymbol = item.symbol" -->
                         <tr
                           v-for="item in parent.marketInfoList"
                           :key="item.symbol"
                           :class="{ active: item.symbol == activeSymbol }"
-                          @click="activeSymbol = item.symbol"
+                          @click="ispopover1(item.symbol)"
                         >
                           <td class="w-10/24">
                             {{ item.symbol }}/{{ parent.coin_name }}
@@ -225,7 +226,7 @@ export default {
       _time: null,
       contractOpen: false,
       contractAgreement: {},
-      symbolDetail:{}
+      symbolDetail:{},
     };
   },
   computed: {
@@ -270,6 +271,10 @@ export default {
       }, 3000)
   },
   methods: {
+    ispopover1(item){
+        this.activeSymbol=item;
+        this.$refs.popover.showPopper = false;
+    },
     swapMarketList() {
       let msg = "swapMarketList";
       this.ws.send({

src/views/contract/page-bottom.vue

@@ -11,9 +11,9 @@
             <div class="nav-item">
                 <a class="nav-link" :class="{ active: tab == 3 }" @click="tab = 3">{{$t('contract.i2')}}</a>
             </div>
-        <div class="nav-item">
+            <!-- <div class="nav-item">
                 <a class="nav-link" :class="{ active: tab == 4 }" @click="tab = 4">{{$t('wallet.contractFlow')}}（{{symbol}}）</a>
-        </div>
+            </div> -->
         </div>
     <div class="body">
         <!-- 持有仓位 -->

src/views/option/kline.vue

@@ -118,7 +118,7 @@ data() {
         onLoadedCallback: undefined,
         onRealtimeCallback: undefined,
         // timer: "15",
-        timer: "1",
+        timer: "5",
         sub: "",
         isCreateSocket: false,
         page: {},
@@ -418,12 +418,12 @@ methods: {
             buttonArr.forEach((v, i) => {
                 let button = widget.createButton();
                 button.attr("title", v.title).addClass("my-date").text(v.title);
-                if (v.resolution === "1") {
+                if (v.resolution === _this.timer) {
                     button.css({
                         color: "#5786d2",
                         "border-bottom": "1px solid #5786d2",
                     });
-                localStorage.setItem("tim", "1");
+                    // localStorage.setItem("tim", v.resolution);
                 }
                 btn = button.on("click", function (e) {
                     $(this).parents(".left").children().find(".my-date").removeAttr("style");
@@ -433,6 +433,7 @@ methods: {
                         "border-bottom": "1px solid #5786d2",
                     });
                     // _this.$store.commit("upType", v.type);
+                    localStorage.setItem("tim", v.resolution);
                     widget.chart().setChartType(v.chartType); //改变K线类型
                 });
             });
@@ -482,6 +483,12 @@ methods: {
         
     },
   },
+    created(){
+        let tim=localStorage.getItem("tim");
+        if(tim){
+            this.timer=tim
+        }
+    },
   mounted() {
     this.initView();
   },

src/views/profile/certification.vue

@@ -336,7 +336,7 @@ export default {
             this.countryList = res;
             for(let i=0; i<this.countryList.length;i++){
                 let item=this.countryList[i];
-                if(item.country_code=="1"){
+                if(item.id==195){
                     this.form.country_id = item.id;
                     break;
                 }

src/views/setting/index.vue

@@ -16,7 +16,7 @@
                     </div>
                 </div>
                 <!-- 交易密码 -->
-                <div class="col-md-6 d-flex">
+                <!-- <div class="col-md-6 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
                         <div class="heading">{{$t('setting.transactionPassword')}}</div>
                         <div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start">
@@ -26,9 +26,9 @@
                             <button class="btn btn-primary btn-sm" @click="transShow=true" v-else>{{$t('setting.safeSetting')}}</button>
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <!-- Google验证 -->
-                <div class="col-md-4 d-flex">
+                <!-- <div class="col-md-4 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
                         <div class="heading">Google {{$t('setting.verCode')}}</div>
                         <div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start">
@@ -48,9 +48,9 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <!-- 短信验证 -->
-                <div class="col-md-4 d-flex">
+                <!-- <div class="col-md-4 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">
                         <div class="heading">SMS {{$t('setting.smsVer')}}</div>
                         <div class="tab-content flex-fill d-flex flex-column justify-content-between align-items-start">
@@ -71,7 +71,7 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <!-- 邮箱验证 -->
                 <div class="col-md-4 d-flex">
                     <div class="panel-box bg-panel shadow-sm mb-4 w-100 d-flex flex-column">

src/views/wallet/exchange-assets.vue

@@ -312,18 +312,18 @@
                   <div class="col-md-6">
                     <form action class="withdraw-body">
                       <template v-if="withdrawCoin =='USDT'">
-                        <div class="form-check form-check-inline">
+                        <!-- <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-omni" v-model="withdraw.addressType" value="1" />
                             <label class="form-check-label" for="withdraw-omni">OMNI</label>
+                        </div> -->
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-trc20" v-model="withdraw.addressType" value="3" />
+                            <label class="form-check-label" for="withdraw-trc20">TRC20</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-erc20" v-model="withdraw.addressType" value="2" />
                             <label class="form-check-label" for="withdraw-erc20">ERC20</label>
                         </div>
-                        <div class="form-check form-check-inline">
-                          <input class="form-check-input" type="radio" name="withdraw-address-type" id="withdraw-trc20" v-model="withdraw.addressType" value="3" />
-                          <label class="form-check-label" for="withdraw-trc20">TRC20</label>
-                        </div>
                       </template>
                       <div class="form-group mt-2">
                         <label class="d-flex justify-content-between" for="formGroupExampleInput">
@@ -431,7 +431,7 @@ export default {
             coin_id: "",
             amount: "",
             address: "",
-            addressType: 1, // 默认提币类型 1 为 omni； 2 为 erc20,
+            addressType: 3, // 默认提币类型 1 为 omni； 2 为 erc20,
             code_type: 1,
             code: ''
         },

src/views/wallet/funding.vue

@@ -16,9 +16,9 @@
                             <li class="nav-item fn-16">
                                 <a class="nav-link " data-toggle="pill" href="#withdrawal" role="tab" aria-selected="false" @click="currentTab = 'withdrawal'">{{$t('wallet.withdrawalRecord')}}</a>
                             </li>
-                            <li class="nav-item fn-16">
+                            <!-- <li class="nav-item fn-16">
                                 <a class="nav-link " data-toggle="pill" href="#paypal" role="tab" aria-selected="false" @click="currentTab = 'paypal'">Paypal{{$t('wallet.rechargeRecord')}}</a>
-                            </li>
+                            </li> -->
                         </ul>
                         <div class="row pt-3">
                             <div class="form-group col-sm-3">