From bff1ced9fdb3c5cfe847c99f02e0cc371938aa07 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sun, 28 Apr 2024 18:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=BC=95=E5=AF=BC=E9=A1=B5bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gather/gather.vue          | 1471 +++++++++++++++---------------
 pages/gather/subnvue/concat.nvue |  148 +++
 pages/index/index.vue            |   36 +-
 pages/index/subnvue/concat.nvue  |  200 ++++
 4 files changed, 1133 insertions(+), 722 deletions(-)
 create mode 100644 pages/gather/subnvue/concat.nvue
 create mode 100644 pages/index/subnvue/concat.nvue

diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 073ca26..312dec7 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,792 +1,827 @@
 <style lang="scss" scoped>
-  .gather {
-    .gather-header {
-      background-color: #40AE36;
+	.gather {
+		.gather-header {
+			background-color: #40AE36;
 
-      .location {
-        height: 98rpx;
-        padding: 0 28rpx;
+			.location {
+				height: 98rpx;
+				padding: 0 28rpx;
 
-        .box {
-          height: 98rpx;
-        }
+				.box {
+					height: 98rpx;
+				}
 
-        .town_name {
-          color: #fff;
-          margin-left: 18rpx;
-          font-size: 30rpx;
-        }
-      }
-    }
+				.town_name {
+					color: #fff;
+					margin-left: 18rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
 
-    .swiperBg {
-      z-index: 1;
+		.swiperBg {
+			z-index: 1;
 
-      .colorBg {
-        position: absolute;
-        left: 0;
-        top: 0;
-        height: 130rpx;
-        width: 100%;
-      }
+			.colorBg {
+				position: absolute;
+				left: 0;
+				top: 0;
+				height: 130rpx;
+				width: 100%;
+			}
 
-      .page_swiper {
-        position: relative;
-        width: 100%;
-        height: auto;
-        margin: 0 auto;
-        border-radius: 10rpx;
-        overflow-x: hidden;
-        z-index: 8;
-        padding: 0 10rpx;
+			.page_swiper {
+				position: relative;
+				width: 100%;
+				height: auto;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				overflow-x: hidden;
+				z-index: 8;
+				padding: 0 10rpx;
 
-        swiper-item {
-          border-radius: 10rpx;
-        }
+				swiper-item {
+					border-radius: 10rpx;
+				}
 
-        .swiper-item,
-        image,
-        .acea-row.row-between-wrapper {
-          width: 100%;
-          margin: 0 auto;
-          border-radius: 10rpx;
-        }
+				.swiper-item,
+				image,
+				.acea-row.row-between-wrapper {
+					width: 100%;
+					margin: 0 auto;
+					border-radius: 10rpx;
+				}
 
-        swiper {
-          width: 100%;
-          display: block;
-          height: auto;
+				swiper {
+					width: 100%;
+					display: block;
+					height: auto;
 
-          &.scalex {
-            /deep/.uni-swiper-slide-frame {
-              transform: translate(0, 0) !important;
-            }
-          }
-        }
+					&.scalex {
+						/deep/.uni-swiper-slide-frame {
+							transform: translate(0, 0) !important;
+						}
+					}
+				}
 
-        image {
-          transform: scale(0.93);
-          transition: all 0.6s ease;
-        }
+				image {
+					transform: scale(0.93);
+					transition: all 0.6s ease;
+				}
 
-        swiper-item.active,
-        swiper-item.scalex {
-          image {
-            transform: scale(1);
-          }
-        }
+				swiper-item.active,
+				swiper-item.scalex {
+					image {
+						transform: scale(1);
+					}
+				}
 
-        /*用来包裹所有的小圆点  */
-        .dots {
-          width: 156rpx;
-          height: 36rpx;
-          display: flex;
-          flex-direction: row;
-          position: absolute;
-          left: 320rpx;
-          bottom: 0;
-        }
+				/*用来包裹所有的小圆点  */
+				.dots {
+					width: 156rpx;
+					height: 36rpx;
+					display: flex;
+					flex-direction: row;
+					position: absolute;
+					left: 320rpx;
+					bottom: 0;
+				}
 
-        /*未选中时的小圆点样式 */
-        .dot {
-          width: 16rpx;
-          height: 6rpx;
-          border-radius: 6rpx;
-          margin-right: 6rpx;
-          background-color: rgba(255, 255, 255, .4);
+				/*未选中时的小圆点样式 */
+				.dot {
+					width: 16rpx;
+					height: 6rpx;
+					border-radius: 6rpx;
+					margin-right: 6rpx;
+					background-color: rgba(255, 255, 255, .4);
 
-          /*选中以后的小圆点样式  */
-          &.active {
-            width: 32rpx;
-            height: 6rpx;
-            background-color: rgba(255, 255, 255, .4);
-          }
-        }
-      }
-    }
+					/*选中以后的小圆点样式  */
+					&.active {
+						width: 32rpx;
+						height: 6rpx;
+						background-color: rgba(255, 255, 255, .4);
+					}
+				}
+			}
+		}
 
-    .title-img {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 90rpx;
+		.title-img {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 90rpx;
 
-      image {
-        width: 340rpx;
-        height: 42rpx;
-      }
+			image {
+				width: 340rpx;
+				height: 42rpx;
+			}
 
-      .title {
-        height: 42rpx;
-        padding: 0 80rpx;
-        font-size: 34rpx;
-        color: $theme-color;
-        font-weight: bold;
-        background-repeat: no-repeat;
-        background-size: 100% auto;
-        background-position: left center;
-      }
-    }
-  }
+			.title {
+				height: 42rpx;
+				padding: 0 80rpx;
+				font-size: 34rpx;
+				color: $theme-color;
+				font-weight: bold;
+				background-repeat: no-repeat;
+				background-size: 100% auto;
+				background-position: left center;
+			}
+		}
+	}
 </style>
 <template>
-  <view class="gather" @click.stop="clickWhite">
-    <!--顶部定位-->
-    <view class="gather-header">
-      <view style="height: var(--status-bar-height);"></view>
-      <view class="location">
-        <view class="box flex_a_c_j_sb">
-          <view class="place_wrapper flex_a_c" @click="changeMap">
-            <view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
-            <view class="town_name">{{street||'定位中' }}</view>
-          </view>
-          <view class="flex_a_c_j_sb">
-            <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
-              <view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
-            </view>
-            <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-              <view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
-            </navigator>
-          </view>
-        </view>
-      </view>
-    </view>
+	<view class="gather" @click.stop="clickWhite">
+		<!--顶部定位-->
+		<view class="gather-header">
+			<view style="height: var(--status-bar-height);"></view>
+			<view class="location">
+				<view class="box flex_a_c_j_sb">
+					<view class="place_wrapper flex_a_c" @click="changeMap">
+						<view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
+						<view class="town_name">{{street||'定位中' }}</view>
+					</view>
+					<view class="flex_a_c_j_sb">
+						<view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
+							<view class="iconfont icon-saoma" style="color:#fff;font-size:40rpx;"> </view>
+						</view>
+						<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+							<view class="iconfont icon-xiaoxi" style="color:#fff;font-size:40rpx;"> </view>
+						</navigator>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!--轮播图-->
+		<view class="swiperBg" style="margin-top: 12px;">
+			<view class="swiper page_swiper">
+				<swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
+					:current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
+							<view class='slide-navigator acea-row row-between-wrapper'>
+								<image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
+								</image>
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+				<view class="dots">
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
+					</block>
+				</view>
+			</view>
+		</view>
 
-    <!--轮播图-->
-    <view class="swiperBg" style="margin-top: 12px;">
-      <view class="swiper page_swiper">
-        <swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
-          :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
-              <view class='slide-navigator acea-row row-between-wrapper'>
-                <image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
-                </image>
-              </view>
-            </swiper-item>
-          </block>
-        </swiper>
-        <view class="dots">
-          <block v-for="(item,index) in imgUrls" :key="index">
-            <view class="dot" :class="index == swiperCur ? ' active' : ''"></view>
-          </block>
-        </view>
-      </view>
-    </view>
+		<view class="title-img">
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
+		</view>
 
-    <view class="title-img">
-      <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
-    </view>
+		<view class="business com special_work" v-if="jurisdiction == false">
+			<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">
+							<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>
+							<text class="text">{{ item.name }}</text>
+						</view>
+					</u-transition>
+				</block>
+				<view class="add-box examine"
+					style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
+					@click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
+					<view class="add-box-icon"
+						style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
+						<u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
+					</view>
+					<text>添加应用</text>
+				</view>
+			</view>
+		</view>
+		<view v-if="editFlag" class="business com special_work edit_card">
+			<view class="title project" style="padding: 0 28rpx">
+				<view>编辑功能</view>
+				<view class="edit2" @click="editComfirm">完成</view>
+			</view>
+			<view class="content">
+				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
+					<view class="examine" @click.stop="pushMenu(item)">
+						<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
+						<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
+						<view class="icon">添加</view>
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</u-transition>
+			</view>
+		</view>
+		<Loading></Loading>
 
-    <view class="business com special_work" v-if="jurisdiction == false">
-      <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">
-              <image class="icon_img" :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>
-              <text class="text">{{ item.name }}</text>
-            </view>
-          </u-transition>
-        </block>
-        <view class="add-box examine"
-          style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
-          @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
-          <view class="add-box-icon"
-            style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
-            <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
-          </view>
-          <text>添加应用</text>
-        </view>
-      </view>
-    </view>
-    <view v-if="editFlag" class="business com special_work edit_card">
-      <view class="title project" style="padding: 0 28rpx">
-        <view>编辑功能</view>
-        <view class="edit2" @click="editComfirm">完成</view>
-      </view>
-      <view class="content">
-        <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          <view class="examine" @click.stop="pushMenu(item)">
-            <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
-            <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
-            <view class="icon">添加</view>
-            <text class="text">{{ item.name }}</text>
-          </view>
-        </u-transition>
-      </view>
-    </view>
-    <Loading></Loading>
-
-    <!--自定义底部tab栏-->
-    <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
-  </view>
+		<!--自定义底部tab栏-->
+		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
+	</view>
 </template>
 
 <script>
-  import {
-    mapState,
-    mapGetters
-  } from 'vuex'
-  import {
-    getStoreList,
-    getUserInfo
-  } from '@/api/user.js'
-  import {
-    Toast
-  } from '@/libs/uniApi';
-  import {
-    applet
-  } from '@/api/public.js';
-  import customTab from '@/components/customTab';
-  import {
-    getVersion,
-    getNavigation
-  } from "@/api/public";
-  // #ifdef APP-PLUS
-  import uniMP from '@/utils/uniMP.js';
-  // #endif
+	import {
+		mapState,
+		mapGetters
+	} from 'vuex'
+	import {
+		getStoreList,
+		getUserInfo
+	} from '@/api/user.js'
+	import {
+		Toast
+	} from '@/libs/uniApi';
+	import {
+		applet
+	} from '@/api/public.js';
+	import customTab from '@/components/customTab';
+	import {
+		getVersion,
+		getNavigation
+	} from "@/api/public";
+	// #ifdef APP-PLUS
+	import uniMP from '@/utils/uniMP.js';
+	// #endif
 
-  export default {
-    components: {
-      customTab
-    },
-    data() {
-      return {
-        imgUrls: [{
-          img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
-        }],
-        swiperCur: 0,
-        locationArr: ({}),
-        isshow: false,
-        emptyText: '暂无可用应用',
-        jurisdiction: false, // 是否有权限
-        mer_id: '',
-        userInfoData: {
-          mer_info: {
-            type_id: 0
-          }
-        },
-        prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-        isShow: false,
-        isFshow: false,
-        // 编辑中标记
-        editFlag: false,
-        // 所有菜单的按钮
-        AllMenuList: [],
-        nowMenuList: [],
-        street: '',
-        showPicker: false,
-        columnData: [],
-        isFshow: false,
-        backColor: 'rgba(252, 252, 252, 0)',
-        newData: {},
-        activeRouter: '',
-      };
-    },
-    computed: {
-      ...mapGetters(['userInfo', 'location', 'isLogin'])
-    },
-    created() {},
-    onLoad() {},
-    onShow() {
-      this.street = this.$store.state.storage.address.townName;
-      this.getNav();
-      if (this.isLogin) {
-        this.emptyText = '暂无可用应用'
-        this.jurisdiction = false
-        this.initAllAppLet();
-      } else {
-        this.emptyText = '请登录'
-        this.jurisdiction = true
-      }
-      this.getUserInfo();
-      this.imgUrls = uni.getStorageSync('swiperImgList');
-    },
-    onPullDownRefresh() {
-      this.getUserInfo()
-      uni.stopPullDownRefresh()
-    },
-    beforeDestroy() {},
-    mounted() {},
-    // #ifdef APP-PLUS
-    onPageScroll(e) {
-      const scrollTop = e.scrollTop;
-      if (scrollTop <= 20) {
-        this.backColor = 'rgba(252, 252, 252, 0)'
-        this.isFshow = false
-      } else if (20 < scrollTop && scrollTop <= 100) {
-        this.backColor = 'rgba(252, 252, 252, .5)'
-        this.isFshow = true
-      } else if (scrollTop > 100) {
-        this.backColor = 'rgba(252, 252, 252, 1)'
-        this.isFshow = true
-      }
-    },
-    // #endif
-    onHide() {
-      uni.$emit('showLoading', false);
-    },
-    methods: {
-      changeSwiper(e){
-        if(e.length>0 && e[1].value){
-          uni.navigateTo({
-            url:e[1].value
-          })
-        }
-      },
-      swiperChange(e) {
-      	let {
-      		current,
-      		source
-      	} = e.detail;
-      	if (source === 'autoplay' || source === 'touch') {
-      		this.swiperCur = e.detail.current;
-      		this.bgColor = this.imgUrls[e.detail.current]['img']
-      	}
-      },
-      getNav() {
-        getNavigation().then(res => {
-          this.newData = res.data
-          if (this.newData.status && this.newData.status.status) {
-            uni.hideTabBar()
-          } else {
-            uni.showTabBar()
-          }
-        })
-      },
-      async scanQRcode() {
-        // #ifdef APP-PLUS
-        let result = await this.$store.dispatch("permission/requestPermissions",
-          'CAMERA')
-        if (result !== 1) return;
-        // #endif
-        uni.scanCode({
-          success: (res) => {
-            console.log(res);
-            if (res.result && res.result.includes('pages/payment/get_payment')) {
-              let url = res.result.replace(/.*lihaink.cn/g, '');
-              uni.navigateTo({
-                url: url,
-                fail: () => {
-                  Toast('跳转页面失败')
-                }
-              })
-            } else {
-              Toast('无效的二维码')
-            }
-          }
-        })
-      },
-      // 选择位置
-      changeMap() {
-        uni.navigateTo({
-          url: `/pages/select_address_n/select_address_n`,
-          success: () => {
-            uni.$once('changeAddress', (e) => {
-              this.street = e.street.name;
-              this.town = e.street.name;
-              this.$store.commit('setAddress', {
-                street_id: e.street.code,
-                townName: this.town
-              });
-              if (e.longitude) {
-                this.longitude = e.longitude;
-                this.latitude = e.latitude;
-                this.$store.commit('setLocation', {
-                  lat: e.latitude,
-                  long: e.longitude,
-                });
-              }
-            })
-          }
-        })
-      },
-      initAllAppLet() {
-        applet().then(res => {
-          this.AllMenuList = res.data;
-          this.initMenu();
-          this.showControllerAllLet();
-        }).catch(e => {
-          console.log(e);
-        })
-      },
-      // 根据类型来判断是否显示
-      showControllerAllLet() {
-        let user;
-        if (typeof this.$store.state.app.userInfo == 'string') {
-          user = JSON.parse(this.$store.state.app.userInfo)
-        } else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
-        if (!user?.show_controller_applet) {
-          this.AllMenuList = this.AllMenuList.filter(item => item.app_id != "__UNI__83ABA97"); //隐藏大屏控制
-        }
-      },
-      // 初始化菜单
-      initMenu() {
-        let nowMenu = uni.getStorageSync('gatherMenuList');
-        try {
-          let list = JSON.parse(nowMenu || '[]');
-          let now = [];
-          let all = [];
-          this.AllMenuList.forEach((item) => {
-            if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
-            else now.push(item)
-          })
-          this.AllMenuList = all;
-          this.nowMenuList = now;
-        } catch (e) {
-          this.nowMenuList = [];
-        }
-      },
-      clickMenu(data) {
-        this.getUniMp(data);
-      },
-      // 添加菜单
-      pushMenu(data) {
-        this.nowMenuList.push(data);
-        this.AllMenuList = this.AllMenuList.filter((item) => {
-          return item.name != data.name;
-        })
-      },
-      // 移除菜单
-      removeMenu(data) {
-        this.AllMenuList.push(data);
-        this.nowMenuList = this.nowMenuList.filter((item) => {
-          return item.name != data.name;
-        })
-      },
-      // 编辑完成
-      editComfirm() {
-        this.editFlag = false;
-        uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
-      },
-      getUniMp(data) {
-        let that = this;
+	export default {
+		components: {
+			customTab
+		},
+		data() {
+			return {
+				elInfo: '',
+				imgUrls: [{
+					img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
+				}],
+				swiperCur: 0,
+				locationArr: ({}),
+				isshow: false,
+				emptyText: '暂无可用应用',
+				jurisdiction: false, // 是否有权限
+				mer_id: '',
+				userInfoData: {
+					mer_info: {
+						type_id: 0
+					}
+				},
+				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+				isShow: false,
+				isFshow: false,
+				// 编辑中标记
+				editFlag: false,
+				// 所有菜单的按钮
+				AllMenuList: [],
+				nowMenuList: [],
+				street: '',
+				showPicker: false,
+				columnData: [],
+				isFshow: false,
+				backColor: 'rgba(252, 252, 252, 0)',
+				newData: {},
+				activeRouter: '',
+			};
+		},
+		computed: {
+			...mapGetters(['userInfo', 'location', 'isLogin'])
+		},
+		created() {},
+		onLoad() {
+			let that = this
+			uni.$on('diverGatherSubEmit', function(data) {
+				that.clickMenu(that.nowMenuList[0])
+			})
 
-        // #ifdef APP-PLUS
-        if (data.version) return uniMP.loadAppletMP(data);
-        else switch (data.type) {
-          case 1:
-            uniMP.loadMP(data.data);
-            break;
-          case 2:
-            uniMP.loadMPx(data.data);
-            break;
-          case 3:
-            uniMP.loadMPurl(data.data);
-            break;
-          case 4:
-            uniMP.loadMPdns(data.data);
-            break;
-        }
-        return;
-        // #endif
-        // #ifdef H5
-        // if (type == 2) {
-        // 	this.navigator(`/pages/moreProject/moreProject`);
-        // } else {
-        // 	uni.showToast({
-        // 		icon: 'none',
-        // 		title: 'H5不支持打开小程序'
-        // 	})
-        // }
-        uni.showToast({
-          icon: 'none',
-          title: 'H5不支持打开小程序'
-        })
-        // #endif
+		},
+		onShow() {
+			this.street = this.$store.state.storage.address.townName;
+			this.getNav();
+			if (this.isLogin) {
+				this.emptyText = '暂无可用应用'
+				this.jurisdiction = false
+				this.initAllAppLet();
+			} else {
+				this.emptyText = '请登录'
+				this.jurisdiction = true
+			}
+			this.getUserInfo();
+			this.imgUrls = uni.getStorageSync('swiperImgList');
+		},
+		onPullDownRefresh() {
+			this.getUserInfo()
+			uni.stopPullDownRefresh()
+		},
+		beforeDestroy() {},
+		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;
+			if (scrollTop <= 20) {
+				this.backColor = 'rgba(252, 252, 252, 0)'
+				this.isFshow = false
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 'rgba(252, 252, 252, .5)'
+				this.isFshow = true
+			} else if (scrollTop > 100) {
+				this.backColor = 'rgba(252, 252, 252, 1)'
+				this.isFshow = true
+			}
+		},
+		// #endif
+		onHide() {
+			uni.$emit('showLoading', false);
+		},
+		methods: {
+			openDiver() {
+				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
+					})
+				}
+			},
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'autoplay' || source === 'touch') {
+					this.swiperCur = e.detail.current;
+					this.bgColor = this.imgUrls[e.detail.current]['img']
+				}
+			},
+			getNav() {
+				getNavigation().then(res => {
+					this.newData = res.data
+					if (this.newData.status && this.newData.status.status) {
+						uni.hideTabBar()
+					} else {
+						uni.showTabBar()
+					}
+				})
+			},
+			async scanQRcode() {
+				// #ifdef APP-PLUS
+				let result = await this.$store.dispatch("permission/requestPermissions",
+					'CAMERA')
+				if (result !== 1) return;
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						console.log(res);
+						if (res.result && res.result.includes('pages/payment/get_payment')) {
+							let url = res.result.replace(/.*lihaink.cn/g, '');
+							uni.navigateTo({
+								url: url,
+								fail: () => {
+									Toast('跳转页面失败')
+								}
+							})
+						} else {
+							Toast('无效的二维码')
+						}
+					}
+				})
+			},
+			// 选择位置
+			changeMap() {
+				uni.navigateTo({
+					url: `/pages/select_address_n/select_address_n`,
+					success: () => {
+						uni.$once('changeAddress', (e) => {
+							this.street = e.street.name;
+							this.town = e.street.name;
+							this.$store.commit('setAddress', {
+								street_id: e.street.code,
+								townName: this.town
+							});
+							if (e.longitude) {
+								this.longitude = e.longitude;
+								this.latitude = e.latitude;
+								this.$store.commit('setLocation', {
+									lat: e.latitude,
+									long: e.longitude,
+								});
+							}
+						})
+					}
+				})
+			},
+			initAllAppLet() {
+				applet().then(res => {
+					this.AllMenuList = res.data;
+					this.initMenu();
+					this.showControllerAllLet();
+				}).catch(e => {
+					console.log(e);
+				})
+			},
+			// 根据类型来判断是否显示
+			showControllerAllLet() {
+				let user;
+				if (typeof this.$store.state.app.userInfo == 'string') {
+					user = JSON.parse(this.$store.state.app.userInfo)
+				} else user = JSON.parse(JSON.stringify(this.$store.state.app.userInfo))
+				if (!user?.show_controller_applet) {
+					this.AllMenuList = this.AllMenuList.filter(item => item.app_id != "__UNI__83ABA97"); //隐藏大屏控制
+				}
+			},
+			// 初始化菜单
+			initMenu() {
+				let nowMenu = uni.getStorageSync('gatherMenuList');
+				try {
+					let list = JSON.parse(nowMenu || '[]');
+					let now = [];
+					let all = [];
+					this.AllMenuList.forEach((item) => {
+						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)
 
-      },
-      navigator(url, t) {
-        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-        uni.navigateTo({
-          url: url
-        })
-      },
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.userInfoData = res.data;
-          that.$store.commit('SET_USERINFO', res.data);
-          // console.log(res.data.service);
-          if (res.data.service == null) {
-            // console.log('123');
-            this.isShow = false
-          } else {
-            this.isShow = true
-            this.mer_id = res.data.service.mer_id
-          }
+					this.AllMenuList = all;
+					this.nowMenuList = now;
+				} catch (e) {
+					this.nowMenuList = [];
+				}
+			},
+			clickMenu(data) {
+				this.getUniMp(data);
+			},
+			// 添加菜单
+			pushMenu(data) {
+				this.nowMenuList.push(data);
+				this.AllMenuList = this.AllMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 移除菜单
+			removeMenu(data) {
+				this.AllMenuList.push(data);
+				this.nowMenuList = this.nowMenuList.filter((item) => {
+					return item.name != data.name;
+				})
+			},
+			// 编辑完成
+			editComfirm() {
+				this.editFlag = false;
+				uni.setStorageSync('gatherMenuList', JSON.stringify(this.nowMenuList));
+			},
+			getUniMp(data) {
+				let that = this;
 
-          if (!res.data.mer_info) {
-            that.$set(this, 'jurisdiction', false);
-          }
-        });
-      },
-      // 点击空白区域完成添加
-      clickWhite(){
-        if(this.editFlag) this.editFlag = false;
-      }
-    }
-  };
+				// #ifdef APP-PLUS
+				if (data.version) return uniMP.loadAppletMP(data);
+				else switch (data.type) {
+					case 1:
+						uniMP.loadMP(data.data);
+						break;
+					case 2:
+						uniMP.loadMPx(data.data);
+						break;
+					case 3:
+						uniMP.loadMPurl(data.data);
+						break;
+					case 4:
+						uniMP.loadMPdns(data.data);
+						break;
+				}
+				return;
+				// #endif
+				// #ifdef H5
+				// if (type == 2) {
+				// 	this.navigator(`/pages/moreProject/moreProject`);
+				// } else {
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: 'H5不支持打开小程序'
+				// 	})
+				// }
+				uni.showToast({
+					icon: 'none',
+					title: 'H5不支持打开小程序'
+				})
+				// #endif
+
+			},
+			navigator(url, t) {
+				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfoData = res.data;
+					that.$store.commit('SET_USERINFO', res.data);
+					// console.log(res.data.service);
+					if (res.data.service == null) {
+						// console.log('123');
+						this.isShow = false
+					} else {
+						this.isShow = true
+						this.mer_id = res.data.service.mer_id
+					}
+
+					if (!res.data.mer_info) {
+						that.$set(this, 'jurisdiction', false);
+					}
+				});
+			},
+			// 点击空白区域完成添加
+			clickWhite() {
+				if (this.editFlag) this.editFlag = false;
+			}
+		}
+	};
 </script>
 <style lang="scss" scoped>
-  .gather {
-    padding-bottom: 164.91rpx;
-    background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-    position: relative;
-  }
+	.gather {
+		padding-bottom: 164.91rpx;
+		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+		position: relative;
+	}
 
-  .sitebox {
-    animation-name: fadeIn;
-    animation-duration: 3s;
-    animation-fill-mode: forwards;
-  }
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
 
-  @keyframes fadeIn {
-    from {
-      opacity: 0;
-    }
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
 
-    to {
-      opacity: 1;
-    }
-  }
+		to {
+			opacity: 1;
+		}
+	}
 
-  .site-box1 {
-    width: 706rpx;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 45rpx;
-    left: 20rpx;
+	.site-box1 {
+		width: 706rpx;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 45rpx;
+		left: 20rpx;
 
-    z-index: 999;
+		z-index: 999;
 
-    // 位置
-    .place_wrapper {
-      color: #fff;
-      margin-right: 0rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 0rpx;
 
-      font-size: 30rpx;
+			font-size: 30rpx;
 
-      .town_name {
-        margin-left: 21rpx;
-      }
-    }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-    .iconfont {
-      font-size: 35.09rpx;
-    }
-  }
+		.iconfont {
+			font-size: 35.09rpx;
+		}
+	}
 
-  .site-box {
-    width: 100%;
-    /* #ifdef MP || APP-PLUS */
-    height: 160rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 120rpx;
-    /* #endif */
-    margin-bottom: 26.32rpx;
-    position: absolute;
-    top: 0rpx;
-    position: fixed;
-    z-index: 999;
-    /* #ifdef MP || APP-PLUS */
-    padding-top: 75rpx;
-    /* #endif */
-    /* #ifdef H5 */
-    padding-top: 25rpx;
-    /* #endif */
-    // background-color: #e5e5e5;
-    // background: url("@/static/images/bg2.png") no-repeat;
-    background-size: 100% 100%;
-    padding-right: 20rpx;
+	.site-box {
+		width: 100%;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
+		/* #endif */
+		margin-bottom: 26.32rpx;
+		position: absolute;
+		top: 0rpx;
+		position: fixed;
+		z-index: 999;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		// background-color: #e5e5e5;
+		// background: url("@/static/images/bg2.png") no-repeat;
+		background-size: 100% 100%;
+		padding-right: 20rpx;
 
-    // 位置
-    .place_wrapper {
-      color: #fff;
-      margin-right: 24.56rpx;
-      font-size: 30rpx;
+		// 位置
+		.place_wrapper {
+			color: #fff;
+			margin-right: 24.56rpx;
+			font-size: 30rpx;
 
-      opacity: 0;
+			opacity: 0;
 
-      .town_name {
-        margin-left: 21rpx;
-      }
-    }
+			.town_name {
+				margin-left: 21rpx;
+			}
+		}
 
-    .iconfont {
-      opacity: 0;
-      font-size: 30rpx;
-      font-size: 35.09rpx;
-    }
-  }
+		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
+			font-size: 35.09rpx;
+		}
+	}
 
