commit - m

components/cm-module/cm-seller/home.vue

@@ -291,7 +291,7 @@
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
+			  path: 'pages/tabBar/home/index',
 			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 			}
 		}

components/cm-module/homeIndex/banner.vue

@@ -55,38 +55,34 @@
 				this.current = index;
 			},
 			NavToDetailPage(floor) {//跳转
-				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)
+				/**
+				 * 页面跳转类型
+				 * 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)
+				 }
 			}
 		}
 	}

components/cm-module/homeIndex/hotProduct.vue

@@ -138,15 +138,6 @@
 		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'])
 		},
@@ -203,7 +194,7 @@
 		}
 		.recommend-list{
 			width: 100%;
-			height: 1140rpx;
+			height: 1160rpx;
 			position: relative;
 			padding-bottom: 20rpx;
 			.tui-banner-swiper {
@@ -211,7 +202,7 @@
 				margin: 0 auto;
 				background: #F7F7F7;
 				padding: 0 24rpx 0 24rpx;
-				height: 1140rpx;
+				height: 1160rpx;
 				overflow: hidden;
 				transform: translateY(0);
 				.floor-item{
@@ -226,7 +217,6 @@
 					margin-bottom: 20rpx;
 					float: left;
 					box-sizing: border-box;
-					padding-bottom: 10rpx;
 					position: relative;
 					&:nth-child(2n){
 						margin-right: 0;

components/cm-module/homeIndex/index.vue

@@ -431,7 +431,7 @@
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
+			  path: 'pages/tabBar/home/index',
 			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 			}
 		}

components/cm-module/supplier/home.vue

@@ -291,7 +291,7 @@
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
+			  path: 'pages/tabBar/home/index',
 			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 			}
 		}

h5/pages/activity/activity-list.vue

@@ -107,12 +107,12 @@
 			if(this.hasNextPage){
 				this.loadding = true
 				this.pullUpOn = true
-				this.GetPromotionsrList()
+				this.GetPromotionsrListBottomData()
 			}	
 		},
 		onPullDownRefresh() {//下拉刷新
 			this.listQuery.pageNum = 1
-			this.queryProductPromotionList()
+			this.GetPromotionsrList()
 			uni.stopPullDownRefresh()
 		},
 		onShow() {
@@ -153,6 +153,12 @@
 			bottom: 0;
 			left: 0;
 			font-size: $font-size-26;
+			text-overflow:ellipsis;
+			display: -webkit-box;
+			word-break: break-all;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			overflow: hidden;
 		}
 		.time{
 			width: 100%;

h5/pages/activity/activity.vue

@@ -35,6 +35,10 @@
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
 					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
 					break;
+				case '276':
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_04.html'
+					uni.setNavigationBarTitle({title:'保信亚太全脂然,买二送一'});
+					break;
 				case '223':
 					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});

pages/goods/goods-secondary.vue

@@ -316,6 +316,12 @@
 			bottom: 0;
 			left: 0;
 			font-size: $font-size-26;
+			text-overflow:ellipsis;
+			display: -webkit-box;
+			word-break: break-all;
+			-webkit-box-orient: vertical; 
+			-webkit-line-clamp: 1;
+			overflow: hidden;
 		}
 		.time{
 			width: 100%;

pages/tabBar/home/home.vue

@@ -449,7 +449,7 @@
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
+			  path: 'pages/tabBar/home/index',
 			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 			}
 		},

pages/tabBar/home/index.vue

@@ -208,7 +208,6 @@
 					this.GetHomeInit();
 					this.GetHomeRecommendInfo()
 					this.GetHomeFloorInfo()
-					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -230,6 +229,7 @@
 					this.RecommendList = this.ReturnNewProducts(this.RecommendList,response.data);
 					this.skeletonShow = false;
 					this.isRequestHot = true
+					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -365,13 +365,12 @@
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
+			  path: 'pages/tabBar/home/index',
 			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 			}
 		},
 		onShow(){
 			this.modallayer = false
-			this.isRequestHot = false
 			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 				if(res == 1){
 					this.getWxAuthorize()

seller/pages/index/index.vue

@@ -89,7 +89,17 @@
 				}
 				uni.stopPullDownRefresh()
 			}
-		}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: '采美采购商城-生美/医美采购服务平台',
+			  path: 'pages/tabBar/home/index',
+			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
+			}
+		},
 	}
 </script>
 

supplier/pages/index/index.vue

@@ -89,7 +89,17 @@
 				}
 				uni.stopPullDownRefresh()
 			}
-		}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: '采美采购商城-生美/医美采购服务平台',
+			  path: 'pages/tabBar/home/index',
+			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
+			}
+		},
 	}
 </script>
 

supplier/pages/user/information.vue

@@ -1,5 +1,5 @@
 <template name='information'>
-	<view class="container">
+	<view class="container" :style="{paddingBottom :isIphoneX ? '218rpx' : '184rpx'}">
 		<view class="wrap-info">
 			<view class="row">
 				<view class="info-title">基本信息</view>
@@ -225,8 +225,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="wrap-Btn">
-			<button type="default" class="confirmBbtn" @click="shopSubmit">确定</button>
+		<view class="wrap-Btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
+			<button type="default" class="confirmBbtn" @click="shopSubmit">保存</button>
 		</view>
 		<mpvue-city-picker :themeColor="themeColor"
 							ref="mpvueCityPicker" 
@@ -334,6 +334,7 @@
 				productImagesList:[],
 				isPreviewImage:false,   	//预览图片开关
 				isMainproCheck:false,
+				isIphoneX:this.$store.state.isIphoneX,
 			}
 		},
 		onLoad() {
@@ -695,6 +696,10 @@
 </script>
 
 <style  lang="scss">
+	.container{
+		width: 100%;
+		height: auto;
+	}
 	.row{
 		line-height: 80rpx;
 		background: #f7f7f7;
@@ -1036,7 +1041,14 @@
 		 }
 	 }
 	 .wrap-Btn{
-		 margin:100rpx auto;
+		 width: 100%;
+		 height: 90rpx;
+		 position: fixed;
+		 left: 0;
+		 bottom: 0;
+		 padding-top: 40rpx;
+		 background-color: #FFFFFF;
+		 z-index: 999;
 		 .confirmBbtn{
 			 width: 600rpx;
 			 height: 90rpx;