首页弹窗广告

components/cm-module/activity/activities.vue

@@ -0,0 +1,179 @@
+<template>
+	<view>
+		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
+            <view class="tui-goods__item">
+            	<swiper class="tui-goods__ross" 
+            			circular 
+            			@change="swiperChange"
+            			:indicator-dots="false" 
+            			:autoplay="false"
+            		>
+            		<swiper-item v-for="(item, index) in list" :key="item">
+            			<view class="tui-goods__ross" @click="handleClick(item)">
+            				<image class="ross-image" :src="item.crmImage" mode=""></image>
+            			</view>
+            		</swiper-item>
+            	</swiper>
+                <text class="iconfont icon-2guanbi" @click.stop="handleClickCancel"></text>
+            </view>
+		</view>
+	</view> 
+</template>
+
+<script>
+	export default {
+		name:'tuiAlert',
+		props: {
+            list:{
+              type:Array,
+              default:[]
+            },
+			//控制显示
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//提示信息字体大小
+			size: {
+				type: Number,
+				default: 30
+			},
+			//提示信息字体颜色
+			color: {
+				type: String,
+				default: '#333'
+			},
+			//按钮字体颜色
+			btnColor: {
+				type: String,
+				default: '#EB0909'
+			},
+			btnText:{
+				type: String,
+				default: ''
+			},
+			//点击遮罩 是否可关闭
+			maskClosable: {
+				type: Boolean,
+				default: false
+			},
+            current:{
+                type: Number,
+                default: 0
+            }
+		},
+        created() {},
+		methods: {
+            swiperChange(e) {//轮播图切换
+            	this.current = e.detail.current
+            },
+			handleClick(item) {
+				this.$emit('click',item)
+			},
+			handleClickCancel() {
+				this.$emit('cancel',false)
+			},
+			discard(){
+				//丢弃
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tui-alert-box {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		position: fixed;
+		left: 0;
+		top: 100%;
+		opacity: 0;
+		background: rgba(0,0,0,.5);
+		z-index: 99999;
+        .tui-goods__item {
+        	width: 480rpx;
+        	height: 702rpx;
+        	box-sizing: border-box;
+            position: relative;
+            margin-top: 50rpx;
+        	.tui-goods__ross{
+                width: 480rpx;
+                height: 702rpx;
+        		text-align: center;
+        		color: #fff;
+        		float: left;
+                overflow: hidden;
+        		.ross-image{
+        			width: 100%;
+        			height: 100%;
+        			display: block;
+        		}
+        	}
+        }
+		
+	}
+	.tui-alert-show {
+		top: 0;
+		opacity: 1;
+		// animation:rundtop 0.5s;
+	}
+	.tui-alert-hide{
+		top: 100%;
+		opacity: 0;
+		// animation:rundbottom 0.5s;
+	}
+	.icon-2guanbi{
+		display: block;
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		color: #FFFFFF;
+		position: absolute;
+		bottom: -18%;
+		left: 50%;
+		font-size: 52rpx;
+        margin-left: -20px;
+	}
+	.tui-alert-mask-show {
+		visibility: visible;
+		opacity: 1;
+	}
+	.tui-alert-btn {
+		width: 100%;
+		height: 90rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+		box-sizing: border-box;
+		position: relative;
+		font-size: 32rpx;
+		line-height: 32rpx;
+	}
+	.tui-alert-btn-hover {
+		background-color: #f7f7f7;
+	}
+	.tui-alert-btn::before {
+		width: 100%;
+		content: "";
+		position: absolute;
+		border-top: 1rpx solid #E0E0E0;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		left: 0;
+		top: 0;
+	}
+	@keyframes rundtop{
+		0%{top: 100%;opacity: 0;}
+		100%{top:0;opacity: 1;}
+	}
+	@keyframes rundbottom{
+		0%{top: 0;opacity: 1;}
+		100%{top:100%;opacity: 0;}
+	}
+</style>

components/cm-module/activity/activityBean.vue

@@ -1,256 +1,291 @@
- <template>
-	<view>
-		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"  @touchmove.stop.prevent="discard">
-			<template v-if="beansType == 12">
-				<view class="tui-alert-image">
-					<image :src="bgImagePath" mode=""></image>
-				</view>
-			</template>
-			<template v-else>
-				<view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
-					<view class="tui-alert-content-text">恭喜您获得采美豆！</view>
-					<view class="tui-alert-content-bean">
-						<view class="tui-alert-main">
-							<image class="tui-alert-icon" src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
-							<view class="tui-alert-text">
-								<text class="icon-add">+</text>
-								<text class="icon-text">{{ beanNumber }}</text>
-							</view>
-						</view>
-					</view>
-					<view class="tui-alert-content-tips">
-						<view class="tips">采美豆可抵扣运费</view>
-					</view>
-				</view>
-			</template>
-			<text class="iconfont icon-2guanbi" :style="{bottom :beansType == 12 ? '25%' : '10%'}" @click.stop="handleClickCancel"></text>
-		</view>
-	</view> 
-</template>
-
-<script>
-	export default {
-		name:'tuiAlert',
-		props: {
-			//控制显示
-			show: {
-				type: Boolean,
-				default: false
-			},
-			//提示信息字体大小
-			size: {
-				type: Number,
-				default: 30
-			},
-			//提示信息字体颜色
-			color: {
-				type: String,
-				default: '#333'
-			},
-			//按钮字体颜色
-			btnColor: {
-				type: String,
-				default: '#EB0909'
-			},
-			btnText:{
-				type: String,
-				default: ''
-			},
-			beansType:{//根据类型设置背景图片:1注册机构，2升级资质机构，3个人机构修改资料，4资质机构修改资料，5下单成功，6线上支付成功，7确认收货成功
-				type: Number,
-				default: 1
-			},
-			beanNumber:{//采美豆显示数量
-				type:Number,
-				default:100
-			}
-		},
-		data() {
-			return{
-				bgImagePath:'https://static.caimei365.com/app/img/icon/bean-icon-2@2x.png',
-			}
-		},
-		created() {
-			this.handInitType(this.beansType)
-		},
-		methods: {
-			handInitType(type){
-				this.bgImagePath = `https://static.caimei365.com/app/img/icon/bean-icon-${type}@2x.png`
-			},
-			handleClick(e) {
-				console.log(e)
-				if (!this.show) return
-				this.$emit('click',false)
-			},
-			handleClickCancel() {
-				this.$emit('cancel',false)
-			},
-			discard(){
-				//丢弃
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tui-alert-box {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		position: fixed;
-		left: 0;
-		top: 100%;
-		opacity: 0;
-		background: rgba(51,51,51,0.7);
-		z-index: 99999;
-	}
-	.tui-alert-show {
-		top: 0;
-		opacity: 1;
-		// animation:rundtop 0.5s;
-	}
-	.tui-alert-hide{
-		top: 100%;
-		opacity: 0;
-		// animation:rundbottom 0.5s;
-	}
-	.tui-alert-image{
-		width: 626rpx;
-		height: 532rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		image{
-			width: 626rpx;
-			height: 532rpx;
-			display: block;
-		}
-	}
-	.tui-alert-content{
-		width: 580rpx;
-		height: 790rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		box-sizing: border-box;
-		padding-top: 485rpx;
-		background-size: cover;
-		.tui-alert-content-text{
-			height: 118rpx;
-			line-height: 118rpx;
-			text-align: center;
-			width: 100%;
-			font-size: $font-size-36;
-			color: #333333;
-		}
-		.tui-alert-content-bean{
-			width: 100%;
-			height: 74rpx;
-			line-height: 74rpx;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			.tui-alert-main{
-				.tui-alert-icon{
-					width: 94rpx;
-					height: 74rpx;
-					display: block;
-					float: left;
-				}
-				.tui-alert-text{
-					color: $color-system;
-					line-height: 74rpx;
-					float: left;
-					.icon-add{
-						font-size:40rpx;
-						margin:0 15rpx;
-					}
-					.icon-text{
-						font-weight: bold;
-						font-size:48rpx;
-					}
-				}
-			}
-		}
-		.tui-alert-content-tips{
-			width: 100%;
-			height: 40rpx;
-			line-height: 40rpx;
-			margin-top: 41rpx;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			.tips{
-				width: 224rpx;
-				height: 40rpx;
-				background-color: rgba(226, 91, 28, 0.1);
-				border-radius: 36rpx;
-				line-height: 40rpx;
-				font-size: $font-size-24;
-				color: $color-system;
-				text-align: center;
-			}
-		}
-	}
-	.icon-2guanbi{
-		display: block;
-		width: 100rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		text-align: center;
-		color: #FFFFFF;
-		position: absolute;
-		bottom: 13%;
-		left: 50%;
-		font-size: 58rpx;
-		margin-left: -50rpx;
-	}
-	.tui-alert-mask-show {
-		visibility: visible;
-		opacity: 1;
-	}
-	.tui-alert-btn {
-		width: 100%;
-		height: 90rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: #fff;
-		box-sizing: border-box;
-		position: relative;
-		font-size: 32rpx;
-		line-height: 32rpx;
-	}
-	.tui-alert-btn-hover {
-		background-color: #f7f7f7;
-	}
-	.tui-alert-btn::before {
-		width: 100%;
-		content: "";
-		position: absolute;
-		border-top: 1rpx solid #E0E0E0;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		left: 0;
-		top: 0;
-	}
-	@keyframes rundtop{
-		0%{top: 100%;opacity: 0;}
-		100%{top:0;opacity: 1;}
-	}
-	@keyframes rundbottom{
-		0%{top: 0;opacity: 1;}
-		100%{top:100%;opacity: 0;}
-	}
-</style>
+ <template>
+     <view>
+         <view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'tui-alert-hide']"
+             @touchmove.stop.prevent="discard" @click.stop="handleClickCancel">
+             <template v-if="beansType == 12">
+                 <view class="tui-alert-image">
+                     <image :src="bgImagePath" mode=""></image>
+                 </view>
+             </template>
+             <template v-else>
+                 <view class="tui-alert-content" :style="{'background-image': 'url('+bgImagePath+')'}">
+                     <view class="tui-alert-content-text">恭喜您获得采美豆！</view>
+                     <view class="tui-alert-content-bean">
+                         <view class="tui-alert-main">
+                             <image class="tui-alert-icon"
+                                 src="https://static.caimei365.com/app/img/icon/bean-icon@2x.png" mode=""></image>
+                             <view class="tui-alert-text">
+                                 <text class="icon-add">+</text>
+                                 <text class="icon-text">{{ beanNumber }}</text>
+                             </view>
+                         </view>
+                     </view>
+                     <view class="tui-alert-content-tips">
+                         <view class="tips">采美豆可抵扣运费</view>
+                     </view>
+                 </view>
+             </template>
+         </view>
+     </view>
+ </template>
+
+ <script>
+     export default {
+         name: 'tuiAlert',
+         props: {
+             //控制显示
+             show: {
+                 type: Boolean,
+                 default: false
+             },
+             //提示信息字体大小
+             size: {
+                 type: Number,
+                 default: 30
+             },
+             //提示信息字体颜色
+             color: {
+                 type: String,
+                 default: '#333'
+             },
+             //按钮字体颜色
+             btnColor: {
+                 type: String,
+                 default: '#EB0909'
+             },
+             btnText: {
+                 type: String,
+                 default: ''
+             },
+             beansType: { //根据类型设置背景图片:1注册机构，2升级资质机构，3个人机构修改资料，4资质机构修改资料，5下单成功，6线上支付成功，7确认收货成功
+                 type: Number,
+                 default: 1
+             },
+             beanNumber: { //采美豆显示数量
+                 type: Number,
+                 default: 100
+             }
+         },
+         data() {
+             return {
+                 bgImagePath: 'https://static.caimei365.com/app/img/icon/bean-icon-2@2x.png',
+             }
+         },
+         created() {
+             this.handInitType(this.beansType)
+         },
+         methods: {
+             handInitType(type) {
+                 this.bgImagePath = `https://static.caimei365.com/app/img/icon/bean-icon-${type}@2x.png`
+             },
+             handleClick(e) {
+                 console.log(e)
+                 if (!this.show) return
+                 this.$emit('click', false)
+             },
+             handleClickCancel() {
+                 this.$emit('cancel', false)
+             },
+             discard() {
+                 //丢弃
+             }
+         }
+     }
+ </script>
+
+ <style lang="scss">
+     .tui-alert-box {
+         width: 100%;
+         height: 100%;
+         display: flex;
+         align-items: center;
+         justify-content: center;
+         flex-direction: column;
+         position: fixed;
+         left: 0;
+         top: 100%;
+         opacity: 0;
+         background: rgba(51, 51, 51, 0.7);
+         z-index: 99999;
+     }
+
+     .tui-alert-show {
+         top: 0;
+         opacity: 1;
+         // animation:rundtop 0.5s;
+     }
+
+     .tui-alert-hide {
+         top: 100%;
+         opacity: 0;
+         // animation:rundbottom 0.5s;
+     }
+
+     .tui-alert-image {
+         width: 626rpx;
+         height: 532rpx;
+         position: absolute;
+         top: 0;
+         left: 0;
+         bottom: 0;
+         right: 0;
+         margin: auto;
+
+         image {
+             width: 626rpx;
+             height: 532rpx;
+             display: block;
+         }
+     }
+
+     .tui-alert-content {
+         width: 580rpx;
+         height: 790rpx;
+         position: absolute;
+         top: 0;
+         left: 0;
+         bottom: 0;
+         right: 0;
+         margin: auto;
+         box-sizing: border-box;
+         padding-top: 485rpx;
+         background-size: cover;
+
+         .tui-alert-content-text {
+             height: 118rpx;
+             line-height: 118rpx;
+             text-align: center;
+             width: 100%;
+             font-size: $font-size-36;
+             color: #333333;
+         }
+
+         .tui-alert-content-bean {
+             width: 100%;
+             height: 74rpx;
+             line-height: 74rpx;
+             box-sizing: border-box;
+             display: flex;
+             flex-direction: column;
+             align-items: center;
+
+             .tui-alert-main {
+                 .tui-alert-icon {
+                     width: 94rpx;
+                     height: 74rpx;
+                     display: block;
+                     float: left;
+                 }
+
+                 .tui-alert-text {
+                     color: $color-system;
+                     line-height: 74rpx;
+                     float: left;
+
+                     .icon-add {
+                         font-size: 40rpx;
+                         margin: 0 15rpx;
+                     }
+
+                     .icon-text {
+                         font-weight: bold;
+                         font-size: 48rpx;
+                     }
+                 }
+             }
+         }
+
+         .tui-alert-content-tips {
+             width: 100%;
+             height: 40rpx;
+             line-height: 40rpx;
+             margin-top: 41rpx;
+             box-sizing: border-box;
+             display: flex;
+             flex-direction: column;
+             align-items: center;
+
+             .tips {
+                 width: 224rpx;
+                 height: 40rpx;
+                 background-color: rgba(226, 91, 28, 0.1);
+                 border-radius: 36rpx;
+                 line-height: 40rpx;
+                 font-size: $font-size-24;
+                 color: $color-system;
+                 text-align: center;
+             }
+         }
+     }
+
+     .icon-2guanbi {
+         display: block;
+         width: 100rpx;
+         height: 100rpx;
+         line-height: 100rpx;
+         text-align: center;
+         color: #FFFFFF;
+         position: absolute;
+         bottom: 13%;
+         left: 50%;
+         font-size: 58rpx;
+         margin-left: -50rpx;
+     }
+
+     .tui-alert-mask-show {
+         visibility: visible;
+         opacity: 1;
+     }
+
+     .tui-alert-btn {
+         width: 100%;
+         height: 90rpx;
+         display: flex;
+         align-items: center;
+         justify-content: center;
+         background-color: #fff;
+         box-sizing: border-box;
+         position: relative;
+         font-size: 32rpx;
+         line-height: 32rpx;
+     }
+
+     .tui-alert-btn-hover {
+         background-color: #f7f7f7;
+     }
+
+     .tui-alert-btn::before {
+         width: 100%;
+         content: "";
+         position: absolute;
+         border-top: 1rpx solid #E0E0E0;
+         -webkit-transform: scaleY(0.5);
+         transform: scaleY(0.5);
+         left: 0;
+         top: 0;
+     }
+
+     @keyframes rundtop {
+         0% {
+             top: 100%;
+             opacity: 0;
+         }
+
+         100% {
+             top: 0;
+             opacity: 1;
+         }
+     }
+
+     @keyframes rundbottom {
+         0% {
+             top: 0;
+             opacity: 1;
+         }
+
+         100% {
+             top: 100%;
+             opacity: 0;
+         }
+     }
+ </style>

mixins/appMixins.js

@@ -28,15 +28,15 @@ const appMixins = {
                     this.$store.commit('updateStatus',error.data)
                     this.updateRossShow()
                     uni.setStorageSync('unionId',error.data.unionId)
-                    if(!this.hasLogin && this.couponEntry === 1){
-                        if(uni.getStorageSync('isActivitySwitch')){
-                            const  lockTime = uni.getStorageSync('lockTime')
-                            const  eTime = this.diffTime(lockTime)
-                            this.$store.dispatch('setActivityFn',eTime)
-                        }else{
-                            this.$store.dispatch('setActivityFn',true)
-                        }
-                    }
+                    // if(!this.hasLogin && this.couponEntry === 1){
+                    //     if(uni.getStorageSync('isActivitySwitch')){
+                    //         const  lockTime = uni.getStorageSync('lockTime')
+                    //         const  eTime = this.diffTime(lockTime)
+                    //         this.$store.dispatch('setActivityFn',eTime)
+                    //     }else{
+                    //         this.$store.dispatch('setActivityFn',true)
+                    //     }
+                    // }
                 })
         },		
         appUpdataRefresh(){

pages/seller/cart/components/immediatelyList.vue

@@ -390,43 +390,41 @@ export default {
 				sortField: '',
 				sortType: ''
 			})
-				.then(response => {
-					this.isShowWrapper = true
-					const resData = JSON.parse(response.data)
-					const resList = resData.items
-					if (resList && resList.length > 0) {
-						this.totalPage = resData.total
-						this.showEmpty = false
-						if (loadMore) {
-							this.listData = [...this.listData, ...resList]
-							this.getProductPrice()
-						} else {
-							this.listData = [...resList]
-							this.getProductPrice()
-						}
-						// 防上拉暴滑
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						// 底部提示文案
-						if (this.totalPage > this.listData.length) {
-							this.loadingText = '上拉加载更多'
-						} else {
-							this.showLoading = true
-							this.loadingNow = false
-						}
-					} else {
-						if (!loadMore) {
-							this.isShowEmpty = true
-							this.isShowEmptyText = '暂无相关商品'
-						}
-					}
-					this.showSkeleton = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+            .then(response => {
+                this.isShowWrapper = true
+                const resData = JSON.parse(response.data)
+                if(resData){
+                    const resList = resData.items
+                    this.totalPage = resData.total
+                    this.showEmpty = false
+                    if (loadMore) {
+                        this.listData = [...this.listData, ...resList]
+                        this.getProductPrice()
+                    } else {
+                        this.listData = [...resList]
+                        this.getProductPrice()
+                    }
+                    // 防上拉暴滑
+                    this.pullFlag = false
+                    setTimeout(() => {
+                        this.pullFlag = true
+                    }, 500)
+                    // 底部提示文案
+                    if (this.totalPage > this.listData.length) {
+                        this.loadingText = '上拉加载更多'
+                    } else {
+                        this.showLoading = true
+                        this.loadingNow = false
+                    }
+                }else{
+                    this.isShowEmpty = true
+                    this.isShowEmptyText = '暂无相关商品'
+                }
+                this.showSkeleton = false
+            })
+            .catch(error => {
+                this.$util.msg(error.msg, 2000)
+            })
 		},
 		getProductPrice() {
 			//获取商品或者活动价格
@@ -499,40 +497,40 @@ export default {
 				pageSize: this.zuhepageSize,
 				searchWord: this.searchInputVal
 			})
-				.then(response => {
-					this.isShowWrapper = true
-					const responseData = response.data
-					console.log(responseData)
-					if (responseData.results && responseData.results.length > 0) {
-						this.hasNextPage = responseData.hasNextPage
-						this.isShowEmpty = false
-						if (loadMore) {
-							this.combinationProduct = [...this.combinationProduct, ...responseData.results]
-						} else {
-							this.combinationProduct = [...responseData.results]
-							this.showSkeleton = false
-						}
-						// 防上拉暴滑
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						// 底部提示文案
-						if (this.hasNextPage) {
-							this.loadingText = '上拉加载更多'
-						} else {
-							this.showLoading = true
-							this.loadingNow = false
-						}
-					} else {
-						this.isShowEmpty = true
-						this.showSkeleton = false
-						this.isShowEmptyText = '暂无相关商品'
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+            .then(response => {
+                this.isShowWrapper = true
+                const responseData = response.data
+                console.log(responseData)
+                if (responseData.results && responseData.results.length > 0) {
+                    this.hasNextPage = responseData.hasNextPage
+                    this.isShowEmpty = false
+                    if (loadMore) {
+                        this.combinationProduct = [...this.combinationProduct, ...responseData.results]
+                    } else {
+                        this.combinationProduct = [...responseData.results]
+                        this.showSkeleton = false
+                    }
+                    // 防上拉暴滑
+                    this.pullFlag = false
+                    setTimeout(() => {
+                        this.pullFlag = true
+                    }, 500)
+                    // 底部提示文案
+                    if (this.hasNextPage) {
+                        this.loadingText = '上拉加载更多'
+                    } else {
+                        this.showLoading = true
+                        this.loadingNow = false
+                    }
+                } else {
+                    this.isShowEmpty = true
+                    this.showSkeleton = false
+                    this.isShowEmptyText = '暂无相关商品'
+                }
+            })
+            .catch(error => {
+                this.$util.msg(error.msg, 2000)
+            })
 		},
 		changeCountAdd(item, pros) {
 			//商品数量加加
@@ -660,7 +658,8 @@ export default {
 				this.isShowClose = false
 				this.loadingNow = false
 				this.isShowEmpty = true
-				this.isShowEmptyText = '暂无相关商品'
+				this.isShowEmptyText = '暂无相关商品'
+                this.getProductAgainInfo()
 			} else {
 				this.searchInputVal = ''
 				this.isShowClose = false

pages/seller/components/category.vue

@@ -146,7 +146,7 @@
 </script>
 <style lang="scss">
 	.category {
-		width: 100%;
+		width: 750rpx;
 		height: 100%;
 		position: relative;
 		background: #FFFFFF;

pages/seller/components/user.vue

@@ -156,11 +156,11 @@
                         path: '/pages/seller/login/register-select',
                         icon: 'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png'
                     },
-                    {
-                        name: '待注册机构',
-                        path: '/pages/seller/club/stayClub-list',
-                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png'
-                    },
+                    // {
+                    //     name: '待注册机构',
+                    //     path: '/pages/seller/club/stayClub-list',
+                    //     icon: 'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png'
+                    // },
                     {
                         name: '我的名片',
                         path: '/pages/seller/remarks/business-card',
@@ -176,11 +176,11 @@
                         path: '/pages/seller/remarks/list',
                         icon: 'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png'
                     },
-                    {
-                        name: '邀请运营人员',
-                        path: '/pages/seller/club/allClub-list',
-                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png'
-                    }
+                //     {
+                //         name: '邀请运营人员',
+                //         path: '/pages/seller/club/allClub-list',
+                //         icon: 'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png'
+                //     }
                 ],
                 firstList: [{
                         name: '优惠券',
@@ -286,7 +286,7 @@
     @import '@/uni.scss';
 
     .user {
-        width: 100%;
+        width: 750rpx;
         height: 100%;
         position: relative;
         background-color: #f7f7f7;

pages/tabBar/home/index.js

@@ -26,14 +26,16 @@ const homeMiXins = {
             options: {}, // 分享数据
             bankInfo:{},
             flootData: [], // 楼层
-            bannerImageList: [], // 轮播
+            bannerImageList: [], // 轮播
+            centerImage: [], // 优惠弹窗
             navBarsList: [], // 导航分类
             shortcutList: [], // 快捷运营
             newsList: [], // 公告
             templateData: {},
             hotListPageFloor: [], // 新品橱窗
             pageList: [], // 楼层
-            supplierObj: {}, // 供应商列表
+            supplierObj: {}, // 供应商列表
+            centerImageShow:false,
         }
     },
     computed: {
@@ -126,7 +128,8 @@ const homeMiXins = {
         			this.skeletonShow = false
         			this.navBarsList = data.topMenuList
         			this.couponEntry = data.couponEntry
-        			this.newsList = data.annlist
+        			this.newsList = data.annlist
+        			
                     this.shortcutList = data.shortcutList || [] // 快捷运营
         			if (!this.hasLogin && this.couponEntry === 1) {
                         this.$store.commit('updateCouponEntry', data.couponEntry)
@@ -135,7 +138,21 @@ const homeMiXins = {
         				} else {
         					this.$store.commit('setActivity', true)
         				}
-        			}
+        			}
+                    if(data.centerImage && data.centerImage.length > 0){
+                        this.centerImage = data.centerImage
+                        // 获取当前日期的字符串表示（YYYY-MM-DD）
+                        const currentDate = new Date().toISOString().split('T')[0]
+                        console.log('currentDate',currentDate)
+                        // 从localStorage获取上次显示弹窗的日期
+                        const lastPopupDate = uni.getStorageSync('lastPopupDate')
+                        console.log('lastPopupDate',lastPopupDate)
+                        // 检查今天是否已经显示过弹窗
+                        if (lastPopupDate !== currentDate) {
+                            // 显示弹窗和遮罩层
+                            this.centerImageShow = true
+                        }
+                    }
         			this.GetHomeTopDataInfo()
         			this.GetHomeFloorInfo()
         			if (this.hasLogin) {
@@ -173,6 +190,18 @@ const homeMiXins = {
         	this.$store.commit('setActivity', data)
         	uni.setStorageSync('lockTime', Date.now())
         	uni.setStorageSync('isActivitySwitch', true)
+        },
+        // 关闭广告弹窗
+        handleCenterImageCancelClick(){
+            const currentDate = new Date().toISOString().split('T')[0]
+            console.log('currentDate',currentDate)
+            // 更新localStorage中的上次显示弹窗的日期
+            uni.setStorageSync('lastPopupDate', currentDate)
+            this.centerImageShow = false
+        },
+        // 广告弹窗跳转
+        handleCenterImageClick(item){
+            this.$api.FlooryNavigateTo(item)
         },
         handleBeanlClick() {
         	this.isActivityBean = false

pages/tabBar/home/index.vue

@@ -33,7 +33,9 @@
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :isShowKefu='false' :bottom="130" />
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick" />
+		<!-- <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick" /> -->
+		<!-- 活动弹窗 -->
+		<activityAlert :show="centerImageShow" :list="centerImage" @click="handleCenterImageClick" @cancel="handleCenterImageCancelClick" />
 		<!-- 采美豆提示弹窗 -->
 		<activityBean
 			v-if="isActivityBean"
@@ -55,7 +57,7 @@ import pageFloor from './components/pageFloor.vue'
 import hotFloor from './components/hotFloor.vue'
 import pageSpecial from './components/pageSpecial.vue'
 import supplierList from './components/supplierList.vue'
-import activityAlert from '@/components/cm-module/activity/activity.vue'
+import activityAlert from '@/components/cm-module/activity/activities.vue'
 import activityBean from '@/components/cm-module/activity/activityBean.vue'
 import cmSellerModal from '@/components/cm-share-popup/cm-seller-modal.vue'
 import homeMiXins from './index.js'
@@ -141,7 +143,7 @@ export default {
 		    }
 		    
 		}
-		console.log(this.suid, "uni.getStorageSync('spId')", uni.getStorageSync('spId'))
+		console.log(this.suid, 'uni.getStorageSync(\'spId\')', uni.getStorageSync('spId'))
 	},
 	onHide() {
 		this.autoplay = false

store/index.js

@@ -21,7 +21,7 @@ const store = new Vuex.Store({
         wechatUserInfo: {},
         cartNumber: 0,
         isIphoneX: false,
-        isActivity: false, // 首页活动弹窗
+        isActivity: true, // 首页活动弹窗
         isLoginType: 0,
         isManage: false,// 是否是管理员或者小组长
         shopAdvert:[] // 供应商广告图列表
@@ -169,7 +169,6 @@ const store = new Vuex.Store({
             state.couponEntry = couponEntry
         },
         setActivity(state, variable) { // 记录活动弹窗状态
-           
             state.isActivity = variable
         },
         setChangeVar(state, variable) {