-  .top_box {
-    // padding-top: 180rpx;
-    background: linear-gradient(#36a2ff, #fff);
-  }
+	.top_box {
+		// padding-top: 180rpx;
+		background: linear-gradient(#36a2ff, #fff);
+	}
 
-  .com {
-    margin-left: 50%;
-    transform: translate(-50%);
-  }
+	.com {
+		margin-left: 50%;
+		transform: translate(-50%);
+	}
 
-  .business {
-    width: 694.74rpx;
-    // margin-bottom: 175rpx;
-  }
+	.business {
+		width: 694.74rpx;
+		// margin-bottom: 175rpx;
+	}
 
-  .special_work {
-    // padding: 17.54rpx;
-    width: 694.74rpx;
-    padding-top: 30rpx;
-    border-radius: 17.54rpx;
-    // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+	.special_work {
+		// padding: 17.54rpx;
+		width: 694.74rpx;
+		padding-top: 30rpx;
+		border-radius: 17.54rpx;
+		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
-    .title {
-      font-size: 31.58rpx;
-      font-weight: 700;
-      margin-bottom: 38.6rpx;
-    }
+		.title {
+			font-size: 31.58rpx;
+			font-weight: 700;
+			margin-bottom: 38.6rpx;
+		}
 
-    .project {
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
+		.project {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
 
-      .edit {
-        font-size: 26rpx;
-        font-weight: 400;
+			.edit {
+				font-size: 26rpx;
+				font-weight: 400;
 
-        &::after {
-          content: ">";
-          margin-left: 10rpx;
-        }
-      }
+				&::after {
+					content: ">";
+					margin-left: 10rpx;
+				}
+			}
 
-      .edit2 {
-        font-size: 26rpx;
-        font-weight: 400;
-      }
-    }
+			.edit2 {
+				font-size: 26rpx;
+				font-weight: 400;
+			}
+		}
 
-    .content {
-      display: flex;
-      align-content: center;
-      flex-wrap: wrap;
-      // justify-content: space-between;
+		.content {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			// justify-content: space-between;
 
-      .examine {
-        margin-bottom: 35rpx;
-        width: 173.68rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        position: relative;
-        // margin: 0 0 33.33rpx 33.33rpx !important;
+			.examine {
+				margin-bottom: 35rpx;
+				width: 173.68rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				// margin: 0 0 33.33rpx 33.33rpx !important;
 
-        .icon_img {
-          width: 83.16rpx;
-          height: 83.16rpx;
-        }
+				.icon_img {
+					width: 83.16rpx;
+					height: 83.16rpx;
+				}
 
-        .icon {
-          position: absolute;
-          top: -5rpx;
-          right: 25rpx;
-          background-color: green;
-          color: #fff;
-          border-radius: 50rpx;
-          font-size: 22rpx;
-          padding: 5rpx 10rpx;
-        }
+				.icon {
+					position: absolute;
+					top: -5rpx;
+					right: 25rpx;
+					background-color: green;
+					color: #fff;
+					border-radius: 50rpx;
+					font-size: 22rpx;
+					padding: 5rpx 10rpx;
+				}
 
-        .text {
-          font-size: 26.32rpx;
-          margin-top: 21.05rpx;
-          color: #000;
-        }
-      }
+				.text {
+					font-size: 26.32rpx;
+					margin-top: 21.05rpx;
+					color: #000;
+				}
+			}
 
-      .text {
-        font-size: 29.82rpx;
-        color: #a4a4a4;
-      }
-    }
+			.text {
+				font-size: 29.82rpx;
+				color: #a4a4a4;
+			}
+		}
 
-    .cont_jus {
-      margin-top: 56.14rpx;
-      justify-content: flex-start;
+		.cont_jus {
+			margin-top: 56.14rpx;
+			justify-content: flex-start;
 
-      &:first-child {
-        // margin-right: 33rpx;
-      }
+			&:first-child {
+				// margin-right: 33rpx;
+			}
 
-      .examine {
-        margin-right: 48rpx;
+			.examine {
+				margin-right: 48rpx;
 
-        &:first-child {
-          margin-right: 48rpx;
-        }
-      }
-    }
-  }
+				&:first-child {
+					margin-right: 48rpx;
+				}
+			}
+		}
+	}
 
-  .edit_card {
-    background-color: #fff;
-    padding-top: 28rpx;
-  }
+	.edit_card {
+		background-color: #fff;
+		padding-top: 28rpx;
+	}
 
-  .rotate-box {
-    transform: rotate(0deg);
-    transition: transform .5s ease-out;
-  }
+	.rotate-box {
+		transform: rotate(0deg);
+		transition: transform .5s ease-out;
+	}
 
-  .rotate-box:active {
-    transform: rotate(360deg);
-  }
+	.rotate-box:active {
+		transform: rotate(360deg);
+	}
 
-  // .location {
-  // 	background-color: #f6f6f6;
-  // 	width: 680rpx;
-  // 	height: 150rpx;
-  // 	position: absolute;
-  // 	top: 0;
-  // 	z-index: 9999;
-  // 	border-radius: 20rpx;
-  // 	left: 50%;
-  // 	margin-left: -340rpx;
-  // 	margin-top: 80rpx;
-  // 	padding-left: 20rpx;
+	// .location {
+	// 	background-color: #f6f6f6;
+	// 	width: 680rpx;
+	// 	height: 150rpx;
+	// 	position: absolute;
+	// 	top: 0;
+	// 	z-index: 9999;
+	// 	border-radius: 20rpx;
+	// 	left: 50%;
+	// 	margin-left: -340rpx;
+	// 	margin-top: 80rpx;
+	// 	padding-left: 20rpx;
 
-  // 	.locationa {
-  // 		font-size: 28rpx;
-  // 		color: #000;
-  // 		font-weight: 500;
-  // 		margin-top: 30rpx;
-  // 		margin-bottom: 15rpx;
-  // 	}
+	// 	.locationa {
+	// 		font-size: 28rpx;
+	// 		color: #000;
+	// 		font-weight: 500;
+	// 		margin-top: 30rpx;
+	// 		margin-bottom: 15rpx;
+	// 	}
 
-  // 	.locationb {
-  // 		font-size: 20rpx;
-  // 		color: #5a5a5a;
-  // 	}
+	// 	.locationb {
+	// 		font-size: 20rpx;
+	// 		color: #5a5a5a;
+	// 	}
 
-  // 	.locationx {
-  // 		color: #000;
-  // 		position: absolute;
-  // 		top: 10rpx;
-  // 		right: 20rpx;
-  // 	}
-  // }
+	// 	.locationx {
+	// 		color: #000;
+	// 		position: absolute;
+	// 		top: 10rpx;
+	// 		right: 20rpx;
+	// 	}
+	// }
 </style>
\ No newline at end of file
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
new file mode 100644
index 0000000..2f470f4
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d692330..2927ced 100644
--- a/pages/index/index.vue
+++ b/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>
-					<!-- <card></card> -->
+						@changeDiy="changeDiy">
+					</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>
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
new file mode 100644
index 0000000..8f61ac0
--- /dev/null
+++ b/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>
\ No newline at end of file