添加用户协议

pages/found/index.vue

@@ -158,22 +158,16 @@
 			    var type = open.openType;
 			    switch(type){
 			        case 'switchTab': 
-			            uni.switchTab({
+			            this.$Router.pushTab({name: open.path})
-			                url: open.path
-			            })
 			            break;
 			        case 'web':
-			            uni.navigateTo({
+                        window.location.href = open.path
-			                url: open.url
-			            })
 			            break;
 			        case 'navigateTo':
-			            uni.navigateTo({
+                        this.$Router.push({name: open.path})
-			                url: open.path
-			            })
 			            break;
 			    }
-			},
+			}
 		}
 	}
 </script>

pages/index/index.vue

@@ -280,24 +280,18 @@
 				})
 			},
             
-            // 能量任务跳转
+            // 能量跳转
             JumpUrl(open, title) {
                 var type = open.openType;
                 switch(type){
                     case 'switchTab': 
-                        uni.switchTab({
+                        this.$Router.pushTab({name: open.path})
-                            url: open.path
-                        })
                         break;
                     case 'web':
-                        uni.navigateTo({
+                        window.location.href = open.path
-                            url: open.url
-                        })
                         break;
                     case 'navigateTo':
-                        uni.navigateTo({
+                        this.$Router.push({name: open.path})
-                            url: open.path
-                        })
                         break;
                 }
             }

pages/login/login.vue

@@ -26,14 +26,7 @@
 			</view>
 		</view>
 		<!-- 用户登录注册协议 -->
-<<<<<<< HEAD
+		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginPrivacy'}})">用户隐私协议</view>和<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginService'}})">用户服务协议</view></view>
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginPrivacy'}})">用户隐私协议</view>和<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginService'}})">用户服务协议
-			</view>
-=======
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="/pages/login/agreement?name=secret">用户隐私协议</navigator>和<navigator url="/pages/login/agreement?name=service">用户服务协议
-			</navigator>
->>>>>>> 1e1409f14e485939bb0a6d80e65119d65d4e6a1c
-		</view>
 	</view>
 </template>