弹窗修改

pages-activity/noAuthority.vue

@@ -7,6 +7,18 @@
       <view class="global-btn-yellow-change btn" @click="handleContact" v-if="info.type=='contact'">联系销售</view>
       <view class="global-btn-yellow-change btn" @click="handleGoApply" v-else>立即申请</view>
       <view class="global-btn-yellow-plain btn" @click="handleBack">返回</view>
+
+      <!-- 弹窗 -->
+        <van-popup :show="pupData.show" @close="pupData.show=false">
+            <view class="global-pup">
+                <view class="content">
+                    <rich-text :nodes="pupData.content"></rich-text>
+                </view>
+                <view class="flex bot">
+                    <view @click="pupData.show=false">知道了</view>
+                </view>
+            </view>
+        </van-popup>
   </view>
 </template>
 
@@ -16,7 +28,11 @@ export default {
     name:"noAuthority",
     data () {
         return {
-            info:{}
+            info:{},
+            pupData:{
+				show:false,
+				content:'',//弹窗html字符串
+			}
         }
     },
     onLoad(options){
@@ -26,9 +42,11 @@ export default {
         async handleGoApply(){
             if(this.info.type=='apply'){
                 if(this.info.customer_info.has_apply){// 已经申请过
-                    uni.redirectTo({
-                        url:"/pages-applyPermission/applyResult"
-                    })
+                    this.pupData.show=true
+					this.pupData.content=`<p style="padding-top:20px">您已提交过申请，请耐心等待</p>`
+                    // uni.redirectTo({
+                    //     url:"/pages-applyPermission/applyResult"
+                    // })
                 }else{
                     if(!this.info.customer_info.status||this.info.customer_info.status!='流失'){
                         uni.redirectTo({
@@ -40,9 +58,11 @@ export default {
                             real_name:this.info.customer_info.name,
                         })
                         if(res.code===200){
-                            uni.redirectTo({
-                                url:"/pages-applyPermission/applyResult"
-                            })
+                            this.pupData.show=true
+					        this.pupData.content=`<p style="padding-top:20px">您已提交过申请，请耐心等待</p>`
+                            // uni.redirectTo({
+                            //     url:"/pages-applyPermission/applyResult"
+                            // })
                         }
                     }
                 }

pages/activity/activity.vue

@@ -168,6 +168,9 @@ export default {
             this.allRefresh()
         }
     },
+    onHide(){
+        this.pupData.show=false
+    },
     onUnload(){
 		uni.$off('activityDetailSetRemind')
         uni.$off('activityDetailSetRegister')
@@ -423,7 +426,7 @@ export default {
         // 点击立即申请
         async handleApply(){
             if(this.pupData.customer_info.has_apply){//已经申请过
-                this.pupData.content=`<p>申请已提交</p><p>请等待销售人员与您联系</p>`
+                this.pupData.content=`<p style="padding-top:20px">您已提交过申请，请耐心等待</p>`
                 this.pupData.type=''
             }else{
                 if(!this.pupData.customer_info.status||this.pupData.customer_info.status!='流失'){
@@ -436,7 +439,7 @@ export default {
                         real_name:this.pupData.customer_info.name,
                     })
                     if(res.code===200){
-                        this.pupData.content=`<p>申请已提交</p><p>请等待销售人员与您联系</p>`
+                        this.pupData.content=`<p style="padding-top:20px">您已提交过申请，请耐心等待</p>`
                         this.pupData.type=''
                     }
                 }

pages/user/user.vue

@@ -35,6 +35,19 @@
 				<text class="right-text">{{lastTime}}</text>
 			</view>
 		</view>
+
+
+		<!-- 弹窗 -->
+        <van-popup :show="pupData.show" @close="pupData.show=false">
+            <view class="global-pup">
+                <view class="content">
+                    <rich-text :nodes="pupData.content"></rich-text>
+                </view>
+                <view class="flex bot">
+                    <view @click="pupData.show=false">知道了</view>
+                </view>
+            </view>
+        </van-popup>
 		
 	</view>
 </template>
@@ -64,7 +77,10 @@
 		},
 		data () {
 			return {
-				
+				pupData:{
+					show:false,
+					content:'',//弹窗html字符串
+				}
 			}
 		},
 		onShow() {
@@ -79,9 +95,11 @@
 							url:"/pages-applyPermission/applyPermission"
 						})
 					}else{
-						uni.navigateTo({
-							url:"/pages-applyPermission/applyResult"
-						})
+						this.pupData.show=true
+						this.pupData.content=`<p style="padding-top:20px">您已提交过申请，请耐心等待</p>`
+						// uni.navigateTo({
+						// 	url:"/pages-applyPermission/applyResult"
+						// })
 					}
 				}		
 			},