commit -m 首页改版

common/config/caimeiApi.js

@@ -203,6 +203,76 @@ const caimeiApi = {
 			})
 		}
 	},
+	FlooryNavigateTo:function(pros){
+		if(pros.listType == 1){
+			if(pros.product.productCategory == '1'){
+				uni.navigateTo({
+				  	url:`/pages/goods/product?id=${pros.product.productID}`
+				})
+			}else{
+				uni.navigateTo({
+				  	url:`/second/pages/product/product-details?id=${pros.product.productID}`
+				})
+			}
+		}else{
+			/**
+			 * 页面跳转类型
+			 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+			 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+			 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+			 **/
+			if(pros.linkType){
+				const typeMap = {
+				 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
+				 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
+					4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
+				 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+				 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+				 	8:`/h5/pages/activity/activity-list`,
+				 	9:`/second/pages/form/introduce`,
+				 	10:`/second/pages/product/product-list`,
+				 	11:`/second/pages/form/form`,
+				 	12:`/pages/search/search?keyWord=${pros.name}`,
+				 	13:`/h5/pages/article/page?link=${pros.link}`,
+				 	14:`/h5/pages/article/page?link=${pros.link}`,
+				 	15:`/h5/pages/article/page?link=${pros.link}`,
+				 	17:`/pages/login/register-select`,
+				 	18:`/h5/pages/article/page?link=${pros.link}`,
+				 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
+				}
+				const url = typeMap[pros.linkType];
+				uni.navigateTo({
+				  	url:url
+				})
+			}
+		}
+	},
+	BannerNavigateTo:function(linkType,linkId,linkHref,keyword){//楼层跳转判断
+		if(linkType){
+			const typeMap = {
+				1:`/pages/goods/goods-instrument?linkId=${linkId}`,
+				2:`/pages/goods/instrument-details?id=${linkId}`,
+				4:`/h5/pages/activity/activity?id=${linkId}`,
+				5:`/pages/goods/product?id=${linkId}`,
+				7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
+				8:`/h5/pages/activity/activity-list`,
+				9:`/second/pages/form/introduce`,
+				10:`/second/pages/product/product-list`,
+				11:`/second/pages/form/form`,
+				12:`/pages/search/search?keyWord=${keyword}`,
+				13:`/h5/pages/article/page?link=${linkHref}`,
+				14:`/h5/pages/article/page?link=${linkHref}`,
+				15:`/h5/pages/article/page?link=${linkHref}`,
+				17:`/pages/login/register-select`,
+				18:`/h5/pages/article/page?link=${linkHref}`,
+				19:`/pages/search/search-supplier?keyWord=${keyword}`
+			}
+			const url = typeMap[linkType];
+			uni.navigateTo({
+			 	url:url
+			})
+		}
+	},
 	navigateTo:function(url){
 		//路由跳转:页面之间路由跳转
 		uni.navigateTo({
@@ -315,5 +385,7 @@ module.exports = {
 	adaptRichTextImg: caimeiApi.adaptRichTextImg,
 	getStorageAddressKey: caimeiApi.getStorageAddressKey,
 	regexSets: caimeiApi.regexSets,
-	timestampToTime: caimeiApi.timestampToTime
+	timestampToTime: caimeiApi.timestampToTime,
+	BannerNavigateTo:caimeiApi.BannerNavigateTo,
+	FlooryNavigateTo:caimeiApi.FlooryNavigateTo 
 };

components/cm-module/homeIndex/banner.vue

@@ -55,34 +55,7 @@
 				this.current = index;
 			},
 			NavToDetailPage(floor) {//跳转
-				/**
-				 * 页面跳转类型
-				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-				 **/
-				 if(floor.linkType){
-					 const typeMap = {
-						1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-						2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
-						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
-						5:`/pages/goods/product?id=${floor.linkParam.id}`,
-						7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
-						8:`/h5/pages/activity/activity-list`,
-						9:`/second/pages/form/introduce`,
-						10:`/second/pages/product/product-list`,
-						11:`/second/pages/form/form`,
-						12:`/pages/search/search?keyWord=${floor.title}`,
-						13:`/h5/pages/article/page?link=${floor.link}`,
-						14:`/h5/pages/article/page?linkType=${floor.linkType}`,
-						15:`/h5/pages/article/page?link=${floor.link}`,
-						17:`/pages/login/register-select`,
-						18:`/h5/pages/article/page?link=${floor.link}`,
-						19:`/pages/search/search-supplier?keyWord=${floor.title}`
-					 }
-					 const url = typeMap[floor.linkType];
-					 this.$api.navigateTo(url)
-				 }
+				this.$api.FlooryNavigateTo(floor)
 			}
 		}
 	}

components/cm-module/homeIndex/navbars.vue

@@ -48,12 +48,12 @@
 							appId: 'wx92d650b253f8f2e3',
 							path: '/pages/index/index',
 							extraData: {
-								'data1': 'test'
+								'data1': 'test' 
 							},
 							envVersion: 'develop',
 							success(res) {
-								console.log(res)
 								// 打开成功
+								console.log(res)
 							}
 						})
 					 }else{

components/cm-module/homeIndex/pageSpecial.vue

@@ -4,11 +4,11 @@
 			<scroll-view scroll-x>
 				<view class="tui-goods__list">
 					<view class="tui-goods__item">
-						<view class="tui-group-name">
+						<view class="tui-group-name" @click="LiveGoPath">
 							<view class="tui-group-title"><text>精彩直播</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(live, flIndex) in tempData.liveList" :key="flIndex">
+						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(live, flIndex) in tempData.liveList" :key="flIndex" @click="LiveGoPath">
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="live.image" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ live.liveTitle }}</view>
@@ -23,11 +23,11 @@
 						</view>
 					</view>
 					<view class="tui-goods__item">
-						<view class="tui-group-name">
+						<view class="tui-group-name" @click="NewActivityList">
 							<view class="tui-group-title"><text>最新活动</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(cmImage, flIndex) in tempData.cmImageList" :key="flIndex">
+						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(cmImage, flIndex) in tempData.cmImageList" :key="flIndex" @click="NewActivityListPath(cmImage)">
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="cmImage.image" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ cmImage.title }}</view>
@@ -36,11 +36,11 @@
 						</view>
 					</view>
 					<view class="tui-goods__item">
-						<view class="tui-group-name">
+						<view class="tui-group-name" @click="NavArticlePath('https://www.caimei365.com/info/center-3-1.html')">
 							<view class="tui-group-title"><text>热门文章</text></view>
 							<view class="iconfont icon-xiayibu"></view>
 						</view>
-						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(info, flIndex) in tempData.infoList" :key="flIndex">
+						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(info, flIndex) in tempData.infoList" :key="flIndex" @click="NavArticlePath(info.link)">
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
 								<image :src="info.guidanceImage" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ info.title }}</view>
@@ -94,35 +94,28 @@
 			initData(data){
 				this.tempData = data
 			},
