Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/homeIndex/banner.vue

@@ -55,34 +55,38 @@
 				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?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}`
+				if(floor.linkParam.id == '276'){
+					return
+				}else{
+					/**
+					 * 页面跳转类型
+					 * 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)
 					 }
-					 const url = typeMap[floor.linkType];
-					 this.$api.navigateTo(url)
-				 }
+				}
 			}
 		}
 	}

components/cm-module/homeIndex/hotProduct.vue

@@ -138,6 +138,15 @@
 		created(){
 			this.initData(this.list)
 		},
+		watch: {
+			list: {
+				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
+					this.list = el
+					this.initData(this.list)
+				},
+				deep: true
+			}
+		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isActivity'])
 		},
@@ -300,8 +309,8 @@
 						}
 					}
 					.no-price{
-						height: 54rpx;
-						line-height: 54rpx;
+						height: 70rpx;
+						line-height: 70rpx;
 						display: flex;
 						box-sizing: border-box;
 						.p-no{
@@ -316,7 +325,7 @@
 					}
 					.price{
 						color: #FF2A2A;
-						line-height:54rpx;
+						line-height:70rpx;
 						&.none{
 							text-decoration: line-through;
 							color: #999999;

components/cm-module/orderDetails/goodsList.vue

@@ -202,6 +202,7 @@
 				height: auto;
 				border-bottom: 2rpx solid #e1e1e1;
 				padding: 10rpx;
+				box-sizing: border-box;
 			}	
 			.goods-pros-t{
 				display: flex;

components/cm-module/orderDetails/orderInformation.vue

@@ -162,6 +162,7 @@
 				display: inline-block;
 				&.same{
 					width: 45%;
+					text-align: right;
 				}
 				// &.title{
 				// 	height: 68rpx;
@@ -171,7 +172,6 @@
 				view{
 					// flex: 1;
 					color: $text-color;
-					text-align: left;
 					color: #999999;
 					.label{
 						color: #666666;

components/cm-module/productDetails/recommend.vue

@@ -47,7 +47,7 @@
 		},
 		methods:{
 			infoRecommend(id,type){
-				this.ProductService.queryProductDetilsRelevant({productId:id,recommendType:type}).then(response =>{
+				this.ProductService.queryProductDetilsRelevant({ productId:id,recommendType:type ? type : 0 }).then(response =>{
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						this.recommendList = response.data

h5/pages/article/page.vue

@@ -34,6 +34,9 @@
 				case '7':
 					this.activityPath = 'https://www.caimei365.com/repair.html'
 					break;
+				case '14':
+					this.activityPath = 'https://www.caimei365.com/investment.html'
+					break;
 			}
 			// console.log(this.activityPath)
 			// uni.setNavigationBarTitle({title:'多重精华,多重修复'});

pages/authorization/authorization.vue

@@ -147,7 +147,7 @@
 			.login-btn{
 				width: 630rpx;
 				height: 80rpx;
-				border-radius: 14rpx;
+				border-radius: 40rpx;
 				font-size: $font-size-32;
 				line-height: 80rpx;
 				color: #FFFFFF;

pages/goods/instrument-details.vue

@@ -49,12 +49,12 @@
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 0">
 				<view class="content tui-banner product-rich-text tui-skeleton-rect">
-					<parser :html="this.$api.adaptRichTextImg(crmDetailList[tabCurrentIndex].content)" :img-mode="widthFix"></parser>
+					<parser :html="html" :img-mode="widthFix"></parser>
 				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 1">
 				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
-					{{ crmDetailList[tabCurrentIndex].content }}
+					{{ crmDetailList[tabCurrentIndex].content ? crmDetailList[tabCurrentIndex].content : '' }}
 				</view>
 				<view class="content service">
 					<view class="content-none">暂无内容</view>
@@ -62,7 +62,7 @@
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 2">
 				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
-					{{ crmDetailList[tabCurrentIndex].content }}
+					{{ crmDetailList[tabCurrentIndex].content ? crmDetailList[tabCurrentIndex].content : '' }}
 				</view>
 				<view class="content service">
 					<view class="content-none">暂无内容</view>
@@ -224,6 +224,7 @@
 					this.secondFloorList = pageMap.secondFloorList
 					this.firstFloorList = pageMap.firstFloorList
 					this.crmDetailList = pageMap.crmDetailList
+					this.html = this.$api.adaptRichTextImg(this.crmDetailList[0].content)
 					this.floorList = data.floorList
 					this.skeletonShow = false
 					this.productImage=[];
@@ -661,7 +662,7 @@
 			float: left;
 			.content-tr{
 				width: 100%;
-				height: 58rpx;
+				height: auto;
 				line-height: 58rpx;
 				display: flex;
 				.content-td{

pages/tabBar/home/index.vue

@@ -13,7 +13,7 @@
 			<view v-for="(item,index) in flootData" :key="index">
 				<template v-if="item.type === 1">
 					<!-- 推荐专区 -->
-					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequestHot"></hot-product>
 				</template>
 				<template v-if="item.type === 3">
 					<!-- 供应商专题 -->
@@ -119,7 +119,8 @@
 					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
 				],
 				isScrollTop:false,
-				isRequest:false
+				isRequest:false,
+				isRequestHot:false
 			}
 		},
 		onLoad() {
@@ -207,6 +208,7 @@
 					this.GetHomeInit();
 					this.GetHomeRecommendInfo()
 					this.GetHomeFloorInfo()
+					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -227,7 +229,7 @@
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
 					this.RecommendList = this.ReturnNewProducts(this.RecommendList,response.data);
 					this.skeletonShow = false;
-					this.isRequest = true
+					this.isRequestHot = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -368,7 +370,8 @@
 			}
 		},
 		onShow(){
-			this.modallayer = false;
+			this.modallayer = false
+			this.isRequestHot = false
 			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 				if(res == 1){
 					this.getWxAuthorize()

services/ajax.env.js

@@ -8,7 +8,7 @@ if(process.env.NODE_ENV === 'development'){
 	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://spi-b.caimei365.com'
-    // URL_CONFIG = 'https://spi.caimei365.com'
+	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG