界面修改

components/WaterfallsFlow/WaterfallsFlowo.vue

@@ -101,7 +101,7 @@ export default {
 					if(this.mark < this.allList.length){
 						this.waterFall()
 					}
-					console.log(this.rightList,this.leftList)
+				
 				}
 			},
 			immediate: true,

pages/gather/gather.vue

@@ -70,7 +70,13 @@
 		</view>
 		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-
+		<!-- <m-tabbar native>
+		      <template v-slot:tabbar_index_2>
+		        <view class="custom_style">
+		          <view class="custom_style_icon"></view>
+		        </view>
+		      </template>
+		    </m-tabbar> -->
 	</view>
 </template>
 
@@ -264,13 +270,14 @@
 			},
 			// 初始化菜单
 			initMenu() {
-				let all = uni.getStorageSync('gatherAllMenuList');
 				let now = uni.getStorageSync('gatherNowMenuList');
-				if (all) {
+				try {
-					this.AllMenuList = JSON.parse(all);
-				}
-				if (now) {
 					this.nowMenuList = JSON.parse(now);
+					this.AllMenuList = this.AllMenuList.filter((item) => {
+						return this.nowMenuList.find(t => t.name == item.name)?.name != item.name;
+					})
+				} catch (e) {
+					this.nowMenuList = [];
 				}
 			},
 			clickMenu(e, data) {
@@ -300,7 +307,6 @@
 			// 编辑完成
 			editComfirm() {
 this.editFlag = false;
-				uni.setStorageSync('gatherAllMenuList', JSON.stringify(this.AllMenuList));
 				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
 			},
 			getUniMp(appid) {

pages/index/index.vue

@@ -2,29 +2,15 @@
 	<view class="Circle_friends">
 		<view class="circle_friends_wrapper">
 			<view v-if="isFshow">
-        <view
+				<view class="site-box flex_a_c_j_sb" :style="{ 'background-color': backColor }">
-          class="site-box flex_a_c_j_sb"
+					<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
-          :style="{ 'background-color': backColor }"
+						<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
-        >
+							style="color: #000; margin-left: 20rpx">
-          <view
-            :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
-            @click="selectLocation"
-          >
-            <view
-              :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
-              style="color: #000; margin-left: 20rpx"
-            >
 						</view>
 						<view class="town_name" style="color: #000">{{ street }}</view>
 					</view>
-          <navigator
+					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-            url="/pages/chat/customer_list/index?type=0"
+						<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']" style="color: #000"></view>
-            hover-class="none"
-          >
-            <view
-              :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
-              style="color: #000"
-            ></view>
 					</navigator>
 				</view>
 				<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@@ -34,50 +20,25 @@
 				</view> -->
 			</view>
 
-      <zbpSwiper
+			<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr"
-        ref="list"
+				@kkchange="kkchange" @change="dchange">
-        :isSelectPlace="true"
-        :town="street"
-        :show="show"
-        :location_Arr="locationArr"
-        @kkchange="kkchange"
-        @change="dchange"
-      >
 			</zbpSwiper>
 
 			<view class="tabs_wrapper">
-        <u-tabs
+				<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
-          :list="tabsData.list"
+					:activeStyle="activeStyle" itemStyle="padding-left: 0px;  height: 33px;"></u-tabs>
-          @click="tabsChange"
-          lineColor="#F84221"
-          keyName="cate_name"
-          :activeStyle="activeStyle"
-          itemStyle="padding-left: 0px;  height: 33px;"
-        ></u-tabs>
 			</view>
 			<view class=""> </view>
 			<view class="goodslist">
 				<WaterfallsFlow :wfList="cateGoods" />
 			</view>
 			<view class="empty_wrapper" v-if="emptyShow">
-        <u-empty
+				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
-          :show="emptyShow"
-          mode="list"
-          icon="http://cdn.uviewui.com/uview/empty/list.png"
-        ></u-empty>
 			</view>
 		</view>
 
-    <u-picker
+		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-      :defaultIndex="[0, 0]"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-      :show="showPicker"
-      ref="uPicker"
-      :columns="columnData"
-      @confirm="confirm"
-      @cancel="showPicker = false"
-      @change="changeHandler"
-      keyName="name"
-    ></u-picker>
 		<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
 		<!-- <view class="bg_color"></view> -->
 
@@ -211,9 +172,9 @@ export default {
 				}
 				this.connectstatus = connectStr
 			})
-
 		},
 		onTabItemTap(e) {
+			console.log(e)
 			if (e.text.length >= 4) {
 				uni.pageScrollTo({
 					selector: ".Circle_friends",
@@ -236,13 +197,13 @@ export default {
 			// #endif
 		},
 		onTabItemTap(e) {
-    if (e.text.length >= 4) {
+			
 				uni.pageScrollTo({
 					selector: ".Circle_friends",
 					scrollTop: 0
 				})
 
-    }
+			
 		},
 		onReachBottom() {
 			if (this.status == 'nomore') return;
@@ -288,12 +249,14 @@ export default {
 				this.backColor = 'rgba(252, 252, 252, 1.0)'
 				this.isFshow = true
 				this.show = false
+				this.$nextTick(()=>{
 					uni.setTabBarItem({
 						index: 0,
 						text: '返回顶部',
 						iconPath: '/static/tabbar_icon/top.png',
 						selectedIconPath: '/static/tabbar_icon/top.png'
 					});
+				})
 			}
 
 

pages/plant_release/index.vue

@@ -143,7 +143,10 @@
 			<!-- <m-tabbar native>
 				<template v-slot:tabbar_index_2>
 					<view class="custom_style">
-          <view class="custom_style_icon"></view>
+						<view class="custom_style_icon" style="margin-top: -50rpx;"></view>
+						<view class=""  style="color: red;">
+                            发布
+						</view>
 					</view>
 				</template>
 			</m-tabbar> -->

pages/supply_chains/supply_chains.vue

@@ -129,6 +129,13 @@
 			<view class="locationa"> 位置权限使用说明 </view>
 			<view class="locationb"> 用于向你推荐最近门店 </view>
 		</view>
+	<!-- 	<m-tabbar native>
+		      <template v-slot:tabbar_index_2>
+		        <view class="custom_style">
+		          <view class="custom_style_icon"></view>
+		        </view>
+		      </template>
+		    </m-tabbar> -->
 	</view>
 </template>