Merge branch 'v1.0.0' into v1.0.0_jd

pages/home-new.vue

@@ -99,6 +99,13 @@
 		},
 		methods: {
 			goShopH5(index){
+				let token = uni.getStorageSync('userToken');
+				if (!token) {
+					uni.navigateTo({
+						url: '/pages/login/index/index'
+					})
+					return;
+				}
 				let url;
 				if(index == 1){
 					url = 'https://pro.m.jd.com/mall/active/3L2hs3R3aibYmosCRzA2Rp5z8pTR/index.html?babelChannel=ttt1'
@@ -107,7 +114,7 @@
 				}
 				
 				// uni.setStorageSync('h5url',url)
-				util.redirectToH5({page:url})
+				util.navigateToH5({page:url})
 			},
 			// 跳转 其他小程序页面
 			goJdShop(index){
@@ -295,7 +302,14 @@
 						// uni.navigateTo({
 						// 	url: '/pages/webview/webview?url=' + link
 						// })
-						util.redirectToH5({page:link})
+						let token = uni.getStorageSync('userToken');
+						if (!token) {
+							uni.navigateTo({
+								url: '/pages/login/index/index'
+							})
+							return;
+						}
+						util.navigateToH5({page:link})
 						return
 					}
 					uni.navigateTo({

pages/shop.vue

@@ -280,7 +280,14 @@ export default {
 					// uni.navigateTo({
 					// 	url: '/pages/webview/webview?url=' + link
 					// })
-					util.redirectToH5({page:link})
+					let token = uni.getStorageSync('userToken');
+					if (!token) {
+						uni.navigateTo({
+							url: '/pages/login/index/index'
+						})
+						return;
+					}
+					util.navigateToH5({page:link})
 					return
 				} 
 				uni.navigateTo({