美博会

components/cm-module/articleTemplate/templateA.vue

@@ -47,11 +47,15 @@ export default {
 			}
 		},
 		navigaitionTo(item) {
-			console.log(item)
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/articleTemplate/templateB.vue

@@ -44,8 +44,13 @@ export default {
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/articleTemplate/templateC.vue

@@ -38,8 +38,13 @@ export default {
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/articleTemplate/templateD.vue

@@ -44,8 +44,13 @@ export default {
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateA.vue

@@ -78,13 +78,11 @@ export default {
 			this.swiperCurrent = index
 		},
 		navigaitionTo(item){
-			const _item = JSON.parse(item)
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
 			}else if(item.linkType === -1){
-				console.log(item);
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?detail=${item}`
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateB.vue

@@ -83,8 +83,13 @@ export default {
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateC.vue

@@ -32,8 +32,13 @@ export default{
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateD.vue

@@ -51,8 +51,13 @@ export default{
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateE.vue

@@ -80,8 +80,13 @@ export default {
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

components/cm-module/pcitureTemplate/templateF.vue

@@ -50,8 +50,13 @@ export default{
 		navigaitionTo(item){
 			if (item.adsImage === '' && item.linkType === -1) {
 				return
+			}else if(item.linkType === -1){
+				uni.navigateTo({
+					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+				})
+			}else{
+				caimeiApi.FlooryNavigateTo(item)
 			}
-			caimeiApi.FlooryNavigateTo(item)
 		}
 	}
 }

h5/pages/activity/activity-detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="detail">
-		<image :src="productInfo.adsImage" mode="widthFix"></image>
+		<image :src="adsImage" mode="widthFix" show-menu-by-longpress></image>
 	</view>
 </template>
 
@@ -8,21 +8,26 @@
 	export default{
 		data(){
 			return{
-				productInfo:''
+				adsImage:'',
+				title:''
 			}
 		},
 		onLoad(option) {
-			this.productInfo = option.detail
-			console.log(option)
+			console.log(option);
+			this.adsImage = option.adsImage
+			this.title= option.name
+			uni.setNavigationBarTitle(this.title);
 		}
 	}
 </script>
 
 <style lang="scss">
 .detail{
-	width: 750rpx;
+	width: 100%;
+	height: auto;
 	image{
-		width: 750px;
+		width: 100%;
+		height: auto;
 	}
 }
 </style>