From d7fea093eb9732ea4a5fcfba21fe3e119f72cdb0 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Tue, 19 Dec 2023 15:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popup/popup.vue | 47 +++++++++++++++++++++++---------------
 pages/reg/reg.vue          | 22 +++++++++++-------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 9b27a80..97091ab 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -8,26 +8,37 @@
 <script>
 	export default {
 		name:"popup",
-		emits:["open","close"],
-		props:{
-			// 需要打开的地址
-			popurl:{
-				Type:String,
-				default:"",
-			},
-			isshow:{
-				Type:Boolean,
-				defult:false
+		data(){
+			return{
+				popurl:''
 			}
-			
-		},
-		watch:{
-		  popurl(e){
-			  console.log("popup e",e)
-			  let that = this
-			  return that.popurl = e
-		  }
 		},
+		// emits:["open","close"],
+		// props:{
+		// 	// 需要打开的地址
+		// 	popurl:{
+		// 		Type:String,
+		// 		default:"",
+		// 	},
+		// 	isshow:{
+		// 		Type:Boolean,
+		// 		defult:false
+		// 	}
+			
+		// },
+		// watch:{
+		//   popurl(e){
+		// 	  console.log("popup e",e)
+		// 	  let that = this
+		// 	  return that.popurl = e
+		//   }
+		// },
+		onLoad(e) {
+			if(e){
+				this.popurl =e
+			}
+			
+		}
 		// created(e) {
 		// 	console.log("popup",e)
 		// 	//this.popurl =
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
index d3749e8..0a6782c 100644
--- a/pages/reg/reg.vue
+++ b/pages/reg/reg.vue
@@ -24,7 +24,7 @@
 	  </view>
 	  <!-- 重复密码 -->
 	  <view class="form-item">
-		  <input class="form-item--input" type="password" v-model="vpass" autocomplete="off" placeholder="再次请输入密码" />
+		  <input class="form-item--input" type="password" v-model="repass" autocomplete="off" placeholder="再次请输入密码" />
 	  </view>
 
 	<!-- 隐私政策等 -->
@@ -81,6 +81,8 @@
         mobile: '',
 		// 密码
 		vpass:"",
+		// 重复密码
+		repass:"",
 		// 阅读标志
 		isTick:false,
 		// user type
@@ -93,13 +95,6 @@
       }
     },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    created() {
-      console.log('main created')
-    },
-
     methods: {
 
 	  // 账户类型
@@ -119,6 +114,16 @@
 		   this.isTick=!this.isTick
 	   },
 	   
+	   // 判读两次密码是否相同
+	   chkpass(){
+		   let that  = this
+		   if (that.vpass != that.repass){
+			   this.$toast('两次输入的密码不一样')
+			   return false
+		   }
+		   return ture;
+	   },
+	   
       // 表单验证
       formValidation() {
         const app = this
@@ -223,6 +228,7 @@
 		  // 弹框显示
 		  let xurl="pages/help/"+e
 		  this.$navTo(xurl)
+		  // this.$navTo("pages/");
 	  },
 
     }