商户引导页bug修复

pages/gather/gather.vue

@@ -151,7 +151,6 @@
 				</view>
 			</view>
 		</view>
-
 		<!--轮播图-->
 		<view class="swiperBg" style="margin-top: 12px;">
 			<view class="swiper page_swiper">
@@ -182,8 +181,9 @@
 			<view class="content">
 				<block v-if="nowMenuList.length > 0">
 					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-            <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"  @longpress="editFlag = true">
+						<view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)"
-              <image class="icon_img" :src="item.pic" mode="aspectFit">
+							@longpress="editFlag = true">
+							<image class="icon_img gatherDiver" :src="item.pic" mode="aspectFit">
 							</image>
 							<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
 							<view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
@@ -255,6 +255,7 @@
 		},
 		data() {
 			return {
+				elInfo: '',
 				imgUrls: [{
 					img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
 				}],
@@ -290,7 +291,13 @@
 			...mapGetters(['userInfo', 'location', 'isLogin'])
 		},
 		created() {},
-    onLoad() {},
+		onLoad() {
+			let that = this
+			uni.$on('diverGatherSubEmit', function(data) {
+				that.clickMenu(that.nowMenuList[0])
+			})
+
+		},
 		onShow() {
 			this.street = this.$store.state.storage.address.townName;
 			this.getNav();
@@ -310,7 +317,26 @@
 			uni.stopPullDownRefresh()
 		},
 		beforeDestroy() {},
-    mounted() {},
+		onReady() {
+			if (uni.getStorageSync('is_new_user')) {
+				let that = this
+				setTimeout(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query
+						.select(".gatherDiver")
+						.boundingClientRect((data) => {
+							let info = JSON.stringify(data)
+							that.elInfo = data
+							// #ifdef APP-PLUS
+							setTimeout(() => {
+								that.openDiver()
+							}, 500)
+							// #endif
+						})
+						.exec();
+				}, 1000)
+			}
+		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
 			const scrollTop = e.scrollTop;
@@ -330,10 +356,15 @@
 			uni.$emit('showLoading', false);
 		},
 		methods: {
-      changeSwiper(e){
+			openDiver() {
-        if(e.length>0 && e[1].value){
+				const subNVue = uni.getSubNVueById('concat')
+				subNVue.show('zoom-out', 300)
+				uni.$emit('diverGatherEmit', this.elInfo);
+			},
+			changeSwiper(e) {
+				if (e.length > 0 && e[1].value) {
 					uni.navigateTo({
-            url:e[1].value
+						url: e[1].value
 					})
 				}
 			},
@@ -434,6 +465,10 @@
 						if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
 						else now.push(item)
 					})
+					// if()
+					if (uni.getStorageSync('is_new_user') && !now.length) now[0] = all[0];
+					console.log(all, now)
+
 					this.AllMenuList = all;
 					this.nowMenuList = now;
 				} catch (e) {
@@ -525,8 +560,8 @@
 				});
 			},
 			// 点击空白区域完成添加
-      clickWhite(){
+			clickWhite() {
-        if(this.editFlag) this.editFlag = false;
+				if (this.editFlag) this.editFlag = false;
 			}
 		}
 	};

pages/gather/subnvue/concat.nvue

