commit -m 美博会专题页

components/cm-module/activity/activity_01.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<image src="http://static-b.caimei365.com/app/meibohui/meibo@_01.png" mode="" @click.stop="handleClick"></image>
+			<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_01.png" mode="" @click.stop="handleClick"></image>
 			<text class="iconfont icon-2guanbi" @click.stop="handleClickCancel"></text>
 		</view>
 	</view>
@@ -73,8 +73,8 @@
 		z-index: 99999;
 		image{
 			width: 606rpx;
-			height: 661rpx;
-			margin-top: 100rpx;
+			height: 510rpx;
+			margin-top: 130rpx;
 		}
 	}
 	.tui-alert-show {
@@ -95,9 +95,9 @@
 		text-align: center;
 		color: #FFFFFF;
 		position: absolute;
-		top: 25%;
+		top: 30%;
 		left: 69%;
-		font-size: 60rpx;
+		font-size: 52rpx;
 	}
 	.tui-alert-mask-show {
 		visibility: visible;

h5/pages/activity/meobohui-booth.vue

@@ -3,8 +3,8 @@
 		<!-- 展位图 -->
 		<view class="container-page clearfix">
 			<view class="tui-group-list">
-				<view class="floor-item-booth" v-for="(booths,index) in boothList" :key="index">
-					<view class="floor-item-booth-image" @click="previewImg(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>
 					<view class="floor-item-text">
@@ -40,19 +40,16 @@
 				isLogin:false,
 				skeletonShow: true,
 				boothList:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_01.png',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_02.png',name:'采美信息技术有限公司',num:'21F'},
-					{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'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_01.png',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_02.png',name:'采美信息技术有限公司',num:'21F'},
-					{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'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_01.png',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img@_02.png',name:'采美信息技术有限公司',num:'21F'},
-					{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'}
-				],
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_06.jpg',name:'品辉(可现场体验)',num:'B区 11.2馆H49'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_07.jpg',name:'和创元(可现场体验)',num:'B区 11.2馆F41'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_08.jpg',name:'瑞恺迪(可现场体验)',num:'B区 12.2 馆E40'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_09.jpg',name:'塑美颜(可现场体验)',num:'B区11.2 D41'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_10.jpg',name:'塑美颜(可现场体验)',num:'B区13.2 K29'}
+				],				
 				productImage:[],
 				isScrollTop:false,
 
@@ -138,6 +135,7 @@
 					width: 100%;
 					height: 100%;
 					display: block;
+					border-radius: 16rpx 16rpx 0 0;
 				}
 			}
 			.floor-item-text{

h5/pages/activity/meobohui-supplier.vue

@@ -3,7 +3,7 @@
 		<!-- 参展商 -->
 		<view class="container-page clearfix">
 			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplier(supps.id)">
+				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
 					<image :src="supps.image" class="floor-item-image" mode=""></image>
 				</view>
 			</view>
@@ -34,21 +34,21 @@
 				skeletonShow: true,
 				userIdentity:'',
 				supplierList2:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo@_01.png',id:23456}
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_10.jpg',id:1206,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_11.jpg',id:1258,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_12.jpg',id:1184,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_13.jpg',id:1193,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_14.jpg',id:1292,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_15.jpg',id:1201,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_16.jpg',id:1217,type:1,keyWord:''}
 				],
 				isScrollTop:false
 			}
