commit -m 美博会专题

components/cm-module/activity/activity_01.vue

@@ -70,7 +70,7 @@
 		top: 100%;
 		opacity: 0;
 		background: rgba(0,0,0,.5);
-		z-index: 99990;
+		z-index: 99999;
 		image{
 			width: 606rpx;
 			height: 661rpx;

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

@@ -16,6 +16,8 @@
 			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
 			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
+		<!-- 活动弹窗 -->
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 	</view>
@@ -133,7 +135,7 @@
 				})
 			},
 			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
 				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){

components/cm-module/homeIndex/navbars.vue

@@ -47,6 +47,7 @@
 						1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
 						3:`/h5/pages/article/path-live`,
 						10:`/second/pages/product/product-list`,
+						21:`/h5/pages/activity/meobohui`,
 						14:`/h5/pages/other/brand`,
 						15:`/h5/pages/other/repair`,
 						18:`/h5/pages/article/path?link=${pros.link}`,

components/cm-module/supplier/home.vue

@@ -16,6 +16,8 @@
 			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
 			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
+		<!-- 活动弹窗 -->
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 	</view>
@@ -133,7 +135,7 @@
 				})
 			},
 			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
 				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){

h5/pages/activity/meobohui-booth.vue

@@ -70,7 +70,7 @@
 		methods: {
 			...mapMutations(['login','logout']),
 			previewImg (index) {//顶部商品图片预览
-				// isPreviewImg = true
+				isPreviewImg = true
 				let previewUrls = this.productImage
 				uni.previewImage({
 					current: index, 	//图片索引

h5/pages/activity/meobohui.vue

@@ -2,7 +2,7 @@
 	<view class="container home clearfix">
 		<!-- top -->
 		<view class="container-top"><image src="http://static-b.caimei365.com/app/meibohui/meibo@_05.jpg" mode=""></image></view>
-		<view class="container-activ"><image src="http://static-b.caimei365.com/app/meibohui/meibo@_03.jpg" mode=""></image></view>
+		<view class="container-activ" @click="LookMyCouponDetils"><image src="http://static-b.caimei365.com/app/meibohui/meibo@_03.jpg" mode=""></image></view>
 		<!-- VIP品牌线上馆 -->
 		<view class="container-page clearfix">
 			<view class="tui-group-name">
@@ -50,7 +50,7 @@
 							<view class="floor-item__image">
 								<image :src="lives.image" mode=""></image>
 							</view>
-							<view class="floor-item__text">{{lives.text}}</view>
+							<view class="floor-item__text">{{lives.liveTitle}}</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -69,7 +69,7 @@
 				<view class="tui-sub__desc">展位图描述词</view>
 			</view>
 			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index">
+				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index" @click="previewImg(index)">
 					<view class="floor-item-booth-image">
 						<image :src="booths.image" class="floor-item-image" mode=""></image>
 					</view>
@@ -90,7 +90,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 				</view>
-				<view class="tui-sub__desc">展位图描述词</view>
+				<view class="tui-sub__desc">{{ floors.marke }}</view>
 			</view>
 			<view class="tui-group-good__scroll clearfix">
 				<scroll-view scroll-x>
@@ -205,9 +205,9 @@
 	import authorize from '@/common/config/authorize.js'
 	import uniGrader from '@/components/uni-grade/uni-grade.vue'
 	import modalLayer from "@/components/modal-layer"
-	
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
+	var isPreviewImg;
 	export default {
 		components:{
 			uniGrader,
@@ -239,10 +239,10 @@
 					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456}
 				],
 				liveList:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.png',text:'不同阶段的痘重磅上由...'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.png',text:'不同阶段的痘重磅上由...'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.png',text:'不同阶段的痘重磅上由...'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.png',text:'不同阶段的痘重磅上由...'}
+					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.png',liveTitle:'不同阶段的痘重磅上由...'},
+					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.png',liveTitle:'不同阶段的痘重磅上由...'},
+					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.png',liveTitle:'不同阶段的痘重磅上由...'},
+					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.png',liveTitle:'不同阶段的痘重磅上由...'}
 				],
 				boothList:[
 					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_01.png',name:'采美信息技术有限公司',num:'21F'},
@@ -250,15 +250,28 @@
 					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_03.png',name:'采美信息技术有限公司',num:'21F'},
 					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_04.png',name:'采美信息技术有限公司',num:'21F'}
 				],
+				SuppierNoteList:[
+					{shopId:1161,marke:'我的描述文件'}
+				],
 				flootData:[],//楼层
 				isScrollTop:false,
 				isRequest:false,
 				isNavRequest:false,
 				isLiveRequest:false,
+				productImage:[],
 			}
 		},
 		onLoad() {
-			
+			this.modallayer = false
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.clubStatus = resolve.clubStatus
+				this.userID = resolve.userID ? resolve.userID : 0;
+				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userIdentity = resolve.userIdentity
+				this.GetActitityInit()
+			}).catch(error =>{
+				this.GetActitityInit()
+			})
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
@@ -270,13 +283,43 @@
 		},
 		methods: {
 			...mapMutations(['login','logout']),
-			GetActitityInit(){//金刚区分类
+			LookMyCouponDetils(){//点击优惠券 跳转处理
+				if(this.login){
+					if(this.userIdentity == 2 || this.userIdentity == 4){
+						this.$api.navigateTo('/pages/user/coupon/coupon')
+					}else if(this.userIdentity == 3){
+						this.$api.navigateTo('/supplier/pages/index/index')
+					}else{
+						return;
+					}
+				}else{
+					this.$api.navigateTo('/pages/login/login')
+				}
+			},
+			GetActitityInit(){
 				this.ActivityService.GetRepeatActivityFloorData({userId:this.userID}).then(response =>{
-					this.flootData = response.data
+					this.flootData = this.ReturnNewFlootData(response.data,this.SuppierNoteList)
+					console.log(this.flootData);
+					//处理商品图片列表
+					this.productImage =[]
+					this.boothList.forEach(item =>{
+						this.productImage.push(item.image);
+					})
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
+			ReturnNewFlootData(listA,listB){
+				let NewArray = []
+				listA.map(item=>{
+					for (let i = 0; i < listB.length; i++) {
+						if( item.shopId == listB[i].shopId ){
+							NewArray.push(Object.assign(item,listB[i])) 
+						}
+					}
+				});
+				return NewArray
+			},
 			NavToDetailPage(path){
 				this.$api.navigateTo(path)
 			},
@@ -289,8 +332,27 @@
 				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
 			},
 			LiveGoPathPros(live){
-				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
-			}
+				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.liveTitle}&image=${live.image}`)
+			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+			previewImg (index) {//顶部商品图片预览
+				// isPreviewImg = true
+				let previewUrls = this.productImage
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
+			},
 		},
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>400){
@@ -314,16 +376,7 @@
 			}
 		},
 		onShow(){
-			this.modallayer = false
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity
-				this.GetActitityInit()
-			}).catch(error =>{
-				this.GetActitityInit()
-			})
+		
 		}
 	}
 </script>
@@ -613,7 +666,7 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
-					text-indent: 100rpx;
+					text-indent: 95rpx;
 				}
 				.mclap-tag{
 					display: block;

pages/goods/product.vue

@@ -67,9 +67,8 @@
 											  :ladderPriceList="ladderPriceList"/>
 								</view>
 								<view class="p-title tui-skeleton-fillet">
-									<view class="p-title-name">
-										{{product.name == undefined ? '' : product.name}}
-									</view>
+									<view class="mclap-tag" v-if="product.beautyActFlag == '1'">美博会</view>
+									<view class="p-title-name" :class="product.beautyActFlag == '1' ? 'indent' : ''"> {{product.name == undefined ? '' : product.name}} </view>
 									<button open-type="share" class="p-title-share tui-share-position" @tap="onShare">
 										<view class=""><text class="iconfont icon-fenxiang1"></text></view>
 										<view class="">分享</view>
@@ -838,6 +837,23 @@
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 2;
 					overflow: hidden;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 6rpx;
 				}
 				.p-title-share{
 					width: 96rpx;

services/ajax.env.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	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'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

store/index.js

@@ -18,7 +18,7 @@ const store = new Vuex.Store({
 		isLoginProductId:0
 	},
 	mutations: {
-		login(state, provider) {
+		login(state, provider) {//用户身份 1、协销 2、会员机构 3、供应商 4.普通机构
 			state.hasLogin = true;
 			state.userInfo = provider;
 			uni.setStorage({//缓存用户登陆状态
@@ -40,7 +40,7 @@ const store = new Vuex.Store({
 			state.isWxAuthorize = true
 			// console.log(state.isWxAuthorize)
 			state.wechatUserInfo = provider;
-			uni.setStorage({//缓存用户登陆状态
+			uni.setStorage({//缓存用户登陆状态 
 			    key: 'wechatUserInfo',
 			    data: provider
 			})

supplier/pages/user/my-shop.vue

@@ -41,7 +41,8 @@
 						<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
-								<text class="mclap">{{isInterceptHtmlFn(item.name)}}</text>
+								<text class="mclap-tag" v-if="item.beautyActFlag == '1'">美博会</text>
+								<text class="mclap" :class="item.beautyActFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
 							</view>
 							<view class="floor-item-act">
 								<template v-if="userIdentity === 3">
@@ -141,7 +142,8 @@
 						<image class="item-img tui-skeleton-fillet" :src="item.p_image" mode="aspectFill"></image>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
-								<text class="mclap">{{isInterceptHtmlFn(item.p_name)}}</text>
+								<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
+								<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.p_name)}}</text>
 							</view>
 							<view class="floor-item-act">
 								<template v-if="userIdentity === 3">
@@ -328,6 +330,7 @@
 			GetSupplierHomeProduct(){//主推商品
 				this.ShopService.GetSupplierHomeProduct({supplierId:this.supplierId}).then(response =>{
 					let data = response.data
+					console.log('主推商品',data)
 					if(data.length>0){
 						this.isHomeProduct = false
 						this.QueryProductPrice(data)
@@ -341,6 +344,7 @@
 			GetSupplierHomeProductList(){//全部商品
 				this.ShopService.GetSupplierHomeProductList(this.listQuery).then(response =>{
 					let data = JSON.parse(response.data)
+					console.log('全部商品',data)
 					let dataList = data.items
 					this.total = data.total
 					if(this.total>0){
@@ -387,6 +391,7 @@
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
 					this.productList = this.ReturnNewProducts1(data,response.data);
+					console.log('合并价格后',this.productList)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -735,6 +740,8 @@
 					display: flex;
 					flex-direction: column;
 					margin-bottom: 15rpx;
+					padding: 0;
+					position: relative;
 					.mclap{
 						width: 100%;
 						line-height:40rpx;
@@ -745,6 +752,23 @@
 						-webkit-line-clamp: 2;
 						overflow: hidden;
 						font-size: 26rpx;
+						&.indent{
+							text-indent: 95rpx;
+						}
+					}
+					.mclap-tag{
+						display: block;
+						width: 84rpx;
+						height: 32rpx;
+						background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+						border-radius: 4rpx 48rpx 4px 4px;
+						line-height: 32rpx;
+						font-size: $font-size-22;
+						color: #FFFFFF;
+						text-align: center;
+						position: absolute;
+						left: 0;
+						top: 0;
 					}
 				}
 				.no-price{