From 71e646d00526416df54e213b5d026d265a07fcca Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Wed, 6 Sep 2023 18:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E5=B8=81=E3=80=81?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/assets/draw.vue | 21 ++++++++++++++++++---
 pages/reg/index.vue   | 18 +++++++++++-------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/pages/assets/draw.vue b/pages/assets/draw.vue
index 35c0493..9cf5672 100644
--- a/pages/assets/draw.vue
+++ b/pages/assets/draw.vue
@@ -15,7 +15,7 @@
                 {{$t('recharge.a0')}}<van-icon name="arrow" />
               </view>
             </view>
-            <view class="bg-panel-3" style="height: 100%;">
+            <view class="bg-panel-3" style="min-height: 100%; padding-bottom: 220rpx;">
                 <view class="">
                     <view
                       class="d-flex flex-wrap justify-between align-center p-x-lg p-y-ms color-light"
@@ -92,6 +92,16 @@
                             </template>
                         </v-input>
                     </view>
+										<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
+											<span>{{ $t("reg.a8") }}：</span>
+											<!-- <span class="color-light">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
+										</view>
+										<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-y-sm">
+
+											<v-input type="password" v-model="form.password" class="p-x-ms color-light w-max fn-13 rounded-xs" :placeholder="$t('reg.a9')">
+
+											</v-input>
+										</view>
                 </view>
                 <view class="form bg-panel-3 p-x-lg p-y-md">
                     <ul class="fn-md rounded-md m-y-xs line-height-2">
@@ -194,7 +204,8 @@ export default {
                 address: "",
                 addressType: "",
                 code_type: 1,
-                code: ''
+                code: '',
+								password: ''
             },
             withdrawFee: {},
             list: [],
@@ -269,9 +280,13 @@ export default {
                 this.$toast(this.$t('assets.c2'))
                 return
             }
+            if(!this.form.password){
+                this.$toast(this.$t('reg.a9'))
+                return
+            }
             let data = this.withdrawFee
             if (data.withdraw_switch == 1) {
-				this.secondaryShow = true
+								this.secondaryShow = true
                 if (data.google_status == 1) {
                     this.form.code_type = 3;
                 } else if (data.phone_status == 1) {
diff --git a/pages/reg/index.vue b/pages/reg/index.vue
index 006d6ab..c9a4870 100644
--- a/pages/reg/index.vue
+++ b/pages/reg/index.vue
@@ -113,7 +113,7 @@
 		  <view class="label m-b-xs">{{$t('reg.c6')}}</view>
 		  <v-input class="color-light" v-model="form.invitationCode" type="password" :placeholder="$t('reg.c7')"></v-input>
 		</view> -->
-        <view class="form-item border-b m-b-md p-b-xs" v-if="0">
+        <view class="form-item border-b m-b-md p-b-xs" v-if="showInvite_code">
           <view class="label m-b-xs">{{$t('reg.c6')}}</view>
           <!-- <v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}（${$t('reg.b4')}）`"></v-input> -->
 					<v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}`"></v-input>
@@ -162,7 +162,8 @@ export default {
       },
       check: false,
       agreement: {},
-      country_code:''
+      country_code:'',
+			showInvite_code: true,
     };
 
   },
@@ -187,10 +188,10 @@ export default {
         }
         return;
       }
-	  // if (!this.form.invite_code) {
-	  //   this.$toast(this.$t('reg.c7'));
-	  //   return;
-	  // }
+			if (!this.form.invite_code) {
+				this.$toast(this.$t('reg.c7'));
+				return;
+			}
       this.form.type=this.form.type
       this.form.country_code = this.country_code || 86;
 
@@ -259,7 +260,10 @@ export default {
   },
   onLoad(query){
     this.query = query
-    this.form.invite_code = this.query.invite_code||this.form.invite_code
+    this.form.invite_code = this.query.invite_code||this.form.invite_code;
+		if(this.query.invite_code){
+			this.showInvite_code = false;
+		}
   },
   created() {
     this.clause();