Merge remote-tracking branch 'origin/developerC' into developerD

components/cm-module/cart-components/index.vue

@@ -1374,6 +1374,9 @@ export default {
 			})
 		},
 		goSuppile(shop) {//跳转店铺
+			if(shop.shopId == 1161){
+				return
+			}
 			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
 		},
 		goNavto(url) {

components/cm-module/orderDetails/goodsList.vue

@@ -166,8 +166,11 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
 		},
-		goShophome(id) {
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${id}`)
+		goShophome(shopId) {
+			if(shopId == 1161){
+				return
+			}
+			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shopId}`)
 		},
 		details(pros) {
 			if (pros.validFlag == 9) {

pages/user/order/order-list.vue

@@ -343,8 +343,11 @@ export default {
 		}
 	},
 	methods: {
-		goShophome(id) {
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${id}`)
+		goShophome(shopId) {
+			if(shopId == 1161){
+				return
+			}
+			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shopId}`)
 		},
 		// 滚动切换标签样式
 		onChange: function(e) {