@@ -61,8 +61,12 @@
 		},
 		methods: {
 			...mapMutations(['login','logout']),
-			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+			goSupplierPath(type,value,keyWord){
+				if(type == 1){
+					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+				}else if(type == 2){
+					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
+				}
 			},
 		},
 		onPageScroll(e){//实时获取到滚动的值

h5/pages/activity/meobohui.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="container home clearfix">
 		<!-- top -->
-		<view class="container-top"><image src="http://static-b.caimei365.com/app/meibohui/banner.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>
+		<view class="container-top"><image src="http://static.caimei365.com/app/meibohui/banner.jpg" mode=""></image></view>
+		<view class="container-activ" @click="LookMyCouponDetils"><image src="http://static.caimei365.com/app/meibohui/meibo_coupon_02.png" mode=""></image></view>
 		<!-- VIP品牌线上馆 -->
 		<view class="container-page clearfix">
 			<view class="tui-group-name">
@@ -12,7 +12,7 @@
 				<view class="tui-sub__desc">高新科技品牌尽在采美</view>
 			</view>
 			<view class="tui-group-list">
-				<view class="floor-item-vip" v-for="(vips,index) in supplierList1" :key="index" @click="goSupplier(supps.id)">
+				<view class="floor-item-vip" v-for="(vips,index) in supplierList1" :key="index" @click="goSupplierPath(vips.type,vips.id,vips.keyWord)">
 					<image :src="vips.image" class="floor-item-image" mode=""></image>
 				</view>
 			</view>
@@ -30,7 +30,7 @@
 				<view class="tui-sub__desc">美博会采美合作品牌</view>
 			</view>
 			<view class="tui-group-list">
-				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplier(supps.id)">
+				<view class="floor-item-sup" v-for="(supps,index) in supplierList2" :key="index" @click="goSupplierPath(supps.type,supps.id,supps.keyWord)">
 					<image :src="supps.image" class="floor-item-image" mode=""></image>
 				</view>
 			</view>
@@ -84,8 +84,8 @@
 		<view class="container-page clearfix" v-for="(floors,index) in flootData" :key="index">
 			<view class="tui-group-name">
 				<view class="tui-group-title">
-					<view class="tui-group-l">{{floors.shopName}}</view>
-					<view class="tui-group-r" @click="goSupplier(floors.shopId)">
+					<view class="tui-group-l">{{ floors.shopName }}</view>
+					<view class="tui-group-r" v-if="floors.shopId != 1161" @click="goSupplierPath(floors.type,floors.shopId,floors.keyWord)">
 						<text>更多</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
@@ -223,48 +223,46 @@
 				skeletonShow: true,
 				userIdentity:'',
 				supplierList1:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_sup_01.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_sup_02.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_sup_03.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_sup_04.jpg',id:23456}
+					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_01.jpg',id:1172,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_02.jpg',id:1172,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_03.jpg',id:1170,type:2,keyWord:'INDIBA'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_sup_04.jpg',id:1258,type:1,keyWord:''}
 				],
 				supplierList2:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_08.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_10.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_11.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_12.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_13.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_14.jpg',id:23456},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_logo_15.jpg',id:23456},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_01.jpg',id:1172,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_02.jpg',id:8888,type:2,keyWord:'INDIBA'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_03.jpg',id:8888,type:2,keyWord:'维锶'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_04.jpg',id:8888,type:2,keyWord:'imperium'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_05.jpg',id:8888,type:2,keyWord:'易路达'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_06.jpg',id:8888,type:2,keyWord:'ACTIVE'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_07.jpg',id:1201,type:1,keyWord:''},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_logo_09.jpg',id:1285,type:1,keyWord:''},
 				],
 				liveList:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.jpg',liveTitle:'不同阶段的痘重磅上由...',optionTitle:'直播详情'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.jpg',liveTitle:'不同阶段的痘重磅上由...',optionTitle:'直播详情'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_01.jpg',liveTitle:'不同阶段的痘重磅上由...',optionTitle:'直播详情'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_live@_02.jpg',liveTitle:'不同阶段的痘重磅上由...',optionTitle:'直播详情'}
+					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_01.jpg',liveTitle:'采美LIVE带你体验美博会现场氛围',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_01.jpg'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_02.jpg',liveTitle:'探访美博会采美合作展位上',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_02.jpg'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_03.jpg',liveTitle:'探访美博会采美合作展位下',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_03.jpg'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_05.jpg',liveTitle:'探访VIP品牌INDIBA体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_04.jpg'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_live@_04.jpg',liveTitle:'探访VIP品牌科医人体验点',optionTitle:'直播详情',liveImg:'http://static.caimei365.com/app/meibohui/meibo_live_05.jpg'},
 				],
 				boothList:[
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_01.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_06.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_07.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_08.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_09.jpg',name:'采美信息技术有限公司',num:'21F'},
-					{image:'http://static-b.caimei365.com/app/meibohui/meibo_img_10.jpg',name:'采美信息技术有限公司',num:'21F'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_02.jpg',name:'GMS(可现场体验)',num:'B区 12.2馆C31'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_03.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_04.jpg',name:'唯美概念(可现场体验)',num:'B区 12.2馆B41'},
+					{image:'http://static.caimei365.com/app/meibohui/meibo_img_05.jpg',name:'美生美(可现场体验)',num:'B区 12.2馆B39'},
 				],
 				SuppierNoteList:[
-					{shopId:1161,marke:'我的描述文件'}
+					{shopId:1172,marke:'光子嫩肤的黄金标准——美国高端技术品牌',type:1,keyWord:''},
+					{shopId:1161,marke:'专注于细胞治疗的西班牙高端技术品牌',type:2,keyWord:'INDIBA'},
+					{shopId:1258,marke:'专注于进口医学美容仪器及产品',type:1,keyWord:''},
+					{shopId:1193,marke:'坚持原装进口先进光电设备',type:1,keyWord:''},
+					{shopId:1285,marke:'国货之光——专注医学美容术前术后修复',type:1,keyWord:''},
+					{shopId:1184,marke:'专注于进口国际顶级医疗美容设备',type:1,keyWord:''},
+					{shopId:1292,marke:'专注于进口国际品牌医疗美容设备和医用级护肤品',type:1,keyWord:''},
+					{shopId:1205,marke:'致力于韩国原装进口高端美容仪器',type:1,keyWord:''},
+					{shopId:1201,marke:'专注原装进口国际高端高科技美容设备',type:1,keyWord:''},
+					{shopId:1206,marke:'致力于光学医疗美容设备的研发',type:1,keyWord:''},
+					{shopId:1217,marke:'专注于原装进口国际医疗美容设备',type:1,keyWord:''},
 				],
 				flootData:[],//楼层
 				isScrollTop:false,
