文档7.18

i18n/lang/en.json

@@ -196,7 +196,7 @@
     "a0": "Identity Authentication",
     "a1": "Real-name authentication",
     "a2": "Uncertified",
-    "a3": "Authenticated",
+    "a3": "Verifide",
     "a4": "Advanced Certification",
     "a5": "Under review",
     "a6": "Authentication failed",
@@ -542,7 +542,7 @@
     "c9": "Delegation Details",
     "d0": "No data yet",
     "d1": "Price",
-    "d2": "Quantity",
+    "d2": "Amount",
     "d3": "Deal time",
     "d4": "Account Equity",
     "d5": "Unrealized profit and loss",
@@ -730,7 +730,7 @@
   },
   "first":{
       "a0":"Go to real name",
-      "a1":"About us",
+      "a1":"Contact Us",
       "a2":"Welcome!",
       "a3":"TP/SL for position",
       "a4":"Trade at current latest price",

layout/vDropdwon.vue

@@ -65,8 +65,8 @@ export default {
 	},
     mounted() {
         if(this.contract==1&&this.list){
-            // this.text=this.list[2].label
-			this.text=this.list[0].label
+            this.text=this.list[1].label
+			// this.text=this.list[0].label
         }else if(this.contract==0&&this.list){
             this.text=this.list[0].label 
         }

pages/assets/recharge.vue

@@ -31,20 +31,21 @@
                     size="mini"
                     @click="changeRechargeType(1)"
                   >OMNI</view> -->
-				  <view class="rounded-xs p-x-lg p-y-ms"
-				    size="mini"
-				    @click="changeRechargeType(3)"
-				    :class="rechargeType==3?'bor-active':'bg-panel-3 border'"
-				  >TRC20</view>
+				  
                   <view class="rounded-xs p-x-lg p-y-ms m-r-md"
                     size="mini"
                     @click="changeRechargeType(2)"
                     :class="rechargeType==2?'bor-active':'bg-panel-3 border'"
                   >ERC20</view>
+									<view class="rounded-xs p-x-lg p-y-ms"
+									  size="mini"
+									  @click="changeRechargeType(3)"
+									  :class="rechargeType==3?'bor-active':'bg-panel-3 border'"
+									>TRC20</view>
                   
                 </view>
               </view>
-              <view class="color-sell fn-12 p-x-lg">{{$t('recharge.a1')}}<span v-if="coin=='USDT'">{{text}}</span> {{coin}}.{{$t('recharge.a2')}}</view>
+              <view class="color-sell fn-12 p-x-lg">{{$t('recharge.a1')}} <span v-html="'&nbsp;'"><span v-if="coin=='USDT'"> {{text }} </span></span>{{coin}}.{{$t('recharge.a2')}}</view>
               <view class="p-t-md  p-b-md ">
                 <view class="fn-center">
                   <v-qr v-if="form.address" class="qr-box" :text="form.address||' '"></v-qr>
@@ -142,7 +143,7 @@ export default {
     return {
       coinListShow: false,
       coin: "",
-      rechargeType: 3,
+      rechargeType: 2,
       address: "",
       form: {
         coin_id: "",
@@ -177,7 +178,7 @@ export default {
         if (this.coin != "USDT") {
           this.rechargeType = 1;
         }else{
-			this.rechargeType = 3;
+			this.rechargeType = 2;
 		}
         this.walletImage();
       }

pages/auth/index.vue

@@ -2,7 +2,7 @@
     <view class="layout-page" :style="themeStyle">
         <v-header :title="$t('auth.a0')" :leftClick="leftClick"></v-header>
         <view class="rounded-md overflow-hidden m-lg bg-panel-3 box-shadow">
-            <v-link  to="/pages/auth/primary" class="d-flex align-center p-md  border-b link-active ">
+            <v-link  :to="detail.primary_status==0?'/pages/auth/primary':''" class="d-flex align-center p-md  border-b link-active ">
                 <view class="flex-fill color-light fn-lg">
                     {{$t('auth.a1')}}
                 </view>

pages/auth/primary.vue

@@ -72,9 +72,9 @@ export default {
     getCountryCode() {
       Member.getCountryCode()
         .then((res) => {
-			// console.info(res)
+					console.info(res)
           this.countryList = res.data;
-          this.form.country_id = this.countryList[0].id;
+          this.form.country_id = this.countryList[res.data.length-1].id;
         })
         .catch(() => {});
     },

pages/base/mine.vue

@@ -19,7 +19,7 @@
           <text class="fn-sm m-l-md w-max"
             >
 				<!-- ≈{{ filterMoney(account.total_assets_usd) }} USD -->
-				≈{{ filterMoney(account.total_assets_usd,false) }} USD
+				≈{{ filterMoney(account.total_assets_usd,false) }} USDT
 			</text>
         </view>
         

pages/exchange/open-position.vue

@@ -123,8 +123,8 @@
 				<!-- :placeholder="$t('contract.d2')"
 				v-model="form.amount" -->
               <v-input 
-                :placeholder="$t('common.c4')"
-                v-model="margin"
+                v-model="form.amount" 
+								:placeholder="$t('contract.d2')"
                 @input="sliderActive=-1"
                 class="h-30 p-x-sm p-y-xxs rounded bg-form-panel-3"
               >
@@ -261,12 +261,12 @@
               </view>
               <view class="fn-sm m-t-xs d-flex justify-between">
                 <view class="">
-                    <!-- {{ $t("common.c4") }} -->
-					{{ $t('contract.d2') }}
+                    {{ $t("common.c4") }}
+					<!-- {{ $t('contract.d2') }} -->
                 </view>
                 <view class="">
-                    <!-- {{ margin }} USDT -->
-					{{amount}}
+                    {{ margin }} USDT
+					<!-- {{amount}} -->
                 </view>
               </view>
             </view>

pages/reg/index.vue

@@ -201,24 +201,24 @@ export default {
               return false
           }
         // #ifdef H5
-        this.$dialog.confirm({
-           title: this.$t("common.tips"),
-           // message: this.$t('common.toDwon'),
-					 message: this.$t('common.toDwon1'),
-		   confirmButtonText:  this.$t("common.confirm"), //改变确认按钮上显示的文字
-		   cancelButtonText: this.$t("common.cancel"),
-           cancel:true
-         })
-         .then(() => {
-           // window.open(app.down, "_blank ");
-					 this.login()
-         }).catch(()=>{
-           if (this.query.from) {
-          this.$back();
-          } else {
+     //    this.$dialog.confirm({
+     //       title: this.$t("common.tips"),
+     //       // message: this.$t('common.toDwon'),
+					//  message: this.$t('common.toDwon1'),
+		   // confirmButtonText:  this.$t("common.confirm"), //改变确认按钮上显示的文字
+		   // cancelButtonText: this.$t("common.cancel"),
+     //       cancel:true
+     //     })
+     //     .then(() => {
+     //       // window.open(app.down, "_blank ");
+					//  this.login()
+     //     }).catch(()=>{
+     //       if (this.query.from) {
+     //      this.$back();
+     //      } else {
             this._router.replace("/pages/login/index");
-          }
-         });
+          // }
+         // });
         // #endif
         // #ifdef APP-PLUS
           if (this.query.from) {