commit-m 活动

common/config/config.js

@@ -1,9 +1,7 @@
 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.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.68:8008'	 	//涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
 	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址

components/cm-custom/custom-p.vue

@@ -9,7 +9,7 @@
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
-				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索项目仪器</view>
+				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
 			</view>
 	  	</view>
 	</view>

components/cm-module/headerNavbar/header-poduct.vue

@@ -9,7 +9,7 @@
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+30)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
-				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索采美商品</view>
+				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
 			</view>
 	  	</view>
 	</view>

components/cm-module/homeIndex/banner.vue

@@ -20,7 +20,7 @@
 					<text class="iconfont icon-zhengpin"><text class="sm">正品保证</text></text>
 				</view>
 				<view class="item ce">
-					<text class="iconfont icon-jigou"><text class="sm">500+机构</text></text>
+					<text class="iconfont icon-jigou"><text class="sm">5000+机构</text></text>
 				</view>
 				<view class="item ri">
 					<text class="iconfont icon-gongyingshang"><text class="sm">100+供应商</text></text>

components/cm-module/homeIndex/customer.vue

@@ -7,8 +7,10 @@
 	  	</view>
 		<view class="search-input">
 			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<text>{{hotSearchText}}</text>
+				<view class="search-icon">
+					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				</view>
+				<view class="search-text">{{hotSearchText}}</view>
 			</view>
 		</view>
 	</view>
@@ -30,7 +32,7 @@
 		data() {
 			return{
 				clickPath:'/pages/search/search',
-				hotSearchText:'你想要的这里都有',
+				hotSearchText:'搜索商品/供应商/项目仪器',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
 				fontSizeSetting:this.fontSizeSetting,
@@ -117,31 +119,41 @@
 	}
 	.search-input{
 		width: 100%;
-		height: 70rpx;
-		padding: 20rpx 0 20rpx 0;
+		height: 110rpx;
+		padding: 20rpx 24rpx;
+		box-sizing: border-box;
 		.gosearch-btn{
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			width: 662rpx;
+			width: 100%;
 			height: 100%;
 			border-radius: 40rpx;
 			background: #F0F0F0;
 			margin: 0 auto;
-			padding:0 20rpx;
 			font-size: 28rpx;
 			line-height: 70rpx;
 			color: #8A8A8A;
 			background: #FFFFFF;
-			.icon-iconfonticonfontsousuo1{
-				margin:0 6rpx;
-				font-size: 34rpx;
+			position: relative;
+			box-sizing: border-box;
+			padding-left: 80rpx;
+			.search-icon{
+				width: 80rpx;
+				height: 70rpx;
+				position:absolute ;
+				left: 0;
+				top: 2rpx;
+				text-align: center;
+				line-height: 70rpx;
+				.icon-iconfonticonfontsousuo1{
+					margin:0 6rpx;
+					font-size: $font-size-34;
+					color: #8A8A8A;
+					z-index: 10;
+				}
+			}
+			.search-text{
+				font-size: $font-size-24;
+				line-height: 70rpx;
 				color: #8A8A8A;
-				z-index: 10;
 			}
 		}
 	}

components/cm-module/homeIndex/hotProduct.vue

@@ -7,47 +7,49 @@
 					<swiper-item v-for="(product,index) in hotProductList" :key="index">
 						<view class="floor-item" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
 							<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
+							<image class="item-icon-type" :src="iconNew" mode="" v-if="item.actType === 2"></image>
+							<image class="item-icon-type" :src="iconHot" mode="" v-if="item.actType === 1"></image>
 							<view class="floor-item-content">
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
 								</view>
 								<view class="" v-if="hasLogin">
-									<template v-if="userIdentity == 4">
-										<view class="title-none" v-show="item.priceFlag == '1'">
+									<template v-if="userIdentity === 4">
+										<view class="title-none" v-if="item.priceFlag === 1">
 											<text class="p big">￥未公开价格</text>
 										</view>
-										<view class="title-none" v-show="item.priceFlag == '2'">
+										<view class="title-none"  v-if="item.priceFlag === 2">
 											<text class="p big">￥价格仅会员可见</text>
 										</view>
-										<view class="price tui-skeleton-rect" v-show="item.priceFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										<view class="price tui-skeleton-rect" v-if="item.priceFlag === 0" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
 											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-											<template v-if="item.actStatus==1">
+											<template v-if="item.actStatus===1">
 												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
+													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
 												</view>
 												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 											</template>
-											<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+											<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
 												<view class="floor-tags">阶梯价格</view>	
 											</template>
 										</view>
 									</template>
-									<template v-if="userIdentity == 3">
+									<template v-if="userIdentity === 3">
 										<template v-if="item.supplierId == shopId">
-											<view class="title-none" v-if="item.priceFlag == '1'">
+											<view class="title-none" v-if="item.priceFlag === 1">
 												<text class="p big">￥未公开价格</text>
 											</view>
 											<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 												<text class="p sm">￥</text>
 												<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-												<template v-if="item.actStatus==1">
+												<template v-if="item.actStatus===1">
 													<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-														{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}} {{ shopId }}{{item.supplierId }}</text>
+														{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}} {{ shopId }}{{item.supplierId }}</text>
 													</view>
 													<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 												</template>
