Merge remote-tracking branch 'remotes/origin/dev_cd' into dev_jd

pages/home-new.vue

@@ -252,17 +252,19 @@
 			goOtherLink(index) {
 				let item = this.list5[index]
 				let link = item.link;
-				var newStr = link.indexOf("http");
-				var newStr2 = link.indexOf("https");
-				if (newStr == 0 || newStr2 == 0) {
+				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
+						})
+						return
+					}
 					uni.navigateTo({
-				 	url: '/pages/webview/webview?url=' + link
+						url: link
 					})
-					return
 				}
-				uni.navigateTo({
-					url: link
-				})
 			},
 			// 获取爱车列表
 			getCarList(){

pages/home.vue

@@ -249,17 +249,19 @@
 			goOtherLink(index) {
 				let item = this.list5[index]
 				let link = item.link;
-				var newStr = link.indexOf("http");
-				var newStr2 = link.indexOf("https");
-				if (newStr == 0 || newStr2 == 0) {
+				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
+						})
+						return
+					}
 					uni.navigateTo({
-				 	url: '/pages/webview/webview?url=' + link
+						url: link
 					})
-					return
 				}
-				uni.navigateTo({
-					url: link
-				})
 			},
 			// 获取爱车列表
 			getCarList(){

pages/personal.vue

@@ -68,12 +68,13 @@ export default {
         return {
             show:false,
             logoutFlag : true,
-            menu: [{
-                    icon: require("@/static/my/my01.png"),
-                    title: "我的订单",
-                    url: "",
-					type:"jd"
-                },
+            menu: [
+				// {
+    //                 icon: require("@/static/my/my01.png"),
+    //                 title: "我的订单",
+    //                 url: "",
+				// 	type:"jd"
+    //             },
 				// {
     //                 icon: require("@/static/my/my12.png"),
     //                 title: "我的地址",

pages/shop.vue

@@ -249,17 +249,19 @@ export default {
 		goOtherLink(index){
 			let item = this.list3[index]
 			let link = item.link;
-			var newStr = link.indexOf("http");
-			var newStr2 = link.indexOf("https");
-			if (newStr == 0 || newStr2 == 0) {
+			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
+					})
+					return
+				} 
 				uni.navigateTo({
-				    url: '/pages/webview/webview?url=' + link
+					url: link
 				})
-				return
-			} 
-			uni.navigateTo({
-			    url: link
-			})
+			}
 		}
     },
     onReady: function () {

pagesB/pages/move-car/scan.vue

@@ -382,7 +382,7 @@ export default {
 					uni.hideLoading()
                     uni.showToast({
                         title: res.data.msg,
-                        icon: "error",
+                        icon: "none",
                     });
                 }
             })