@@ -297,7 +295,7 @@
 		methods: {
 			...mapMutations(['login','logout']),
 			LookMyCouponDetils(){//点击优惠券 跳转处理
-				if(this.login){
+				if(this.hasLogin){
 					if(this.userIdentity == 2 || this.userIdentity == 4){
 						this.$api.navigateTo('/pages/user/coupon/coupon')
 					}else if(this.userIdentity == 3){
@@ -341,11 +339,15 @@
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
 				this.isModallayer = false;
 			},
-			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+			goSupplierPath(type,value,keyWord){
+				if(type == 1){
+					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+				}else if(type == 2){
+					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
+				}
 			},
 			LiveGoPathPros(live){
-				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.optionTitle}&image=${live.image}`)
+				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.optionTitle}&image=${live.liveImg}`)
 			},
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){
@@ -383,9 +385,9 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: '生美医美正品采购服务平台',
+			  title: '美博会震撼开启，重磅优惠等你来领~',
 			  path: '/h5/pages/activity/meobohui',
-			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
+			  imageUrl:'http://static.caimei365.com/app/meibohui/meibo_share_01.jpg'
 			}
 		},
 		onShow(){
@@ -479,6 +481,7 @@
 				width: 100%;
 				height: 100%;
 				display: block;
+				border-radius: 16rpx;
 			}
 		}
 		.floor-item-sup{
@@ -514,6 +517,7 @@
 					width: 100%;
 					height: 100%;
 					display: block;
+					border-radius: 16rpx 16rpx 0 0;
 				}
 			}
 			.floor-item-text{
@@ -569,6 +573,7 @@
 					width: 100%;
 					height: 100%;
 					display: block;
+					border-radius: 16rpx 16rpx 0 0;
 				}
 			}
 			.floor-item__text{

pages/tabBar/user/user.vue

@@ -101,7 +101,7 @@
 			<!-- 底部跳转 -->
 			<view class="foot-list">
 				<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
-					<image src="http://static-b.caimei365.com/app/meibohui/meibo@_02.png" mode=""></image>
+					<image src="http://static.caimei365.com/app/meibohui/meibo_coupon_03.png" mode=""></image>
 				</view>
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigator(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">

pages/user/coupon/coupon.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="container home clearfix">
-		<image class="coupon-image" src="http://static-b.caimei365.com/app/meibohui/meibo@_04.jpg" mode=""></image>
+		<view class="coupon-title" v-if="userIdentity == 4">优惠券仅限{{userName}}（机构）使用 </view>
+		<view class="coupon-title" v-if="userIdentity == 2">优惠券仅限{{userName}}使用 </view>
+		<image class="coupon-image" src="http://static.caimei365.com/app/meibohui/meibo_coupon_04.jpg" mode=""></image>
 	</view>
 </template>
 
@@ -12,7 +14,8 @@
 		},
 		data() {
 			return {
-
+				userName:'',
+				userIdentity:0
 			}
 		},
 		onLoad() {
@@ -25,21 +28,43 @@
 
 		},
 		onShow(){
-			
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.userName = resolve.name;
+				this.userIdentity = resolve.userIdentity
+			}).catch(error =>{
+				
+			})
 		}
 	}
 </script>
 
 <style lang="scss">
 	page{
-		background-color: #e15616;
+		background-color: #ff2e4c;
 	}
 	.container{
 		width: 100%;
 		height: auto;
+		.coupon-title{
+			width: 100%;
+			height: 110rpx;
+			line-height: 110rpx;
+			font-size: $font-size-28;
+			font-weight: bold;
+			background-image: linear-gradient(0deg, #fffaec 0%, #fff7d6 50%, #fff4b9 100%), linear-gradient(#fffaef, #fffaef);
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			color: #fd3c5b;
+			text-align: center;
+		}
 		.coupon-image{
 			width: 100%;
-			height: 1588rpx;
+			height: 2381rpx;
+			display: block;
+			
 		}
 	}
 </style>

services/ajax.env.js

@@ -4,8 +4,8 @@ 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.75:8008'	 //超超联调地址
-    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'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'