-												<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+												<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
 													<view class="floor-tags">阶梯价格</view>	
 												</template>
 											</view>
@@ -62,19 +64,19 @@
 										</template>
 									</template>
 									<template v-else>
-										<view class="title-none" v-if="item.priceFlag == '1'">
+										<view class="title-none" v-if="item.priceFlag === 1">
 											<text class="p big">￥未公开价格</text>
 										</view>
 										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
 											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-											<template v-if="item.actStatus==1">
+											<template v-if="item.actStatus === 1">
 												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
+													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
 												</view>
 												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 											</template>
-											<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+											<template v-if="item.actStatus === 0  &&  item.ladderPriceFlag===1">
 												<view class="floor-tags">阶梯价格</view>	
 											</template>
 										</view>
@@ -86,7 +88,7 @@
 										<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 										<template v-if="item.actStatus==1">
 											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-												{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
+												{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
 											</view>
 											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 										</template>
@@ -133,7 +135,9 @@
 				swiperCurrent:0,
 				hotProductList:[],
 				pageSize:4,
-				shopId:0
+				shopId:0,
+				iconNew:'http://static-b.caimei365.com/app/img/icon/icon-new.png',
+				iconHot:'http://static-b.caimei365.com/app/img/icon/icon-hot.png',
 			}
 		},
 		filters: {
			NumFormat:function(text) {//处理金额
				return Number(text).toFixed(2);
			},
		},
@@ -221,9 +225,18 @@
 					float: left;
 					box-sizing: border-box;
 					padding-bottom: 10rpx;
+					position: relative;
 					&:nth-child(2n){
 						margin-right: 0;
 					}
+					.item-icon-type{
+						width: 48rpx;
+						height: 62rpx;
+						display: block;
+						position: absolute;
+						top: 20rpx;
+						right: 20rpx;
+					}
 					.item-img{
 						width: 341rpx;
 						height: 341rpx;

h5/pages/activity/activity.vue

@@ -31,8 +31,12 @@
 					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
-				case '223':
+				case '280':
 					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_03.html'
+					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
+					break;
+				case '223':
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});
 					break;
 			}

pages/goods/product.vue

@@ -397,10 +397,9 @@
 						this.buyRetailPrice = this.product.retailPrice;
 					}
 					//处理下架商品和售罄商品