@@ -0,0 +1,148 @@
+<template>
+	<view class="" style="width: 750rpx;height: 100%;">
+		<view class="tabbar" :style="{top:(top-12)+'px',left:(left-12)+'px'}">
+			<image src="/static/images/fabu.png" class="tab-icon"></image>
+		</view>
+		<view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
+		</view>
+		<view class="center" :style="{left:(left+20)+'px',  top:(top+60)+'px'}">
+			<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
+		</view>
+		<view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}">
+			<view class="tras" :class="{act:isActive}">
+				<text class="font" style="line-height: 106rpx;">点击供销助农平台进入商户平台</text>
+			</view>
+		</view>
+		<view class="next-btn center">
+			<text class="next-btn-text font" @click="next">下一步(2/4)</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isActive: false,
+				left: 0,
+				top: 0,
+				subNVue: null,
+				offsetX: 0,
+				offsetY: 0,
+				iconWidth: 0,
+			}
+		},
+		methods: {
+			next() {
+				this.subNVue.hide('zoom-in', 300, )
+				setTimeout(() => {
+					uni.$emit('diverGatherSubEmit');
+					uni.setStorageSync('is_new_user', false)
+				}, 500)
+
+			}
+		},
+		onLoad() {
+			let that = this
+			this.subNVue = uni.getSubNVueById('concat')
+			uni.$on('diverGatherEmit', (data) => {
+				console.log('收到data', data)
+				that.left = data.left
+				that.top = data.top
+			})
+			setTimeout(() => {
+				that.isActive = true
+			}, 500)
+		}
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+	}
+
+	.center {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+	}
+
+	.tabbar {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+	}
+
+	.tab-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.te {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointe {
+		position: absolute;
+	}
+
+
+	.tras {
+		padding-left: 20rpx;
+		position: absolute;
+		z-index: 999 !important;
+		width: 20px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+	}
+
+	.next-btn {
+		position: absolute;
+		bottom: 100rpx;
+		left: 375rpx;
+		transform: translateX(-50%);
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+	}
+
+	.next-btn-text {
+		line-height: 76rpx;
+		text-align: center;
+
+	}
+</style>

pages/index/index.vue

@@ -11,8 +11,8 @@
 					<!-- #ifdef H5 -->
 					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu"
 						:dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled"
-						@changeDiy="changeDiy"></homeComb>
+						@changeDiy="changeDiy">
-					<!-- <card></card> -->
+					</homeComb>
 					<view v-for="(item, index) in styleConfig" :key="index">
 						<block
 							v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
@@ -83,7 +83,6 @@
 							@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
 					</block>
 					<!-- #endif -->
-
 					<view class="main" v-show="navIndex == 0">
 						<!-- 首页推荐 -->
 						<view v-if="recommend_switch == 1" class="index-product-wrapper">
@@ -260,7 +259,7 @@
 		<passwordPopup></passwordPopup>
 		<!-- #endif -->
 		<!--自定义底部tab栏-->
-		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
+		<!-- <customTab :newData="newData" :activeRouter="activeRouter"></customTab> -->
 		<view v-if="overflow" class="overflow-mask" @touchmove.stop.prevent="() => {}"></view>
 	</view>
 </template>
@@ -430,6 +429,8 @@
 		},
 		data() {
 			return {
+				subNvue: null,
+				diverFlag: true,
 				domain: HTTP_REQUEST_URL,
 				couponTypeMsg: {
 					10: '通用券',
@@ -596,6 +597,11 @@
 		},
 		// #endif
 		onLoad(options) {
+
+			// #ifdef APP
+			this.subNVue = uni.getSubNVueById('concatIndex')
+			// #endif
+
 			let that = this
 			this._options = options;
 			this.diyId = options.diyId || 0;
@@ -620,7 +626,22 @@
 		},
 		onShow() {
 			let that = this;
+			if (this.diverFlag && uni.getStorageSync('is_new_user')) {
+				setTimeout(() => {
+					that.openDiver()
+					that.diverFlag = false
+				}, 500)
+				uni.$on('diverIndexSubEmit', function(data) {
+					console.log("收到关闭通知")
+					that.subNVue.hide('slide-out-right', 300)
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/gather/gather'
+						})
+					}, 400)
 
+				})
+			}
 			that.isIntegral = uni.getStorageSync('isIntegral')
 			// #ifdef APP-PLUS
 			if (that.appUpdate.openUpgrade == '1') {
@@ -665,6 +686,10 @@
 			// #endif
 		},
 		methods: {
+			openDiver() {
+				this.subNVue.show('slide-in-left', 300)
+				uni.$emit('diverIndexEmit', this.userInfo);
+			},
 			loadCoupon() {
 				if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {
 					getNewPeopleCouponLst().then(res => {
@@ -1256,6 +1281,9 @@
 				}
 			}
 		},
+		onReady() {
+
+		}
 	};
 </script>
 <style>

pages/index/subnvue/concat.nvue

@@ -0,0 +1,200 @@
+<template>
+	<view class="" style="width: 750rpx;height: 100%;">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn" :style="{top:(offsetY-250)+'px'}">
+			<text class="next-btn-text font" @click="next">下一步(1/4)</text>
+		</view>
+
+		<view class="tips center" v-if='isStore' :style="{top:(offsetY-178)+'px'}">
+			<view class="tras" :class="{act:isActive}">
+				<text class="font" style="line-height: 106rpx;">点击生产页面，进入办公助手</text>
+			</view>
+		</view>
+
+		<view class="tips" v-else :style="{top:(offsetY-178)+'px',left:(screenWidth/4-50)+'px'}">
+			<view class="tras" :class="{act:isActive}">
+				<text class="font" style="line-height: 106rpx;">点击生产页面，进入办公助手</text>
+			</view>
+		</view>
+
+		<view class="center" v-if="isStore" :style="{top:(offsetY-120)+'px'}">
+			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
+		</view>
+		<view v-else style="position: absolute;" :style="{top:(offsetY-120)+'px',left:(screenWidth/4+16)+'px'}">
+			<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
+		</view>
+
+		<view v-if='isStore' class="tabbar" :style="{top:(offsetY-68)+'px'}">
+			<image src="/static/images/fabu.png" class="tab-icon"></image>
+			<text class="te">工作台</text>
+		</view>
+		<view v-else class="tabbar2" :style="{top:(offsetY-68)+'px',left:(screenWidth/4)+'px'}">
+			<image src="/static/images/fabu.png" class="tab-icon"></image>
+			<text class="te">工作台</text>
+		</view>
+
+		<view v-if='isStore' class="pointe" :style="{top:(offsetY-58)+'px'}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
+		</view>
+		<view v-else class="pointe2" :style="{top:(offsetY-58)+'px',left:(screenWidth/4)+'px'}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isActive: false,
+				subNVue: null,
+				screenWidth: 400,
+				offsetX: 0,
+				offsetY: 0,
+				isStore: false,
+			}
+		},
+		methods: {
+			next() {
+				uni.$emit('diverIndexSubEmit');
+
+			},
+			jump() {
+				uni.setStorageSync('is_new_user', false)
+				uni.$emit('diverIndexSubEmit');
+			}
+		},
+		onLoad() {
+			uni.$on('diverIndexEmit', (data) => {
+				this.isStore = Boolean(data.mer_info?.mer_name)
+			})
+			let that = this
+			this.subNVue = uni.getSubNVueById('concatIndex')
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.offsetY = res.screenHeight
+					this.screenWidth = res.screenWidth
+				})
+			});
+			setTimeout(() => {
+				that.isActive = true
+			}, 1000)
+
+		}
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+	}
+
+	.center {
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+	}
+
+	.tabbar {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+		left: 375rpx;
+		transform: translateX(-50%);
+		/* bottom: 0; */
+	}
+
+	.tabbar2 {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+		position: absolute;
+	}
+
+	.tab-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.te {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointe {
+		position: absolute;
+		left: 420rpx;
+		transform: translateX(-50%);
+	}
+
+	.pointe2 {
+		position: absolute;
+	}
+
+	.tras {
+		padding-left: 20rpx;
+		position: absolute;
+		z-index: 999 !important;
+		width: 20px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+	}
+
+	.next-btn {
+		position: absolute;
+		/* bottom: 100rpx; */
+		left: 375rpx;
+		transform: translateX(-50%);
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+	}
+
+	.next-btn-text {
+		line-height: 76rpx;
+		text-align: center;
+	}
+
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 20rpx;
+		border-radius: 30rpx;
+	}
+</style>