commit -m 测试优化

common/config/caimeiApi.js

@@ -222,6 +222,7 @@ const caimeiApi = {
 			 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
 			 **/
 			if(pros.linkType){
+				console.log(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}`,

components/cm-module/homeIndex/navbars.vue

@@ -43,31 +43,17 @@
 				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
 				 **/
 				if(pros.linkType){
-					if(pros.linkType === 3){
-						uni.navigateToMiniProgram({
-							appId: 'wx92d650b253f8f2e3',
-							path: '/pages/index/index',
-							extraData: {
-								'data1': 'test' 
-							},
-							envVersion: 'develop',
-							success(res) {
-								// 打开成功
-								console.log(res)
-							}
-						})
-					 }else{
-						 const typeMap = {
-						 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						 	10:`/second/pages/product/product-list`,
-						 	14:`/h5/pages/other/brand`,
-						 	15:`/h5/pages/other/repair`,
-						 	18:`/h5/pages/article/path?link=${pros.link}`,
-						 	20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`
-						 }
-						const url = typeMap[pros.linkType];
-						this.$api.navigateTo(url)
+					 const typeMap = {
+						1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
+						3:`/h5/pages/article/path-live`,
+						10:`/second/pages/product/product-list`,
+						14:`/h5/pages/other/brand`,
+						15:`/h5/pages/other/repair`,
+						18:`/h5/pages/article/path?link=${pros.link}`,
+						20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`
 					 }
+					const url = typeMap[pros.linkType];
+					this.$api.navigateTo(url)
 				}
 			}
 		}
@@ -94,13 +80,13 @@
 				margin-right: 0;
 			}
 			.icon{
-				width: 130rpx;
-				height: 130rpx;
+				width: 110rpx;
+				height: 110rpx;
 				margin: 0 auto;
 				position: relative;
 				.icon-image{
-					width: 130rpx;
-					height: 130rpx;
+					width: 110rpx;
+					height: 110rpx;
 					display: block;
 				}
 				.icon-new{

components/cm-module/homeIndex/pageSpecial.vue

@@ -8,9 +8,9 @@
 							<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" @click="LiveGoPath">
+						<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(live, flIndex) in tempData.liveList" :key="flIndex" @click="LiveGoPathPros(live)">
 							<view class="tui-goods__imgbox" v-if="flIndex === 0">
-								<image :src="live.image" mode="" class="tui-goods__img"></image>
+								<image :src="live.homePageImage" mode="" class="tui-goods__img"></image>
 								<view class="tui-goods__name">{{ live.liveTitle }}</view>
 								<view class="tui-goods__statu">
 									<text class="iconfont icon-weikaishi" v-if="live.liveStatus == '1'"></text>
@@ -104,18 +104,23 @@
 				this.$api.FlooryNavigateTo(pros)
 			},
 			LiveGoPath(){//查看直播
-				uni.navigateToMiniProgram({
-					appId: 'wx92d650b253f8f2e3',
-					path: '/pages/index/index',
-					extraData: {
-						'data1': 'test'
-					},
-					envVersion: 'develop',
-					success(res) {
-						// 打开成功
-						console.log(res)
-					}
-				})
+				this.$api.navigateTo('/h5/pages/article/path-live')
+				
+				// uni.navigateToMiniProgram({
+				// 	appId: 'wx92d650b253f8f2e3',
+				// 	path: '/pages/index/index',
+				// 	extraData: {
+				// 		'data1': 'test'
+				// 	},
+				// 	envVersion: 'develop',
+				// 	success(res) {
+				// 		// 打开成功
+				// 		console.log(res)
+				// 	}
+				// })
+			},
+			LiveGoPathPros(live){
+				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
 			}
 		}
 	}
@@ -239,8 +244,9 @@
 					left:0;
 				}
 				&.icon-jieshu{
-					color: #333333;
+					color: #FFFFFF;
 					left:0;
+					font-size: 22rpx;
 				}
 			}
 		}

components/cm-module/pageFloorTemplate/templateF.vue

@@ -158,42 +158,7 @@
 				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.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateG.vue

@@ -158,42 +158,7 @@
 				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.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateH.vue

@@ -188,42 +188,7 @@
 				this.swiperCurrent = index;
 			},
 			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.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			}
 		}
 	}

components/cm-module/pageTemplate/templateNav.vue

@@ -3,7 +3,7 @@
 		<view class="navbars-content clearfix">
 			<view class="nav-item" v-for="(item,index) in navList" :key="index" @click="NavToDetailPage(item,index)">
 				<view class="icon">
-					<image class="icon-image" :src="item.crmIcon" mode="widthFix"></image>
+					<image class="icon-image" :src="item.crmIcon" mode=""></image>
 				</view>
 				<view class="name">{{ item.name }}</view>
 			</view>
@@ -70,13 +70,13 @@
 				margin-right: 0;
 			}
 			.icon{
-				width: 130rpx;
-				height: 130rpx;
+				width: 72rpx;
+				height: 72rpx;
 				margin: 0 auto;
 				position: relative;
 				.icon-image{
-					width: 130rpx;
-					height: 130rpx;
+					width: 72rpx;
+					height: 72rpx;
 					display: block;
 				}
 				.icon-new{
@@ -93,7 +93,7 @@
 				height: 40rpx;
 				line-height: 40rpx;
 				text-align: center;
-				font-size: $font-size-26;
+				font-size: $font-size-24;
 				color: #666666;
 			}
 			.nav-cell-main{

components/cm-module/productDetails/instrument-recommend.vue

@@ -55,11 +55,11 @@
 					 	10:`/second/pages/product/product-list`,
 					 	11:`/second/pages/form/form`,
 					 	12:`/pages/search/search?keyWord=${value.title}`,
-					 	13:`/h5/pages/article/page?link=${value.link}`,
-					 	14:`/h5/pages/article/page?link=${value.link}`,
-					 	15:`/h5/pages/article/page?link=${value.link}`,
+					 	13:`/h5/pages/article/path?link=${value.link}`,
+					 	14:`/h5/pages/article/path?link=${value.link}`,
+					 	15:`/h5/pages/article/path?link=${value.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/page?link=${value.link}`,
+					 	18:`/h5/pages/article/path?link=${value.link}`,
 					 	19:`/pages/search/search-supplier?keyWord=${value.title}`
 					 }
 					 const url = typeMap[value.linkType];

h5/pages/article/page-image.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="activity">
+		<image :src="banner" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+	            webviewStyles: {
+	                progress: {
+	                    color: '#FF3333'
+	                }
+	            },
+				banner:'',
+				
+	        }
+	    },
+		onLoad(option) {
+			this.banner = option.image
+			uni.setNavigationBarTitle({title:option.title});
+		},
+		methods:{
+			navToDetailPage() {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
+			},
+		}
+	}
+</script>
+	
+<style lang="scss">
+	.activity{
+		width: 100%;
+		height: auto;
+		image{
+			width: 100%;
+			height: auto;
+		}
+	}
+</style>

h5/pages/article/path-live.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="activity">
+		<image :src="banner" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+				banner:'',
+	        }
+	    },
+		onLoad() {
+			
+		},
+		methods:{
+			GetHomeLiveAdvertising(){
+				this.CommonService.GetHomeLiveAdvertising().then(response =>{
+					this.banner = response.data
+				}).catch(error =>{
+					this.$util.msg(error.msg,3000);
+				})
+			}
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.GetHomeLiveAdvertising()
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		onShow() {
+			this.GetHomeLiveAdvertising()
+		}
+	}
+</script>
+	
+<style lang="scss">
+	.activity{
+		width: 100%;
+		height: auto;
+		image{
+			width: 100%;
+			height: auto;
+		}
+	}
+</style>

pages.json

@@ -513,6 +513,20 @@
 						"enablePullDownRefresh":true
 					}
 				},
+				{
+					"path": "pages/article/page-image",
+					"style": {
+						"navigationBarTitleText": "采美365直播",
+						"enablePullDownRefresh":true
+					}
+				},
+				{
+					"path": "pages/article/path-live",
+					"style": {
+						"navigationBarTitleText": "采美365直播",
+						"enablePullDownRefresh":true
+					}
+				},
 				{
 					"path": "pages/activity/activity-list",
 					"style": {

pages/goods/goods-instrument.vue

@@ -105,11 +105,11 @@
 					 	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}`,
+					 	13:`/h5/pages/article/path?link=${floor.link}`,
+					 	14:`/h5/pages/article/path?link=${floor.link}`,
+					 	15:`/h5/pages/article/path?link=${floor.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/page?link=${floor.link}`,
+					 	18:`/h5/pages/article/path?link=${floor.link}`,
 					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
 					 }
 					 const url = typeMap[floor.linkType];

pages/goods/goods-secondary.vue

@@ -236,11 +236,11 @@
 					 	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}`,
+					 	13:`/h5/pages/article/path?link=${floor.link}`,
+					 	14:`/h5/pages/article/path?link=${floor.link}`,
+					 	15:`/h5/pages/article/path?link=${floor.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/page?link=${floor.link}`,
+					 	18:`/h5/pages/article/path?link=${floor.link}`,
 					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
 					 }
 					 const url = typeMap[floor.linkType];

pages/goods/product.vue

@@ -181,20 +181,17 @@
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
-								<image src="https://static-b.caimei365.com/app/img/icon/icon-home-active@3x.png"></image>
-								<text>首页</text>
+								<image src="https://static-b.caimei365.com/app/img/icon/icon-logo.png"></image>
 							</view>
 							<view class="item-bt">
 								<!-- #ifdef MP-WEIXIN -->
 								<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
 									<image src="../../static/severs@3x.png"></image>
-									<text>客服</text>
 								</button>	
 								<!-- #endif -->
 							</view>
 							<view class="item-bt" @click="buyProductCart()">
 								<image src="https://static-b.caimei365.com/app/img/icon/icon-cart-active@3x.png"></image>
-								<text>购物车</text>
 								<text  	v-if="hasLogin && goodsData.cartCount>0"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
 										:class="[goodsData.cartCount < 10 ? 'goleft':'']">
@@ -1306,6 +1303,7 @@
 				float: left;
 				flex-direction: column;
 				align-items: center;
+				justify-content: center;
 				font-size: $font-size-24;
 				color: $text-color;
 				line-height: 34rpx;
@@ -1327,7 +1325,7 @@
 				.icon-num{
 					position: absolute;
 					right:-12rpx;
-					top: -9rpx;
+					top: 0;
 				}
 				.icon-num.goleft{
 					right: 4rpx;
@@ -1336,8 +1334,8 @@
 					margin-right: 0;
 				}
 				image {
-					width: 40rpx;
-					height: 40rpx;
+					width: 48rpx;
+					height: 48rpx;
 					margin-bottom: 8rpx;
 				}
 				button.contact-btn{
@@ -1348,6 +1346,7 @@
 					display: flex;
 					flex-direction: column;
 					align-items: center;
+					justify-content: center;
 					box-sizing: border-box;
 					font-size: $font-size-24;
 					text-align: center;

services/common.service.js

@@ -46,6 +46,10 @@ export default class CommonService {
 	GetHomeFloorInfo (data = {}) {
 		return this.AjaxService.get({ url:'/home/floor', data, isLoading: false })
 	}
+	/* 直播专题页图片 */
+	GetHomeLiveAdvertising (data = {}) {
+		return this.AjaxService.get({ url:'/home/live/advertising', data, isLoading: false })
+	}
 	/* 搜索热门关键词 */
 	GetHomeHotSearchTerms (data = {}) {
 		return this.AjaxService.get({ url:'/home/hotSearchTerms', data, isLoading: false })