-			NavToDetailPage(floor) {//跳转
-				/**
-				 * 页面跳转类型
-				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-				 **/
-				 if(floor.linkType){
-					 const typeMap = {
-					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
-						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
-					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
-					 	8:`/h5/pages/activity/activity-list`,
-					 	9:`/second/pages/form/introduce`,
-					 	10:`/second/pages/product/product-list`,
-					 	11:`/second/pages/form/form`,
-					 	12:`/pages/search/search?keyWord=${floor.title}`,
-					 	13:`/h5/pages/article/page?link=${floor.link}`,
-					 	14:`/h5/pages/article/page?link=${floor.link}`,
-					 	15:`/h5/pages/article/page?link=${floor.link}`,
-					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/page?link=${floor.link}`,
-					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
-					 }
-					 const url = typeMap[floor.linkType];
-					 this.$api.navigateTo(url)
-				 }
+			NavArticlePath(LINK){
+				 this.$api.navigateTo(`/h5/pages/article/page?link=${LINK}`)
+			},
+			NewActivityList(){
+				this.$api.navigateTo('/h5/pages/activity/activity-list')
+			},
+			NewActivityListPath(pros){
+				this.$api.FlooryNavigateTo(pros)
+			},
+			LiveGoPath(){//查看直播
+				uni.navigateToMiniProgram({
+					appId: 'wx92d650b253f8f2e3',
+					path: '/pages/index/index',
+					extraData: {
+						'data1': 'test'
+					},
+					envVersion: 'develop',
+					success(res) {
+						// 打开成功
+						console.log(res)
+					}
+				})
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateA.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill" @click="BannerToDetailPages(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.keyword)"></image>
+			<image class="item-img-gg" 
+				   :src="floorData.floorContent.appletsAdsImage1" 
+				   @click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+				   mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -161,73 +165,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
 			},
-			BannerToDetailPages(linkType,linkId,linkHref,keyword) {//跳转商品详情页
-				console.log(linkType)
-				console.log(linkId)
-				 /** 页面跳转类型
-				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-				 **/
-				 if(linkType){
-					 const typeMap = {
-						1:`/pages/goods/goods-instrument?linkId=${linkId}`,
-						2:`/pages/goods/instrument-details?id=${linkId}`,
-						4:`/h5/pages/activity/activity?id=${linkId}`,
-						5:`/pages/goods/product?id=${linkId}`,
-						7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
-						8:`/h5/pages/activity/activity-list`,
-						9:`/second/pages/form/introduce`,
-						10:`/second/pages/product/product-list`,
-						11:`/second/pages/form/form`,
-						12:`/pages/search/search?keyWord=${keyword}`,
-						13:`/h5/pages/article/page?link=${linkHref}`,
-						14:`/h5/pages/article/page?link=${linkHref}`,
-						15:`/h5/pages/article/page?link=${linkHref}`,
-						17:`/pages/login/register-select`,
-						18:`/h5/pages/article/page?link=${linkHref}`,
-						19:`/pages/search/search-supplier?keyWord=${keyword}`
-					 }
-					 const url = typeMap[linkType];
-					 this.$api.navigateTo(url)
-				}
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateB.vue

@@ -1,10 +1,18 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image  class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -164,42 +172,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateC.vue

@@ -1,10 +1,18 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -164,42 +172,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateD.vue

@@ -1,13 +1,25 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_03">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage3" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage3" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType3,floorData.floorContent.linkParam3.id,floorData.floorContent.adsLink3,floorData.floorContent.linkParam3.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -167,42 +179,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageFloorTemplate/templateE.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -161,42 +165,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateA.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill" >
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 3" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -161,42 +165,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateB.vue

@@ -1,10 +1,18 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 2" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -164,42 +172,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateC.vue

@@ -1,10 +1,18 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 3" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -164,42 +172,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateD.vue

@@ -1,13 +1,25 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_02">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage2" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage2" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_03">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage3" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage3" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType3,floorData.floorContent.linkParam3.id,floorData.floorContent.adsLink3,floorData.floorContent.linkParam3.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 2" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -167,42 +179,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateE.vue

@@ -1,7 +1,11 @@
 <template>
 	<view class="section_page_main clearfix">
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 		<view class="floor-item ad_04 clearfix" v-for="(item, idx) in floorData.floorImageList" v-if="idx < 4" :key="idx" @click.stop="navToDetailPage(item)">
 			<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
@@ -161,42 +165,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateF.vue

@@ -95,7 +95,11 @@
 			</view>
 		</view>
 		<view class="floor-item ad_01">
-			<image class="item-img-gg" :src="floorData.floorContent.appletsAdsImage1" mode="aspectFill"></image>
+			<image 	class="item-img-gg" 
+					:src="floorData.floorContent.appletsAdsImage1" 
+					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					mode="aspectFill">
+			</image>
 		</view>
 	</view>
 </template>
@@ -161,42 +165,10 @@
 				return false
 			},
 			navToDetailPage(pros) {//跳转商品详情页
-				if(pros.listType == 1){
-					if(pros.product.productCategory == '1'){
-						this.$api.navigateTo(`/pages/goods/product?id=${pros.product.productID}`)
-					}else{
-						this.$api.navigateTo(`/second/pages/product/product-details?id=${pros.product.productID}`)
-					}
-				}else{
-					/**
-					 * 页面跳转类型
-					 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
-					 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
-					 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
-					 **/
-					 if(pros.linkType){
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-							4:`/h5/pages/activity/activity?id=${pros.linkParam.id}`,
-						 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-						 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-						 	8:`/h5/pages/activity/activity-list`,
-						 	9:`/second/pages/form/introduce`,
-						 	10:`/second/pages/product/product-list`,
-						 	11:`/second/pages/form/form`,
-						 	12:`/pages/search/search?keyWord=${pros.name}`,
-						 	13:`/h5/pages/article/page?link=${pros.link}`,
-						 	14:`/h5/pages/article/page?link=${pros.link}`,
-						 	15:`/h5/pages/article/page?link=${pros.link}`,
-						 	17:`/pages/login/register-select`,
-						 	18:`/h5/pages/article/page?link=${pros.link}`,
-						 	19:`/pages/search/search-supplier?keyWord=${pros.name}`
-						 }
-						 const url = typeMap[pros.linkType];
-						 this.$api.navigateTo(url)
-					}
-				}
+				this.$api.FlooryNavigateTo(pros)
+			},
+			BannerNavigateTo(linkType,linkId,linkHref,keyword) {//跳转商品详情页
+				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

main.js

@@ -24,17 +24,35 @@ Vue.prototype.$getStorage = function(key){
 		return null;
 	} 
 }
+/**
+ * 友盟+小程序统计
+ */
+// #ifdef MP-WEIXIN
+import { umtrackWxKey } from '@/utils/config.js'
+import uma from 'umtrack-wx';
+uma.init({
+	appKey: umtrackWxKey, //由友盟分配的APP_KEY
+	// 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
+	// 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
+	useOpenid: true,
+	// 使用openid进行统计时，是否授权友盟自动获取Openid，
+	// 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
+	autoGetOpenid: true,
+	debug: true, //是否打开调试模式
+	uploadUserInfo: false // 自动上传用户信息，设为false取消上传，默认为false
+});
+uma.install = function (Vue) {
+	Vue.prototype.$uma = uma;
+}
+
+// #endif
 Vue.config.productionTip = false
 Vue.prototype.$fire = new Vue();
 Vue.prototype.$store = store;
 Vue.prototype.$util = {msg, json, prePage,modal};
 Vue.prototype.$api = Api;
 Vue.prototype.$reg = Regs;
-
-
-
-
-
+Vue.use(uma);
 App.mpType = 'app'
 
 const app = new Vue({

node_modules/umtrack-wx/package.json

@@ -0,0 +1,52 @@
+{
+  "_from": "umtrack-wx",
+  "_id": "umtrack-wx@2.5.2",
+  "_inBundle": false,
+  "_integrity": "sha512-+KFHvkghFZEaR+rDBOqYzsecf1qWvI5xaSD+jyZoQ+TR0Jq/FlcCTDpSSbwisnmedDD8JyehN7szYbEyw5FZjA==",
+  "_location": "/umtrack-wx",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "umtrack-wx",
+    "name": "umtrack-wx",
+    "escapedName": "umtrack-wx",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/umtrack-wx/-/umtrack-wx-2.5.2.tgz",
+  "_shasum": "fc0a112345e6ca4d78deac34bdff0f3ba7c7295b",
+  "_spec": "umtrack-wx",
+  "_where": "D:\\zheng_dev\\caimei-applets-caimei",
+  "author": {
+    "name": "umeng"
+  },
+  "bundleDependencies": false,
+  "dependencies": {},
+  "deprecated": false,
+  "description": "微信小程序友盟统计SDK",
+  "directories": {
+    "lib": "lib"
+  },
+  "keywords": [
+    "umeng",
+    "weixin",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "lib/index.js",
+  "miniprogram": "lib",
+  "name": "umtrack-wx",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "2.5.2"
+}

package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "caimei-applets-caimei",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "umtrack-wx": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/umtrack-wx/-/umtrack-wx-2.5.2.tgz",
+      "integrity": "sha512-+KFHvkghFZEaR+rDBOqYzsecf1qWvI5xaSD+jyZoQ+TR0Jq/FlcCTDpSSbwisnmedDD8JyehN7szYbEyw5FZjA=="
+    }
+  }
+}

package.json

@@ -0,0 +1,19 @@
+{
+  "name": "caimei-applets-caimei",
+  "version": "1.0.0",
+  "description": "caimei-applets-caimei --采美商城小程序",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@git.caimei365.com:caimei-repository/caimei-applets-caimei.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "umtrack-wx": "^2.5.2"
+  }
+}

pages/goods/good-floor.vue

@@ -23,6 +23,8 @@
 	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
 	import templateNav from '@/components/cm-module/pageTemplate/templateNav.vue'
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	
 	export default{
 		components:{
@@ -48,7 +50,16 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
 			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.userID = resolve.userID ? resolve.userID : 0;
@@ -111,6 +122,15 @@
 				uni.stopPullDownRefresh()
 			}, 200)
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: '采美-一站式生/医美采购服务平台',
+			  path: `pages/goods/good-floor?type=share&linkId=${this.pageId}`
+			}
+		},
 		onShow() {
 			
 		}

pages/goods/goods-classify.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container all-type-list-wrapper" :style="{paddingTop:(CustomBar+44)+'px'}">
+	<view class="container all-type-list-wrapper">
 		<!-- 自定义顶部 -->
 		<custom-floor  :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi"></custom-floor>
 		<view class="tui-header-screen" :style="{top:CustomBar+'px'}">
@@ -40,7 +40,7 @@
 				<text class="error-text">{{emptyText}}</text>
 			</view>
 			<template v-else>
-				<view class="container-list" :style="{'height':scrollHeight+'px'}">
+				<view class="container-list" :style="{'height':scrollHeight+'px',paddingTop:(CustomBar+44)+'px'}">
 					<view v-for="(item,index) in listData" :key="index" :id="item.p_id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
 						<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
 						<view class="list-details-info">
@@ -177,7 +177,8 @@
 	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	import modalLayer from "@/components/modal-layer"
-	
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	
 	const defaultListQuery = {
 			id:0,
@@ -232,7 +233,18 @@
 		},
 		onLoad(option) {
 			console.log(option)
-			this.initOption(option);
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
+			this.SetScrollHeight()
+			this.InitOption(option)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','identity'])
@@ -243,7 +255,7 @@
 			},
 		},	
 		methods:{
-			initOption(option) {
+			InitOption(option) {
 				this.listQuery.id = option.id;
 				this.listQuery.idType = this.classifyType = Number(option.classType);
 				uni.setNavigationBarTitle({title:option.title});
@@ -361,8 +373,8 @@
 					this.isSearchSalesFirst = true
 					this.isSearchMoodFirst = true
 					this.isSearchPriceFirst = true
-					this.listQuery.sortType = ''
-					this.GetProductListInfo();
+					this.listQuery.sortType = 1
+					this.listQuery.sortField = ''
 				} else if (index == 1) {
 					this.tabIndex = 1
 					this.isSearchSalesFirst = false
@@ -415,14 +427,27 @@
 				this.GetProductListInfo()
 			},
 			SearchCondition(type,item,tiny){//选择筛选分类
-				this.listQuery.idType = type
+				this.listQuery.idType = type;
+				const { classData, classData: { smalltypeList } } = this;
+				classData.isChecked = false;
+				if(smalltypeList && smalltypeList.length > 0) {
+					smalltypeList.forEach((item, index) => {
+						item.isChecked = false;
+						const { tinytypeList } = item;
+						if(tinytypeList && tinytypeList.length > 0) {
+							tinytypeList.forEach((tinyItem, tinyIndex) => {
+								tinyItem.isChecked = false;
+							})
+						}
+					});
+				}
 				switch(type){
-					case 1:
+				    case 1:
 						console.log('1级分类全部商品',item);
 						item.isChecked = !item.isChecked
 						this.searchCheckedId = item.bigTypeID
 						break;
-					case 2:
+				    case 2:
 						console.log('2级分类全部商品',item);
 						item.isChecked = !item.isChecked
 						if(item.isChecked){
@@ -431,17 +456,16 @@
 							this.searchCheckedId = ''
 						}
 						break;
-					case 3:
+				    case 3:
 						console.log('3级分类',tiny);
 						tiny.isChecked = !tiny.isChecked
 						if(tiny.isChecked){
 							this.searchCheckedId = tiny.tinyTypeID
 						}else{
-							this.searchCheckedId = ''
+						   this.searchCheckedId = ''
 						}
 						break;
-				}
-				
+				 }
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
@@ -458,7 +482,7 @@
 				}
 				return false
 			},
-			setScrollHeight() {
+			SetScrollHeight() {
 				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
 				this.windowHeight = windowHeight - 1;
 				this.scrollHeight = windowHeight - 1;
@@ -500,6 +524,15 @@
 				this.GetOnReachBottomData()
 			}	
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `点击查看“${this.classData.name}”相关的商品`,
+			  path: `pages/goods/goods-classify?type=share&classType=${this.classifyType}&id=${this.listQuery.id}&title=${this.classData.name}`
+			}
+		},
 		onShow() {
 			
 		}

pages/goods/product.vue

@@ -261,12 +261,12 @@
 	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
 	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
 	import cmAttributes from "@/components/cm-module/productDetails/cm-attributes.vue" //规格信息
-	import authorize from '@/common/config/authorize.js'
 	import parser from "@/components/jyf-Parser/index" //富文本处理
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import recommend from "@/components/cm-module/productDetails/recommend" //相关推荐
 	import cmParameter from "@/components/cm-module/productDetails/cm-parameter" //相关参数
 	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
+	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
 	import { debounce } from '@/common/config/common.js'
 	var isPreviewImg;
@@ -614,9 +614,6 @@
 				})
 				return systeminfo
 			},
-			getOptionFn(e){
-				this.isShareType = e.type
-			},
 			goIndex(){//商城首页
 				uni.switchTab({
 				    url: '/pages/tabBar/home/index'

pages/search/search-instrument.vue

@@ -39,6 +39,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
+	import wxLogin from "@/common/config/wxLogin.js"
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	export default {
@@ -68,6 +69,16 @@
 			}
 		},
 		onLoad(option){
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
 			if(option.keyword){
 				this.listQuery.keyword = option.keyword
 				this.GetSearchEquipmentList();
@@ -153,6 +164,15 @@
 				this.GetSearchEquipmentListBottomData()
 			}	
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `做项目找仪器，上采美`,
+			  path: `pages/search/search-instrument?type=share&keyWord=${this.listQuery.keyword}`
+			}
+		},
 		onShow() {
 
 		}

pages/search/search-supplier.vue

@@ -72,10 +72,12 @@
 </template>
 
 <script>
-	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	import authorize from '@/common/config/authorize.js'	
+	import wxLogin from "@/common/config/wxLogin.js"
+	
 	export default {
 		components:{
 			tuiLoadmore,
@@ -106,6 +108,16 @@
 			}
 		},
 		onLoad(option){
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
 			if(option.keyword){
 				this.listQuery.keyword = option.keyword
 				this.GetSearchSupplierList();
@@ -187,7 +199,7 @@
 				return Array
 			},
 			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+value)
+				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
 			},
 		},
 		onReachBottom() {
@@ -197,6 +209,15 @@
 				this.GetSearchSupplierListBottomData()
 			}	
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `采美正品供应商，质量有保证！`,
+			  path: `second/pages/product/product-list?type=share`
+			}
+		},
 		onShow() {
 			
 		}

pages/search/search.vue

@@ -161,6 +161,7 @@
 	import modalLayer from "@/components/modal-layer"
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	
 	export default {
 		components: {
@@ -207,6 +208,16 @@
 		},
 		onLoad(option) {
 			console.log(option)
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
 			this.$api.getStorage().then((resolve) =>{
 				this.userID = resolve.userID ? resolve.userID : 0;
 				this.shopId = resolve.shopID ? resolve.shopID : 0;
@@ -440,6 +451,15 @@
 				this.show = !this.show;
 			},
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `点击查看“${this.listQuery.keyword}”相关的商品`,
+			  path: `pages/search/search?type=share&keyWord=${this.listQuery.keyword}`
+			}
+		},
 		onShow() {
 			this.setScrollHeight();
 			this.GetHomeHotSearchTerms()

pages/user/order/create-order.vue

@@ -1,7 +1,5 @@
 <template>
 	<view class="container order clearfix" :style="{paddingBottom :isIphoneX ? '170rpx' : '134rpx'}">
-		<!-- 透明模态层 -->
-		<modal-layer v-if='modallayer'></modal-layer>
 		<!-- 地址选择 -->
 		<choice-address ref="choiceAddress" v-if="isAddress" :addressData="addressData"></choice-address>
 		<!-- 商品 -->
@@ -61,7 +59,7 @@
 				</view>
 			</view>
 			<view class="footer-submit" @click.stop="orderSubmitMit">
-				<view class="btn">提交订单</view>
+				<view class="btn" :class="isSubLoading ? 'disabled' : ''" >提交订单</view>
 			</view>
 		</view>
 	</view>
@@ -73,7 +71,6 @@
 	import invoiceTent from '@/components/cm-module/creatOrder/invoiceTent'
 	import freight from '@/components/cm-module/creatOrder/freight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert'
-	import modalLayer from "@/components/modal-layer"
 
 	export default {
 		components:{
@@ -81,12 +78,11 @@
 			goodsList,
 			invoiceTent,
 			freight,
-			freightAlert,
-			modalLayer
+			freightAlert
 		},
 		data() {
 			return {
-				modallayer:false,
+				isSubLoading:false,
 				orderID:0,
 				productIds:'',			  //获取上一级页面商品信息
 				productCount:'',		  //获取上一级页面商品数量
@@ -279,6 +275,7 @@
 				}
 			},
 			orderSubmitMit(){//提交订单
+				if(this.isSubLoading){ return; }
 				if(this.addressID == ''){
 					this.$util.msg('请先添加收货地址～',2000)
 					return
@@ -313,15 +310,17 @@
 						orderInvoice:this.invoiceData
 					}
 					// console.log(param)
-				this.modalLayer = true;
+				this.isSubLoading = true;	
 				this.OrderService.CreatedOrderSubmit({'params':JSON.stringify(param)}).then(response =>{
 					const data = response.data;
 					if(data.code === '1'){
 						this.submitState ='success'
+						this.isSubLoading = false;
 						let data = {orderID:response.data.orderID}
 						this.$api.navigateTo(`/pages/user/order/success?data=${JSON.stringify({data:data})}`)
 					}else{
 						this.submitState ='confirm'
+						this.isSubLoading = false;
 						this.$util.msg('订单提交成功',3000,true,'success')
 						setTimeout(()=>{
 							this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${response.data.orderID}`)
@@ -551,6 +550,10 @@
 				text-align: center;
 				line-height: 80rpx;
 				border-radius: 40rpx;
+				&.disabled{
+					background: #F7F7F7;
+					color: #999999;
+				}
 			}
 		}
 	}

