From ab27a9cc3ef00e45ec368adc4b8eae148e510152 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Wed, 20 Dec 2023 11:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BC=B9=E6=A1=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popup/popup.vue | 26 +++++++++++++++-----------
 pages/reg/reg.vue          | 15 +++++----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 0affca1..8f0e2f4 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -1,14 +1,12 @@
 <template>
-	<view class="popup" catchtouchmove="true" :class="getValue()? 'show' : 'none'"
-    @touchmove.stop.prevent="moveHandle" @click.stop="stop">
+	<view class="popup" catchtouchmove="true" :class="getValue()? 'show' : 'none'" @click.stop="stop" @touchmove.stop.prevent="moveHandle">
 		<!-- 背景底色 -->
 		<view class="mask" @click="close('mask')"></view>
 		<view class="layer attr-content">
 			<view class="specification-wrapper">
 				<scroll-view class="specification-wrapper-content" scroll-y="true">
 					<view>{{popurl}}隆福大厦哦哦浪费到到啦f佛发大水了佛</view>
-					
-					<web-view src="http://localhost:8080/#/pages/help/private"></web-view>
+					<router-view></router-view>
 				</scroll-view>
 				<!-- 关闭按钮 -->
 				<view class="close" @click="close('close')" v-if="showClose != false">
@@ -82,8 +80,10 @@
 		mounted() {},
 		methods: {
 			open(e) {
-				console.log("zujian popup open",e)
+				//
 			},
+			// 用于阻止冒泡
+			stop() {},
 			moveHandle() {
 			  //禁止父元素滑动
 			},
@@ -187,10 +187,11 @@
 	    padding: 30rpx 25rpx;
 	    box-sizing: border-box;
 	  
-	    .specification-wrapper-content {
+	    .specification-wrapper-content 
+		{
 	      width: 100%;
 	      max-height: 900rpx;
-	      min-height: 300rpx;
+	      min-height: 400rpx;
 	  
 	      &::-webkit-scrollbar {
 	        /*隐藏滚轮*/
@@ -221,14 +222,17 @@
 	  
 	    .close {
 	      position: absolute;
-	      top: 30rpx;
+	      top: -30rpx;
 	      right: 25rpx;
-	      width: 50rpx;
-	      height: 50rpx;
+	      width: 60rpx;
+	      height: 60rpx;
 	      text-align: center;
-	      line-height: 50rpx;
+	      line-height: 60rpx;
+		  background-color: #fff;
+		  border-radius: 50%;
 	  
 	      .close-item {
+			margin: 10rpx;
 	        width: 40rpx;
 	        height: 40rpx;
 	      }
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
index cd4f976..4ece747 100644
--- a/pages/reg/reg.vue
+++ b/pages/reg/reg.vue
@@ -50,7 +50,7 @@
 	</view>
 	
 	<!-- 弹框 -->
-	<popup v-model="showPopup" :maskCloseAble="true"></popup>
+	<popup v-model="showPopup" :maskCloseAble="true" :popurl="murl"></popup>
 	
 	<!-- <whpop></whpop> -->
 
@@ -225,16 +225,11 @@
 	  },
 	  // 阅读了政策协议
 	  viewdoc(e){
-		  this.$toast(e)
-		  this.showPopup = ! this.showPopup
 		  // 弹框显示
-		  // let xurl="pages/help/"+e
-		  // this.$navTo(xurl)
-		  // console.log(xurl)
-		  // this.murl= xurl;
-		  // this.$emit("open")
-		  
-		  // this.$navTo("pages/");
+		  let xurl="pages/help/"+e
+		  this.murl= xurl;
+		  // this.$toast(e)
+		  this.showPopup = ! this.showPopup
 	  },
 	  //
 	  openPop(e){