commit -m 商品专题

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

components/cm-module/homeIndex/banner.vue

@@ -55,7 +55,6 @@
 				this.current = index;
 			},
 			NavToDetailPage(floor) {//跳转
-				console.log(floor)
 				/**
 				 * 页面跳转类型
 				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
@@ -66,6 +65,7 @@
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
 					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
 					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,

components/cm-module/orderDetails/goodsList.vue

@@ -196,14 +196,16 @@
 					.floor-tags{
 						float: left;
 						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
 						line-height: 36rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						margin-left: 15rpx;
+						border: 1px solid #E15616;
 					}
 				}
 			}

components/cm-module/supplier/supplierDetails.vue

@@ -1,28 +1,19 @@
 <template name="supplier">
 	<!-- 供应商信息 -->
 	<view class="supplier clearfix">
-		<view class="sup-header">
-			<view class="header-img">
-				<image :src="shopData.logo" mode=""></image>
-			</view>
-			<view class="header-txt">
-				<text>{{shopData.name}}</text>
+		<view class="product-supplier" @click="goSupplier">
+			<view class="logo"><img :src="shopData.logo" alt=""></view>
+			<view class="main">
+				<view class="name">{{ shopData.name }}</view>
+				<view class="massgs">
+					<view class="label">满意度:</view>
+					<view class="p-stars">
+						<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="sup-msg massage-t">
-			<view class="sup-h1">
-				<text class="line">公司基本信息</text>
-			</view>
-			<view class="sup-title">
-				<text class="tit-l">公司名称:</text>
-				<text >{{shopData.name}}</text>
-			</view>
-			<view class="sup-stars">
-				<text class="tit-l">满意度:</text>
-				<view class="p-stars">
-					<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="44" :widthInfo="180"></uni-stars>
-				</view>
-			</view>
 			<view class="sup-conte">
 				<view class="conte-l">
 					<text class="tit-l">经营范围:</text>
@@ -81,11 +72,11 @@
 </template>
 
 <script>
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	export default{
 		name:'supplier',
 		components:{
-			uniStars
+			uniGrader
 		},
 		props:{
 			shopId:{
@@ -95,8 +86,8 @@
 		data() {
 			return{
 				shopData:{},
-				iconClass:'icon-xingxing',
-				iconColor:'#FF9100'
+				iconClass:'icon-aixin',
+				iconColor:'#ff9100',
 			}
 		},
 		created() {
@@ -130,8 +121,10 @@
 </script>
 
 <style lang="scss">	
-.supplier{
+page{
 	background: #FFFFFF;
+}
+.supplier{
 	width: 100%;
 	.sup-msg{
 		width: 100%;
@@ -139,59 +132,66 @@
 		.sup-h1{
 			height: 80rpx;
 			line-height: 80rpx;
-			font-size: $font-size-30;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
-			border-bottom: 1px solid #EFEFEF;
+			font-weight: bold;
 			.line{
 				position: relative;
-				padding-left: 15rpx;
-				&:after{
-					content: '';
-					width: 6rpx;
-					height: 28rpx;
-					background: #FFA347;
-					position: absolute;
-					left: 0;
-					top: 6rpx;
-				}						
 			}
 		}
 	}
-	.sup-header{
-		height: 158rpx;
-		width: 702rpx;
-		padding: 28rpx 24rpx 24rpx 24rpx;
-		display: flex;
-		background: #FFFFFF;
-		.header-img{
-			width: 216rpx;
-			height: 100%;
+	.product-supplier{
+		width: 100%;
+		height: 140rpx;
+		padding:30rpx 24rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+		box-sizing: border-box;
+		.logo{
+			width: 128rpx;
+			height: 92rpx;
+			float: left;
+			border: 1px solid #efefef;
+			border-radius: 6rpx;
 			image{
 				width: 100%;
 				height: 100%;
+				display: block;
+				border-radius: 6rpx;
 			}
 		}
-		.header-txt{
-			width:460rpx;
-			display: flex;
-			align-items: center;
-			text{
-				display: flex;
-				flex: 1;
-				margin-left: 26rpx;
-				line-height: 40rpx;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+		.main{
+			width: 470rpx;
+			height: 92rpx;
+			float: left;
+			margin-left: 20rpx;
+			.name{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				float: right;
 				overflow: hidden;
+				text-overflow:ellipsis;
+				white-space: nowrap;
 				text-align: left;
-				font-size: $font-size-30;
-				color: $text-color;
-				font-weight: bold;
+			}
+			.massgs{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-24;
+				color: #999999;
+				.label{
+					float: left;
+				}
+				.p-stars{
+					float: left;
+					margin-left: 20rpx;
+				}
 			}
 		}
 	}
@@ -237,28 +237,29 @@
 		.sup-conte{
 			width: 100%;
 			margin-top: 24rpx;
-			display: flex;
 			.conte-l{
-				width: 142rpx;
+				width: 100%;
+				margin-bottom: 15rpx;
 				.tit-l{
 					text-align: left;
 					display: inline-block;						
 					line-height: 40rpx;
 					font-size: $font-size-28;
 					color: $text-color;
+					font-weight: bold;
 				}
 			}
 			.conte-r{
-				width: 540rpx;
+				width: 100%;
 				.age{
 					display: inline-block;
 					padding: 0 20rpx;
-					background: #FFF6E6;
+					background: #86b2fb;
 					height: 42rpx;
 					line-height: 42rpx;
 					text-align: center;
 					font-size: $font-size-24;
-					color: #666666;
+					color: #FFFFFF;
 					border-radius: 6rpx;
 					margin-right: 24rpx;
 					margin-bottom: 24rpx;
@@ -271,12 +272,11 @@
 			}
 		}
 		.sup-p{
-			padding: 24rpx 0;
-			line-height: 40rpx;
+			line-height: 48rpx;
 			text-align: left;
 			font-size: $font-size-28;
 			color: #666666;
-			text-indent: 20rpx;
+			text-indent: 40rpx;
 			&.center{
 				text-align: center;
 			}

h5/pages/activity/activity-list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="activity-container">
 		<scroll-view scroll-y="true" >
-			<view class="list" v-for="(item, index) in list" :key="index">
+			<view class="list" v-for="(item, index) in list" :key="index" @click="NavigateToActivity(item)">
 				<image class="list-image" :src="item.image" mode="scaleToFill"></image>
 				<view class="title">{{item.title}}</view>
 				<view class="time" v-show="item.status!=3">
@@ -95,9 +95,13 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			navToDetailPage() {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
-			},
+			NavigateToActivity(item){//跳转活动详情
+				if(item.status!=3){
+					this.$api.navigateTo(`/h5/pages/activity/activity?id=${item.linkParam.id}`)
+				}else{
+					this.$util.msg('活动已经结束',2000)
+				}
+			}
 		},
 		onReachBottom() {
 			if(this.hasNextPage){

h5/pages/activity/activity.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="activity">
-		<image @click.stop="navToDetailPage" src="https://img.caimei365.com/group1/M00/03/9A/Cmis216Zf8GAb_UqABE6NiwUUZs004.jpg" mode="widthFix"></image>
-	   <!-- <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view> -->
+	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
 	</view>
 </template>
 
@@ -20,14 +19,24 @@
 	    },
 		onLoad(option) {
 			console.log(option)
-			this.activityPath = option.path
-			this.productID = option.productID
-			uni.setNavigationBarTitle({title:'多重精华,多重修复'});
+			switch(option.id){
+				case '277':
+					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_01.html'
+					uni.setNavigationBarTitle({title:'三昭国际优惠'});
+					break;
+				case '278':
+					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_02.html'
+					uni.setNavigationBarTitle({title:'点斗优惠'});
+					break;
+				case '223':
+					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_03.html'
+					uni.setNavigationBarTitle({title:'品牌OEM服务'});
+					break;
+			}
+			
 		},
 		methods:{
-			navToDetailPage() {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
-			},
+			
 		}
 	}
 </script>

pages.json

@@ -599,8 +599,7 @@
 				},{
 					"path": "pages/user/supplier",
 					"style": {
-						"navigationBarTitleText": "供应商信息",
-						"enablePullDownRefresh":true
+						"navigationBarTitleText": "供应商信息"
 					}
 				},{
 					"path": "pages/order/order-list",

pages/goods/goods-secondary.vue

@@ -22,13 +22,13 @@
 			<template v-if="isActivityFlag">
 				<view class="activity-container">
 					<scroll-view scroll-y="true" >
-						<view class="list" v-for="(item, index) in activityList" :key="index">
+						<view class="list" v-for="(item, index) in activityList" :key="index" @click="NavigateToActivity(item)">
 							<image class="list-image" :src="item.image" mode="scaleToFill"></image>
 							<view class="title">{{item.title}}</view>
-							<view class="time" v-show="item.status!=3">
+							<view class="time" v-if="item.status!=3">
 								<view class="text">{{item.detail }}</view>
 							</view>
-							<view class="mack" v-show="item.status == 3">
+							<view class="mack" v-if="item.status == 3">
 								<view class="mack-text">活动已经结束</view>
 							</view>
 						</view>
@@ -190,7 +190,6 @@
 						}else{
 							this.pullUpOn = false
 							this.loadding = false
-							console.log('2222222222222')
 							this.nomoreText = '已至底部'
 						}
 					}
@@ -213,6 +212,13 @@
 					this.GetPageTopicInfo(this.headTabId)
 				}
 			},
+			NavigateToActivity(item){//跳转活动详情
+				if(item.status!=3){
+					this.$api.navigateTo(`/h5/pages/activity/activity?id=${item.linkParam.id}`)
+				}else{
+					this.$util.msg('活动已经结束',2000)
+				}
+			},
 			NavToDetailPage(floor) {//跳转
 				console.log(floor)
 				/**
@@ -257,7 +263,7 @@
 		onPullDownRefresh() {//下拉刷新
 			if(this.isActivityFlag){
 				this.listQuery.pageNum =1
-				this.GetPromotionsrListBottomData()
+				this.GetPromotionsrList()
 				uni.stopPullDownRefresh()
 			}else{
 				this.GetPageTopicInfo(this.headTabId)
@@ -352,6 +358,7 @@
 				background: rgba(0,0,0,.4);
 				color: #FFFFFF;
 				line-height: 70rpx;
+				font-size: $font-size-26;
 			}
 		}
 	}

pages/goods/product.vue

@@ -974,14 +974,16 @@
 				.floor-tags{
 					float: right;
 					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
 					line-height: 36rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					margin-left: 15rpx;
+					border: 1px solid #E15616;
 				}
 			}
 			.floor-item-btn{

pages/search/search.vue

@@ -170,12 +170,14 @@
 		},
 		onLoad(option) {
 			this.isFocus = true
+			console.log(option)
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord
 				this.setSearchHistoryAdd()
 				this.getListFromServer()
+			}else{
+				this.initGetSerachRecord()
 			}
-			this.initGetSerachRecord()			
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
@@ -679,17 +681,18 @@
 			box-sizing: border-box;
 			float: right;
 			.floor-tags{
-				float: right;
 				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
 				line-height: 36rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
-				margin-top: 9rpx;
 				font-size: $font-size-20;
+				margin-left: 15rpx;
+				border: 1px solid #E15616;
+				float: right;
 			}
 		}
 		.price-icon {

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

supplier/pages/user/my-shop.vue

@@ -420,7 +420,7 @@
 				return false
 			},
 			goSupplier(){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.shopId)
+				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.supplierId)
 			},
 			navToDetailPage(id) {//跳转商品详情页
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)