second/pages/product/product-list.vue

@@ -87,6 +87,8 @@
 </template>
 
 <script>
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	import modalLayer from "@/components/modal-layer"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
@@ -145,6 +147,18 @@
 			 this.gettabList();
 			 this.isFocus = true;
 		},
+		onLoad(option) {
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
+		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
 		},
@@ -193,64 +207,64 @@
 				this.isModallayer = false;
 			},
 			gettabList:function (loadMore) {
+				this.showLoading = true;
+				this.loadingNow = true;
+				this.loadingText = '加载中';
+				this.isShowEmpty = false;				
+				if(loadMore) {this.pageNum += 1;}
+				let params = {
+						secondHandType:this.currentId,
+						instrumentType:this.currentID2,
+						name:this.name,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize
+				}
+				this.SecondService.SeconHandProductList(params).then(res =>{
+					 if (res.code == 0) {
+						   const data = res.data;
+						   if(data.results.length == 0){
+							   this.tabchildList = [];
+							   this.showflag = true;
+							   this.listRecord = data.totalRecord;
+						   }else {
+							   this.showflag = false;
+							   this.isShow = true;
+							   let results = data.results;
+							   if(loadMore) {
+								this.tabchildList = [...this.tabchildList,...results];
+							   } else {
+								this.tabchildList = [...results];
+								this.showSkeleton = false;
+							   }
+							   this.hasNextPage = data.hasNextPage;
+							   this.listRecord = data.totalRecord;
+							  
+						   }
+						   // 防上拉暴滑
+						   this.pullFlag = false;
+						   setTimeout(()=>{ this.pullFlag = true; },500)
+						   // 底部提示文案
+						   if(this.hasNextPage) {
+							this.loadingText = '上拉加载更多';
+						   } else {
 							this.showLoading = true;
-							this.loadingNow = true;
-							this.loadingText = '加载中';
-							this.isShowEmpty = false;				
-							if(loadMore) {this.pageNum += 1;}
-							let params = {
-									secondHandType:this.currentId,
-									instrumentType:this.currentID2,
-									name:this.name,
-									pageNum:this.pageNum,
-									pageSize:this.pageSize
-							}
-						this.SecondService.SeconHandProductList(params).then(res =>{
-			                     if (res.code == 0) {
-			                           const data = res.data;
-			                           if(data.results.length == 0){
-			                               this.tabchildList = [];
-			                               this.showflag = true;
-			                               this.listRecord = data.totalRecord;
-			                           }else {
-			                               this.showflag = false;
-			                               this.isShow = true;
-										   let results = data.results;
-										   if(loadMore) {
-										   	this.tabchildList = [...this.tabchildList,...results];
-										   } else {
-										   	this.tabchildList = [...results];
-										   	this.showSkeleton = false;
-										   }
-			                               this.hasNextPage = data.hasNextPage;
-			                               this.listRecord = data.totalRecord;
-										  
-			                           }
-									   // 防上拉暴滑
-									   this.pullFlag = false;
-									   setTimeout(()=>{ this.pullFlag = true; },500)
-									   // 底部提示文案
-									   if(this.hasNextPage) {
-									   	this.loadingText = '上拉加载更多';
-									   } else {
-									   	this.showLoading = true;
-									   	this.loadingNow = false;
-									   	this.loadingText = '已至底部';
-									   }
-			                         }else{
-			                            this.$util.msg(error.msg,2000);
-			                         }
-			                    this.requestFlag = true;
-			                })
-			          },	
-			  onShowClose () {//输入框失去焦点时触发
+							this.loadingNow = false;
+							this.loadingText = '已至底部';
+						   }
+						 }else{
+							this.$util.msg(error.msg,2000);
+						 }
+					this.requestFlag = true;
+				})
+			},	
+			onShowClose () {//输入框失去焦点时触发
 				if(this.name != ''){
 					this.isShowClose = true;
 				}else{					
 					this.isShowClose = false
 				}
-			  },
-			  delInputText(){//清除输入框内容
+			},
+			delInputText(){//清除输入框内容
 			  	this.name = '';
 			  	this.tabchildList =[];
 			  	this.isFocus = true
@@ -261,8 +275,8 @@
 			  	this.instrumentType='';
 			  	this.gettabList();
 				this.searchHide = true;
-			  },
-			  searchOpertor(){//搜索商品
+			},
+			searchOpertor(){//搜索商品
 				if(this.name == ''){
 					this.$util.msg('请输入商品关键词',2000)
 					this.secondHandType = 1
@@ -277,9 +291,17 @@
 					this.searchHide = false;
 					
 				}
-			  },
-				},
-			
+			},
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `做项目找仪器，上采美`,
+			  path: `pages/search/search-instrument?keyWord=${this.listQuery.keyword}`
+			}
+		},	
 	}
 </script>
 <style lang="scss">

static/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "static",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

supplier/pages/user/my-shop.vue

@@ -232,6 +232,7 @@
 	import banner from '@/components/cm-module/supplier/banner.vue'
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	
 	export default {
 		components:{
@@ -270,8 +271,17 @@
 			}
 		},
 		onLoad(option) {
+			if(option.type =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
 			this.listQuery.id = this.supplierId = option.shopId
-			console.log(this.supplierId)
 			this.$api.getStorage().then((resolve) =>{
 				this.shopId = resolve.shopID ? resolve.shopID : 0
 				this.userID = resolve.userID ? resolve.userID : 0
@@ -470,6 +480,15 @@
 				this.GetMoreSupplierHomeProductList()
 			}	
 		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `进入店铺，发现惊喜`,
+			  path: `supplier/pages/user/my-shop?type=share&shopId=${this.listQuery.id}`
+			}
+		},
 		onShow(){
 			
 		}

utils/config.js

@@ -0,0 +1 @@
+export const umtrackWxKey  = '5fe43947adb42d58268cb3aa'