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

pages/home-new.vue

@@ -291,9 +291,7 @@
 				let item = this.list5[index]
 				let link = item.link;
 				if(link) {
-					var newStr = link.indexOf("http");
-					var newStr2 = link.indexOf("https");
-					if (newStr == 0 || newStr2 == 0) {
+					if (item.remark == 'jdh5') {
 						// uni.navigateTo({
 						// 	url: '/pages/webview/webview?url=' + link
 						// })
@@ -472,7 +470,7 @@
 						width: 172rpx;height:140rpx;
 					}
 					&:last-child{
-						margin-top:20rpx;
+						margin-top:80rpx;
 						margin-left:34rpx;
 						width: 120rpx;height:112rpx;
 					}

pages/shop.vue

@@ -49,6 +49,7 @@
 </template>
 
 <script>
+import util from '@/pages/login/util.js'
 export default {
 	props:["page"],
     data() {
@@ -63,11 +64,7 @@ export default {
                 auto: true
             },
             keyword: '',
-            list3: [
-                'https://cdn.uviewui.com/uview/swiper/swiper3.png',
-                'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-                'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-            ],
+            list3: [],
             //普通商品列表
             mallList: [],
             //精品商品
@@ -279,12 +276,11 @@ export default {
 			let item = this.list3[index]
 			let link = item.link;
 			if(link) {
-				var newStr = link.indexOf("http");
-				var newStr2 = link.indexOf("https");
-				if (newStr == 0 || newStr2 == 0) {
-					uni.navigateTo({
-						url: '/pages/webview/webview?url=' + link
-					})
+				if (item.remark == 'jdh5') {
+					// uni.navigateTo({
+					// 	url: '/pages/webview/webview?url=' + link
+					// })
+					util.redirectToH5({page:link})
 					return
 				} 
 				uni.navigateTo({