-					if(this.product.validFlag =='3' || this.stock == 0 ){
+					if(this.product.validFlag =='3' || this.product.validFlag =='10' || this.stock == 0 ){
 						this.disabled = true
 						this.isNoneDisabled = true
-						this.goodsData.disabledText = '下架'
 					}else{
 						this.disabled = false
 						this.isNoneDisabled = false
@@ -421,6 +420,9 @@
 					if(this.product.validFlag =='3'){
 						this.goodsData.disabledText = '下架'
 					}
+					if(this.product.validFlag =='10'){
+						this.goodsData.disabledText = '停售'
+					}
 					if(this.stock == 0){
 						this.goodsData.disabledText = '售罄'
 					}

pages/search/search.vue

@@ -462,7 +462,7 @@
 				font-size: 36rpx;
 				color: #8A8A8A;
 				position: absolute;
-				right: 24rpx;
+				right: 10rpx;
 				top: 0;
 				padding: 0 10rpx;
 				z-index: 100;
@@ -472,6 +472,8 @@
 				height: 100%;
 				float: left;
 				font-size: $font-size-24;
+				box-sizing: border-box;
+				padding-right: 66rpx;
 			}
 		}
 		.search-btn{

pages/tabBar/category/category.vue

@@ -43,7 +43,7 @@
 		data() {
 			return {
 				headerShow:true,
-				hotSearchText: '你想要的这里都有',
+				hotSearchText: '搜索商品/供应商/项目仪器',
 				clickPath:'/pages/search/search',
 				showCategoryIndex: 0,
 				//分类列表

pages/tabBar/user/user.vue

@@ -4,6 +4,7 @@
 		<view class="user-section">
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
+					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1">{{name}}</text>
@@ -12,9 +13,11 @@
 						</view>
 						<view class="user-item amount"><text class="u-p">账户余额：{{userMoney}}元</text></view>
 					</view>
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
 				</view>
 				<view class="header-main-none" v-else>
+					<view class="header-icon" @click="navigator('/pages/login/login')">
+						<image src="../../../static/temp/icon-club@3x.png" mode=""></image>
+					</view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1" @click="navigator('/pages/login/login')">账号登录</text><text class="u-h1 line">|</text>
@@ -28,9 +31,6 @@
 							<view class="u-btn"><text>邀请码登录</text><text class="iconfont icon-xiangyouhuabeifen"></text></view>
 						</view>
 					</view>
-					<view class="header-icon" @click="navigator('/pages/login/login')">
-						<image src="../../../static/temp/icon-club@3x.png" mode=""></image>
-					</view>
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">
@@ -374,6 +374,8 @@
 			flex: 8;
 			display: flex;
 			flex-direction: column;
+			box-sizing: border-box;
+			padding-left: 20rpx;
 			.user-item{
 				flex: 1;
 				height: 64rpx;

services/ajax.env.js

@@ -1,8 +1,6 @@
 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.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址

supplier/pages/user/my-product.vue

@@ -157,8 +157,8 @@
 					{name: '审核未通过',value:8},
 					{name: '已上架',value:2},
 					{name: '已下架',value:3},
-					{name: '已冻结',value:9},
-					{name: '已隐身',value:10},
+					{name: '已冻结',value:10},
+					{name: '已隐身',value:9},
 					{name: '已删除',value:0},
 				],
 				classificationFirstList:[],
@@ -207,8 +207,8 @@
 						'3':'已下架',
 						'1':'待审核',
 						'8':'审核未通过',
-						'9':'已冻结',
-						'10':'已隐身',
+						'9':'已隐身',
+						'10':'已冻结',
 						'0':'已删除'
 					};
 				Object.keys(stateTextObject).forEach(function(key) {
@@ -274,11 +274,11 @@
 			},	
 			handleDataList(){//根据商品状态set不同的tabAction返回新的数据
 				this.dataList.forEach(item =>{
-					if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '10'){
+					if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
 						item.actions = [
 							{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
 						]
-					}else if(item.validFlag === '1' || item.validFlag === '9'){
+					}else if(item.validFlag === '1' || item.validFlag === '10'){
 						item.actions = [
 							{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
 						]
@@ -315,11 +315,11 @@
 				this.classificationThreeList = [];
 			},
 			handlerButton(e,item){//监听侧滑按钮点击事件
-				if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '10'){
+				if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
 					if(e.index == 0){
 						return
 					}
-				}else if(item.validFlag === '1' || item.validFlag === '9'){
+				}else if(item.validFlag === '1' || item.validFlag === '10'){
 					if(e.index == 0){
 						this.$api.navigateTo(`/pages/goods/product?id=${item.productID}`)
 					}

supplier/pages/user/my-shop.vue

@@ -29,7 +29,7 @@
 				</view>
 				<banner :list="bannerImageList"></banner>
 			</view>	
-			<view class="container-section tui-skeleton">
+			<view class="container-section tui-skeleton" v-show="productList.length>0">
 				<view class="tab-title">主推商品</view>
 				<view class="section-product clearfix">
 					<view class="floor-item-none"  v-if="isHomeProduct">