commit-m

components/cm-module/orderDetails/goodsList.vue

@@ -11,7 +11,7 @@
 					<view class="title-text" v-else @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
-					<view class="goods-pros-t " @click="details(pros.productID)">
+					<view class="goods-pros-t " @click="details(pros)">
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="pros.productImage" alt="" />
@@ -125,9 +125,13 @@
 			goShophome(id){
 				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
 			},
-			details(id){
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			},
+			details(pros){
+				if(pros.validFlag == 9){
+					return
+				}else{
+					this.$api.navigateTo(`/pages/goods/product?id=${pros.productID}`)
+				}
+			},	
 			clickPopupShow(pros){
 				console.log(pros)
 				this.$emit('popupClick',pros)

h5/pages/activity/activity.vue

@@ -27,24 +27,16 @@
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_04.html'
 					uni.setNavigationBarTitle({title:'保信亚太全脂然,买二送一'});
 					break;
-				case '277':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
-					uni.setNavigationBarTitle({title:'三昭国际优惠'});
-					break;
-				case '278':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
-					uni.setNavigationBarTitle({title:'点斗优惠'});
-					break;
 				case '281':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_05.html'
 					uni.setNavigationBarTitle({title:'润月雅优惠'});
 					break;
-				case '282':
-					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_06.html'
-					uni.setNavigationBarTitle({title:'中胚层专场'});
-					break;
 				case '284':
					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_07.html'
					uni.setNavigationBarTitle({title:' 光疗术后修复专场'});
 					break;
+				case '285':
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_08.html'
+					uni.setNavigationBarTitle({title:'低价风暴'});
+					break;
 				case '223':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});