From 9ebc4e06922cb7884da137d6198e9ee211c405cf Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 28 Jun 2022 17:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeApplication/proposerLite.vue          | 48 ++++++++--------
 src/views/zjdLogin.vue                        | 57 +++++++++++++++++++
 2 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 4f4e7774..b5a31431 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -2292,29 +2292,31 @@ export default {
     },
     //是否有宅基地选项改变
     existHomesteadChange(name){
-      if (name == 'Y'){
-        if (!this.applicationDetail.tHouseApplyCurrentSituation){
-          //现宅基地情况
-          this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', {
-            //宅基地面积
-            landArea: null,
-            //人均宅基地面积
-            landPerArea: null,
-            //不动产单元号
-            landCertificateNo: null,
-            //农民房屋幢号
-            houseCertificateNo: null,
-            //建筑面积
-            buildingArea: null,
-            //人均建筑面积
-            buildingPerArea: null,
-            //现宅基地处置情况 字典 land_isposal
-            landIsposal: null
-          });
-        }
-      }
-      else
-        this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', null);
+      console.log(name);
+      this.applicationDetail.tHouseApplyProposedSituation.isAdvice =name;
+      // if (name == 'Y'){
+      //   if (!this.applicationDetail.tHouseApplyCurrentSituation){
+      //     //现宅基地情况
+      //     this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', {
+      //       //宅基地面积
+      //       landArea: null,
+      //       //人均宅基地面积
+      //       landPerArea: null,
+      //       //不动产单元号
+      //       landCertificateNo: null,
+      //       //农民房屋幢号
+      //       houseCertificateNo: null,
+      //       //建筑面积
+      //       buildingArea: null,
+      //       //人均建筑面积
+      //       buildingPerArea: null,
+      //       //现宅基地处置情况 字典 land_isposal
+      //       landIsposal: null
+      //     });
+      //   }
+      // }
+      // else
+      //   this.$set(this.applicationDetail, 'tHouseApplyCurrentSituation', null);
     },
     //添加家庭成员
     addFamily(){
diff --git a/src/views/zjdLogin.vue b/src/views/zjdLogin.vue
index cc7fc5c2..37973444 100644
--- a/src/views/zjdLogin.vue
+++ b/src/views/zjdLogin.vue
@@ -5,6 +5,8 @@
       <p class="logoFont">宅基地管理</p>
     </div>
     <div style="margin-top:0.5rem;padding:0 10px;">
+      <van-tabs v-model="active" :swipeable="true" style="margin-top:0.5rem;padding:0 10px;">
+        <van-tab title="登录" name="1">
       <van-form style="margin:50px 0;" >
         <van-field
           v-model="formData.username"
@@ -37,6 +39,61 @@
           <van-button block type="info" native-type="submit" @click="handleLogin">登录</van-button>
         </div>
       </van-form>
+        </van-tab>
+        <van-tab title="注册" name="2">
+          <van-form style="margin:50px 0;">
+            <van-field
+              v-model="formData.memberName"
+              name="请输入姓名"
+              placeholder="请输入姓名"
+              :rules="[{ required: true, message: '请填写姓名' }]"
+            />
+            <van-field
+              v-model="formData.idcard"
+              name="请输入身份证号"
+              style="margin-top: 20px"
+              placeholder="请输入身份证号"
+              :rules="[{ required: true, message: '请输入身份证号' }]"
+            />
+            <van-field
+              v-model="formData.mobile"
+              name="请输入手机号"
+              style="margin-top: 20px"
+              placeholder="请输入手机号"
+              :rules="[{ required: true, message: '请填写手机号' }]"
+            />
+            <van-field
+              v-model="formData.code"
+              center
+              clearable
+              label="验证码"
+              placeholder="图形验证码"
+            >
+              <template #button>
+                <img style="width: 100px" :src="codeUrl" @click="getCode" />
+              </template>
+            </van-field>
+            <van-field
+              v-model="formData.smsCode"
+              style="margin-top: 20px"
+              placeholder="请输入验证码"
+              :rules="[{ required: true, message: '请填写验证码' }]"
+            >
+              <template #button>
+                <!-- <van-button size="mini" type="info" @click="getRegisterSmsCode" >获取验证码</van-button> -->
+                <div  class="registerSmsBtn" @click="getRegisterSmsCode">{{
+                  computeTime > 0 ? `(${computeTime}s)已发送` : "获取短信码"
+                  }}</div>
+
+
+              </template>
+            </van-field>
+            <div style="margin: 50px 16px 16px;">
+              <van-button block type="info" native-type="submit" @click="registerSubmit">注册</van-button>
+            </div>
+          </van-form>
+        </van-tab>
+      </van-tabs>
     </div>
     <van-popup v-model="showKeyboard" :style="{ height: '100%',width:'100%' }" >
       <van-nav-bar