三个页面修改

App.vue

@@ -77,6 +77,7 @@
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
 
+			// #ifdef APP-PLUS
 			//监听uni小程序发送的事件
 			mp.onUniMPEventReceive(ret => {
 				console.log('小程序事件: ', ret);
@@ -86,6 +87,7 @@
 					});
 				}
 			});
+			// #endif
 
 			let that = this;
 			// #ifdef MP

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,

components/WaterfallsFlow/WaterfallsFlows.vue

@@ -108,7 +108,6 @@ export default {
 			deep:true
         },
 		mounted(){
-			
 			this.getUserInfo()
 		},
 

components/WaterfallsFlowItem/WaterfallsFlowItems.vue

@@ -1,16 +1,14 @@
 <template>
 	<view class="wf-item-page" @click="gogogo(item)">
 
-
-
 		<image :src="item.image[0]" mode="widthFix" class="item-img" />
 
 		<view class="goods_item_img" v-if="item.video_link.length>0">
-			<image src="@/static/images/sp.png" mode="aspectFill"></image>
+			<image src="@/static/images/sp.png" mode="aspectFit"></image>
 		</view>
 		<view class="title">{{item.title}}</view>
 		<view class="item-info">
-			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
+			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
 				class="info-avatar" />
 			<view class="info-nickname">{{ item.author.nickname }}</view>
 		</view>
@@ -41,7 +39,6 @@
 			this.getUserInfo()
 		},
 
-
 		methods: {
 			/**
 			 * 获取个人用户信息
@@ -62,7 +59,6 @@
 						url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
 						// #endif
 					})
-
 				} else {
 					uni.navigateTo({
 						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`

pages.json

@@ -1529,7 +1529,6 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"fontSize": "25rpx",
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
@@ -1564,13 +1563,11 @@
 			}
 		],
 		"midButton": {
-			"width": "78rpx",
+			"width": "68px",
-			"height": "126rpx",
+			"height": "70px",
-			"iconWidth": "78rpx",
+			"iconWidth": "48px",
 			"pagePath": "pages/plant_release/index",
 			"iconPath": "static/tabbar_icon/d.png",
-			// "selectedIconPath": "static/tabbar_icon/d-a.png",
-
 			"text": "发布"
 		}
 

pages/columnGoods/goods_list/index.vue

@@ -77,7 +77,6 @@
 				<view v-else class='list'>
 					<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
 				</view>
-				
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
 						<image src='/static/images/noCart.png'></image>

pages/gather/gather.vue

@@ -5,7 +5,8 @@
 			<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
 
 				<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 :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
+						style="color:#000;margin-left: 20rpx;">
 					</view>
 					<view class="town_name" style="color:#000;">{{street}}</view>
 				</view>
@@ -21,18 +22,9 @@
 
 		</view>
 
-    <zbpSwiper
+		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" @kkchange="kkchange"></zbpSwiper>
-      :isSelectPlace="true"
+		<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
-      :location_Arr="locationArr"
+			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
-      :town="street"
-      @kkchange="kkchange"
-    ></zbpSwiper>
-    <u-empty
-      :show="jurisdiction"
-      mode="permission"
-      :text="emptyText"
-      icon="http://cdn.uviewui.com/uview/empty/permission.png"
-    ></u-empty>
 		<view class="business com special_work" v-if="jurisdiction == false">
 			<view class="title project">
 				<view>更多功能</view>
@@ -41,39 +33,19 @@
 			</view>
 			<view class="content">
 				<block v-if="nowMenuList.length > 0">
-          <u-transition
+					<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-            v-for="(item, index) in nowMenuList"
+						<view class="examine" @click="
-            :key="item.name"
-            show
-          >
-            <view
-              class="examine"
-              @click="
                 editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
-              "
+              ">
-            >
+							<image class="icon_img" :src="item.icon" mode="aspectFit">
-              <image
-                class="icon_img"
-                :src="`${prefix}${item.icon}`"
-                mode="aspectFit"
-              >
 							</image>
-              <u-icon
+							<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
-                v-if="editFlag"
-                class="icon"
-                name="minus-circle-fill"
-                color="red"
-              ></u-icon>
 							<text class="text">{{ item.name }}</text>
 						</view>
 					</u-transition>
 				</block>
-        <view
+				<view v-else-if="!editFlag" @click="editFlag = true"
-          v-else-if="!editFlag"
+					style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
-          @click="editFlag = true"
-          style="text-align: center; width: 100%; color: #aaa"
-          >还没有应用,点我添加应用</view
-        >
 			</view>
 		</view>
 		<view v-if="editFlag" class="business com special_work edit_card">
@@ -82,17 +54,9 @@
 				<view class="edit2" @click="editComfirm">完成</view>
 			</view>
 			<view class="content">
-        <u-transition
+				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-          v-for="(item, index) in AllMenuList"
-          :key="item.name"
-          show
-        >
 					<view class="examine" @click="pushMenu(item)">
-            <image
+						<image class="icon_img" :src="item.icon" mode="aspectFit">
-              class="icon_img"
-              :src="`${prefix}${item.icon}`"
-              mode="aspectFit"
-            >
 						</image>
 						<u-icon class="icon" name="plus-circle-fill"></u-icon>
 						<text class="text">{{ item.name }}</text>
@@ -111,46 +75,48 @@
 </template>
 
 <script>
-import Cache from '@/utils/cache';
+	import Cache from '@/utils/cache';
-import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-import emptyPage from '@/components/emptyPage.vue';
+	import emptyPage from '@/components/emptyPage.vue';
-import zbpSwiper from '@/components/zbpSwiper'
+	import zbpSwiper from '@/components/zbpSwiper'
-import {
+	import {
 		getArea,
 		getStreet
-} from '@/api/article.js';
+	} from '@/api/article.js';
-import {
+	import {
 		mapState,
 		mapGetters
-} from 'vuex'
+	} from 'vuex'
-import {
+	import {
 		getWorkArticleCount,
 		getSlideAPI
-} from '@/api/article.js'
+	} from '@/api/article.js'
-import {
+	import {
 		getStoreList,
 		getUserInfo
-} from '@/api/user.js'
+	} from '@/api/user.js'
-import {
+	import {
 		getGeocoder,
 		microSeachBarCode,
 		microEadtProduct
-} from '@/api/store.js'
+	} from '@/api/store.js'
-import {
+	import {
 		Toast
-} from '@/libs/uniApi';
+	} from '@/libs/uniApi';
-import {
+	import {
 		getDiy
-} from '@/api/api.js';
+	} from '@/api/api.js';
-import uniMP from '@/utils/uniMP.js';
+	// #ifdef APP-PLUS
+	import uniMP from '@/utils/uniMP.js';
+	// #endif
 
-export default {
+	export default {
 		components: {
 			mTabbar,
 			zbpSwiper,
 			emptyPage
 		},
-  data () {
+		data() {
 			return {
 				locationArr: ({}),
 				emptyText: '暂无可用应用',
@@ -171,13 +137,13 @@ export default {
 				// 所有菜单的按钮
 				AllMenuList: [{
 						name: '商户平台',
-        icon: 'spgl.png',
+						icon: '/static/applet/shop_app.png',
 						data: '/pages/moreProject/moreProject',
 						type: 2,
 					},
 					{
 						name: '供销平台',
-        icon: 'shsz.png',
+						icon: '/static/applet/gx_app.png',
 						data: '__UNI__B5B1EDD',
 						type: 1,
 					},
@@ -194,13 +160,13 @@ export default {
 		computed: {
 			...mapGetters(['userInfo', 'location', 'isLogin'])
 		},
-  created () { },
+		created() {},
-  onLoad () {
+		onLoad() {
 			this.Area()
 			this.initMenu();
 		},
 
-  onShow () {
+		onShow() {
 			if (this.isLogin) {
 				this.emptyText = '暂无可用应用'
 				this.jurisdiction = false
@@ -212,15 +178,15 @@ export default {
 
 		},
 
-  onPullDownRefresh () {
+		onPullDownRefresh() {
 			this.getUserInfo()
 			uni.stopPullDownRefresh()
 		},
-  beforeDestroy () {
+		beforeDestroy() {
 			// 销毁监听事件
 			this.$bus.$off('value-updated')
 		},
-  mounted () {
+		mounted() {
 			if (this.street.length <= 0) {
 				this.appLocation()
 			}
@@ -236,7 +202,7 @@ export default {
 
 		},
 		// #ifdef APP-PLUS
-  onPageScroll (e) {
+		onPageScroll(e) {
 			const scrollTop = e.scrollTop;
 			if (scrollTop <= 20) {
 				this.backColor = 'rgba(252, 252, 252, 0)'
@@ -255,7 +221,7 @@ export default {
 		// #endif
 
 		methods: {
-    scrolling () {
+			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
 					window.pageYOffset ||
@@ -297,7 +263,7 @@ export default {
 
 			},
 			// 初始化菜单
-    initMenu () {
+			initMenu() {
 				let all = uni.getStorageSync('gatherAllMenuList');
 				let now = uni.getStorageSync('gatherNowMenuList');
 				if (all) {
@@ -307,7 +273,7 @@ export default {
 					this.nowMenuList = JSON.parse(now);
 				}
 			},
-    clickMenu (e, data) {
+			clickMenu(e, data) {
 				switch (e) {
 					case 1:
 						this.getUniMp(data);
@@ -318,26 +284,26 @@ export default {
 				}
 			},
 			// 添加菜单
-    pushMenu (data) {
+			pushMenu(data) {
 				this.nowMenuList.push(data);
 				this.AllMenuList = this.AllMenuList.filter((item) => {
 					return item.name != data.name;
 				})
 			},
 			// 移除菜单
-    removeMenu (data) {
+			removeMenu(data) {
 				this.AllMenuList.push(data);
 				this.nowMenuList = this.nowMenuList.filter((item) => {
 					return item.name != data.name;
 				})
 			},
 			// 编辑完成
-    editComfirm () {
+			editComfirm() {
 				this.editFlag = false;
 				uni.setStorageSync('gatherAllMenuList', JSON.stringify(this.AllMenuList));
 				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
 			},
-    getUniMp (appid) {
+			getUniMp(appid) {
 				console.log('点击供销平台');
 				// #ifdef APP-PLUS
 				uniMP.loadMP(appid);
@@ -348,7 +314,7 @@ export default {
 					title: 'H5不支持打开小程序'
 				})
 			},
-    changeHandler (e) {
+			changeHandler(e) {
 				const {
 					columnIndex,
 					value,
@@ -373,17 +339,17 @@ export default {
 					this.Street(res.data[0]['code']);
 				});
 			},
-    Street (code) {
+			Street(code) {
 				getStreet({
 					area_code: code
 				}).then(res => {
 					this.$refs.uPicker.setColumnValues(1, res.data);
 				});
 			},
-    selectLocation () {
+			selectLocation() {
 				this.showPicker = true
 			},
-    confirm (e) {
+			confirm(e) {
 				this.street = e.value[1].name
 
 				this.$nextTick(() => {
@@ -392,7 +358,7 @@ export default {
 				})
 				this.showPicker = false
 			},
-    appLocation () {
+			appLocation() {
 				uni.getLocation({
 					type: 'wgs84',
 					timeout: '10',
@@ -410,7 +376,8 @@ export default {
 							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
 							this.$nextTick(() => {
-              this.$bus.$emit('value-updated', this.street + ',' + street_id);
+								this.$bus.$emit('value-updated', this.street + ',' +
+								street_id);
 
 							})
 
@@ -433,17 +400,17 @@ export default {
 			},
 
 
-    kkchange (e) {
+			kkchange(e) {
 				this.bgColor = e
 			},
 
-    navigator (url, t) {
+			navigator(url, t) {
 				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
 				uni.navigateTo({
 					url: url
 				})
 			},
-    getUserInfo: function () {
+			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfoData = res.data;
@@ -463,22 +430,22 @@ export default {
 				});
 			}
 		}
-};
+	};
 </script>
 <style lang="scss" scoped>
-.gather {
+	.gather {
 		padding-bottom: 164.91rpx;
 		background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
 		position: relative;
-}
+	}
 
-.sitebox {
+	.sitebox {
 		animation-name: fadeIn;
 		animation-duration: 3s;
 		animation-fill-mode: forwards;
-}
+	}
 
-@keyframes fadeIn {
+	@keyframes fadeIn {
 		from {
 			opacity: 0;
 		}
@@ -486,9 +453,9 @@ export default {
 		to {
 			opacity: 1;
 		}
-}
+	}
 
-.site-box {
+	.site-box {
 		width: 100%;
 		/* #ifdef MP || APP-PLUS */
 		height: 160rpx;
@@ -528,24 +495,24 @@ export default {
 			font-size: 30rpx;
 			font-size: 35.09rpx;
 		}
-}
+	}
 
-.top_box {
+	.top_box {
 		// padding-top: 180rpx;
 		background: linear-gradient(#36a2ff, #fff);
-}
+	}
 
-.com {
+	.com {
 		margin-left: 50%;
 		transform: translate(-50%);
-}
+	}
 
-.business {
+	.business {
 		width: 694.74rpx;
 		// margin-bottom: 175rpx;
-}
+	}
 
-.special_work {
+	.special_work {
 		// padding: 17.54rpx;
 		width: 694.74rpx;
 		margin-top: 52.63rpx;
@@ -596,13 +563,13 @@ export default {
 				// margin: 0 0 33.33rpx 33.33rpx !important;
 
 				.icon_img {
-        width: 63.16rpx;
+					width: 83.16rpx;
-        height: 63.16rpx;
+					height: 83.16rpx;
 				}
 
 				.icon {
 					position: absolute;
-        top: 0rpx;
+					top: -5rpx;
 					right: 25rpx;
 				}
 
@@ -635,10 +602,10 @@ export default {
 				}
 			}
 		}
-}
+	}
 
-.edit_card {
+	.edit_card {
 		background-color: #fff;
 		padding-top: 28rpx;
-}
+	}
 </style>

pages/index/index.vue

@@ -2,16 +2,29 @@
   <view class="Circle_friends">
     <view class="circle_friends_wrapper">
       <view v-if="isFshow">
-				<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
+        <view
-
+          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 class="town_name" style="color: #000">{{ street }}</view>
           </view>
-					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+          <navigator
-						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
+            url="/pages/chat/customer_list/index?type=0"
+            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">
@@ -19,34 +32,53 @@
 						<img :src="bgColor" alt="">
 					</view>
 				</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 :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
+        <u-tabs
-					:activeStyle="activeStyle" itemStyle="padding-left: 0px;  height: 33px;"></u-tabs>
+          :list="tabsData.list"
-			</view>
+          @click="tabsChange"
-			<view class="">
+          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' />
+        <WaterfallsFlow :wfList="cateGoods" />
       </view>
       <view class="empty_wrapper" v-if="emptyShow">
-				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+        <u-empty
+          :show="emptyShow"
+          mode="list"
+          icon="http://cdn.uviewui.com/uview/empty/list.png"
+        ></u-empty>
       </view>
     </view>
 
-		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+    <u-picker
-			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+      :defaultIndex="[0, 0]"
-		<u-loadmore :status="status" v-if="cateGoods.length>=where.limit" />
+      :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> -->
 
     <!-- <m-tabbar native>
@@ -56,56 +88,52 @@
         </view>
       </template>
     </m-tabbar> -->
-		<view class="location" v-if='isshow'>
+    <view class="location" v-if="isshow">
-			<view class="locationa">
+      <view class="locationa"> 位置权限使用说明 </view>
-				位置权限使用说明
+      <view class="locationb"> 用于向你推荐最近门店 </view>
-			</view>
-			<view class="locationb">
-				用于向你推荐最近门店
-			</view>
     </view>
   </view>
 </template>
 
 <script>
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import zbpSwiper from '@/components/zbpSwiper'
+import zbpSwiper from '@/components/zbpSwiper'
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlows.vue'
+import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlows.vue'
 
-	import {
+import {
   getSlideAPI
-	} from '@/api/lihai.js'
+} from '@/api/lihai.js'
-	import {
+import {
   graphicLstApi,
   getTopicList,
   graphicStartApi
-	} from '@/api/community.js'
+} from '@/api/community.js'
-	import {
+import {
   getIndexData,
   getDiy,
   getArticleList,
   getArticleCategoryLists
-	} from '@/api/api.js'
+} from '@/api/api.js'
-	import {
+import {
   getGeocoder,
   merClassifly
-	} from '@/api/store.js';
+} from '@/api/store.js';
-	import {
+import {
   getArea,
   getStreet
-	} from '@/api/article.js';
+} from '@/api/article.js';
-	import {
+import {
   Toast
-	} from '@/libs/uniApi'
+} from '@/libs/uniApi'
-	export default {
+export default {
   components: {
     mTabbar,
     zbpSwiper,
     easyLoadimage,
     WaterfallsFlow
   },
-		data() {
+  data () {
     return {
       activeStyle: {
 
@@ -151,7 +179,7 @@
     }
   },
 
-		onPullDownRefresh() {
+  onPullDownRefresh () {
     this.getCateList()
     this.cateGoods = []
     this.getGoods()
@@ -159,7 +187,7 @@
     uni.stopPullDownRefresh()
   },
 
-		onLoad() {
+  onLoad () {
 
 
 
@@ -186,7 +214,7 @@
 
 		},
 		onTabItemTap(e) {
-			if (e.text.length>=4) {
+			if (e.text.length >= 4) {
 				uni.pageScrollTo({
 					selector: ".Circle_friends",
 					scrollTop: 0
@@ -206,6 +234,28 @@
 			// 监听页面滚动事件
 			window.addEventListener("scroll", this.scrolling);
 			// #endif
+  },
+  onTabItemTap (e) {
+    if (e.text.length >= 4) {
+      uni.pageScrollTo({
+        selector: ".Circle_friends",
+        scrollTop: 0
+      })
+
+    }
+  },
+  onReachBottom () {
+    if (this.status == 'nomore') return;
+    this.status = 'loading';
+    this.where.page = ++this.where.page;
+    this.getGoods()
+  },
+  mounted () {
+    this.selfLocation()
+    // #ifdef  H5
+    // 监听页面滚动事件
+    window.addEventListener("scroll", this.scrolling);
+    // #endif
 
     this.$bus.$on('value-updated', (newValue) => {
       // 更新父组件的值 
@@ -214,7 +264,7 @@
     });
   },
   // #ifdef APP-PLUS
-		onPageScroll(e) {
+  onPageScroll (e) {
 
     const scrollTop = e.scrollTop;
 
@@ -249,13 +299,13 @@
 
   },
   // #endif
-		beforeDestroy() {
+  beforeDestroy () {
     // 销毁监听事件
     this.$bus.$off('value-updated')
   },
   methods: {
 
-			scrolling() {
+    scrolling () {
       // 滚动条距文档顶部的距离
       let scrollTop =
         window.pageYOffset ||
@@ -305,17 +355,17 @@
 
     },
 
-			kkchange(e) {
+    kkchange (e) {
       this.bgColor = e
     },
 
 
-			tabsChange1(item) {
+    tabsChange1 (item) {
       this.getArticleList(item.article_category_id)
       this.streeta_id = item.id
       this.tabsData1.tabsActive = item.index
     },
-			async getArticle() {
+    async getArticle () {
       let list = []
 
       const {
@@ -334,7 +384,7 @@
       this.tabsData1.list = list
       this.getArticleList(list[0].article_category_id)
     },
-			async getArticleList(id) {
+    async getArticleList (id) {
       let obj = {
         is_home: 1
       }
@@ -343,25 +393,25 @@
       } = await getArticleList(id)
       this.articleList = data.list
     },
-			article(item) {
+    article (item) {
       uni.navigateTo({
         url: '/pages/news_details/index?id=' + item.article_id
       })
     },
-			selectPlce(e) {
+    selectPlce (e) {
       this.street_id = e.value[1].code
       this.town = e.value[1].name
       this.getCloudShopMerId(e.value[1].code)
     },
-			getCloudShopMerId(id) {
+    getCloudShopMerId (id) {
       get_cloud_shop(id).then(res => {
         res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
       })
     },
-			selectLocation() {
+    selectLocation () {
       this.showPicker = true
     },
-			confirm(e) {
+    confirm (e) {
 
       this.street = e.value[1].name
 
@@ -371,7 +421,7 @@
       })
       this.showPicker = false
     },
-			changeHandler(e) {
+    changeHandler (e) {
       const {
         columnIndex,
         value,
@@ -387,7 +437,7 @@
         });
       }
     },
-			Area() {
+    Area () {
       getArea({
         city_code: 510500
       }).then(res => {
@@ -395,19 +445,19 @@
         this.Street(res.data[0]['code']);
       });
     },
-			Street(code) {
+    Street (code) {
       getStreet({
         area_code: code
       }).then(res => {
         this.$refs.uPicker.setColumnValues(1, res.data);
       });
     },
-			dchange(e) {
+    dchange (e) {
 
       this.$refs.list.street = e.value[1].name
       this.street = e.value[1].name
     },
-			gogogo(item) {
+    gogogo (item) {
       if (item.video_link.length > 0) {
         uni.navigateTo({
           // #ifdef MP || H5
@@ -425,7 +475,7 @@
         })
       }
     },
-			giveStart(item) {
+    giveStart (item) {
       let status = item.relevance_id ? 0 : 1
       graphicStartApi(item.community_id, {
         status: status
@@ -440,7 +490,7 @@
         }
       })
     },
-			getGoods: function(item) {
+    getGoods: function (item) {
 
       graphicLstApi(this.where).then(res => {
         this.cateGoods.push(...res.data.list)
@@ -466,7 +516,7 @@
       })
     },
     /*获取分类列表*/
-			async getCateList() {
+    async getCateList () {
       const {
         data
       } = await getTopicList()
@@ -475,7 +525,7 @@
         category_id: 0
       }, ...data]
     },
-			tabsChange(item) {
+    tabsChange (item) {
       this.cateGoods = []
       this.where.category_id = item.category_id
       this.emptyShow = false
@@ -486,7 +536,7 @@
       this.tabsData.tabsActive = item.index
 
     },
-			selfLocation() {
+    selfLocation () {
       if (uni.getStorageSync('loction') == true) {
         this.isshow = false
       } else {
@@ -535,7 +585,7 @@
     /**
      * 设置手机通知权限
      */
-			setPermissions() {
+    setPermissions () {
       // #ifdef APP-PLUS  
       if (plus.os.name == 'Android') { // 判断是Android
         var main = plus.android.runtimeMainActivity();
@@ -556,7 +606,7 @@
             content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
             showCancel: false,
             confirmText: '去设置',
-							success: function(res) {
+            success: function (res) {
               if (res.confirm) {
                 var Intent = plus.android.importClass('android.content.Intent');
                 var Build = plus.android.importClass("android.os.Build");
@@ -602,7 +652,7 @@
             content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
             showCancel: false,
             confirmText: '去设置',
-							success: function(res) {
+            success: function (res) {
               if (res.confirm) {
                 var app = plus.ios.invoke('UIApplication', 'sharedApplication');
                 var setting = plus.ios.invoke('NSURL', 'URLWithString:',
@@ -618,18 +668,18 @@
       // #endif  
     }
   }
-	}
+}
 </script>
 
 <style lang="scss" scoped>
-	page {
+page {
-		background-color: #F4F7FE;
+  background-color: #f4f7fe;
 
   // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-	}
+}
 
-	.location {
+.location {
-		background-color: #F6F6F6;
+  background-color: #f6f6f6;
   width: 680rpx;
   height: 150rpx;
   position: absolute;
@@ -653,50 +703,46 @@
     font-size: 20rpx;
     color: #5a5a5a;
   }
-	}
+}
 
-	.Circle_friends {
+.Circle_friends {
   position: relative;
   padding: 0 0 87.72rpx 0;
 
-		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+  background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
-	}
+}
 
+// .bg-img {
+// 	position: absolute;
+// 	width: 100%;
+// 	height: 100%;
 
+// 	top: 0;
+// 	/* #ifdef MP || APP-PLUS */
+// 	z-index: -100;
+// 	/* #endif */
+// 	/* #ifdef H5 */
+// 	z-index: -100;
+// 	/* #endif */
+// 	z-index: -100;
+// 	filter: blur(0);
+// 	overflow: hidden;
 
-	// .bg-img {
+// 	img {
-	// 	position: absolute;
+// 		width: 100%;
-	// 	width: 100%;
+// 		height: 100%;
-	// 	height: 100%;
+// 		filter: blur(30rpx);
+// 		transform: scale(1.5);
+// 	}
+// }
 
-	// 	top: 0;
+.sitebox {
-	// 	/* #ifdef MP || APP-PLUS */
-	// 	z-index: -100;
-	// 	/* #endif */
-	// 	/* #ifdef H5 */
-	// 	z-index: -100;
-	// 	/* #endif */
-	// 	z-index: -100;
-	// 	filter: blur(0);
-	// 	overflow: hidden;
-
-
-	// 	img {
-	// 		width: 100%;
-	// 		height: 100%;
-	// 		filter: blur(30rpx);
-	// 		transform: scale(1.5);
-	// 	}
-	// }
-
-
-	.sitebox {
   animation-name: fadeIn;
   animation-duration: 3s;
   animation-fill-mode: forwards;
-	}
+}
 
-	@keyframes fadeIn {
+@keyframes fadeIn {
   from {
     opacity: 0;
   }
@@ -704,10 +750,9 @@
   to {
     opacity: 1;
   }
-	}
+}
 
-
+.site-box {
-	.site-box {
   width: 100%;
   /* #ifdef MP || APP-PLUS */
   height: 160rpx;
@@ -748,48 +793,43 @@
     font-size: 30rpx;
     font-size: 35.09rpx;
   }
-	}
+}
 
-
+.circle_friends_wrapper {
-
-	.circle_friends_wrapper {
   position: relative;
 
   z-index: 2;
-	}
+}
 
-	/deep/.u-tabs__wrapper__nav__line {
+/deep/.u-tabs__wrapper__nav__line {
   width: 46rpx;
   margin-left: -2rpx;
+}
 
-
+/deep/.u-tabs__wrapper__nav__item {
-	}
-
-	/deep/.u-tabs__wrapper__nav__item {
   padding: 0 0px;
   padding-right: 10rpx;
-	}
+}
 
-	.search_wrapper {
+.search_wrapper {
   width: 694.74rpx;
   margin: 0 auto;
-	}
+}
 
-	.tabs_wrapper {
+.tabs_wrapper {
   width: 720rpx;
   margin: 0 auto;
   margin-bottom: 21.05rpx;
   // margin-left: -20rpx;
+}
 
-	}
+.empty_wrapper {
-
-	.empty_wrapper {
   display: flex;
   align-items: center;
   justify-content: center;
-	}
+}
 
-	.article_box {
+.article_box {
   height: 100%;
   width: 694.74rpx;
   margin: 0 auto;
@@ -840,9 +880,9 @@
       }
     }
   }
-	}
+}
 
-	.tabs_wrapper {
+.tabs_wrapper {
   width: 723rpx;
   margin: 0rpx auto;
   margin-bottom: 21.05rpx;
@@ -852,23 +892,23 @@
     font-weight: bold;
 
     &::before {
-				content: '';
+      content: "";
       display: inline-block;
       width: 3px;
       height: 31.58rpx;
-				background-color: #F84221;
+      background-color: #f84221;
       margin-right: 7.02rpx;
     }
   }
-	}
+}
 
-	.goodslist {
+.goodslist {
   // display: flex;
   margin: 0 auto;
   width: 725rpx;
-	}
+}
 
-	.goods {
+.goods {
   margin: 0 auto;
   width: 725rpx;
 
@@ -965,7 +1005,7 @@
           align-items: center;
 
           .isshow {
-							color: #FE3530 !important;
+            color: #fe3530 !important;
           }
 
           .iconfont {
@@ -973,7 +1013,7 @@
           }
 
           .icon-shoucang1 {
-							color: #F84221;
+            color: #f84221;
           }
 
           .collect {
@@ -985,11 +1025,9 @@
     }
   }
 
-
   .goods_items {
     width: 356rpx;
 
-
     border-radius: 8px;
     overflow: hidden;
     background-color: #fff;
@@ -1070,7 +1108,7 @@
           align-items: center;
 
           .isshow {
-							color: #FE3530 !important;
+            color: #fe3530 !important;
           }
 
           .iconfont {
@@ -1078,7 +1116,7 @@
           }
 
           .icon-shoucang1 {
-							color: #F84221;
+            color: #f84221;
           }
 
           .collect {
@@ -1089,6 +1127,5 @@
       }
     }
   }
-
+}
-	}
 </style>

pages/nongKe/supply_chain/supplierA.vue

@@ -1,5 +1,9 @@
 <template>
 	<view style="background-color: #F0F2F5;min-height: 100vh">
+
+
+		<view class="">
+
 			<view style="height: var(--status-bar-height);"></view>
 			<view class='productList' :style="viewColor">
 				<!-- 顶部 -->
@@ -262,6 +266,8 @@
 		</view>
 
 	</view>
+
+	</view>
 </template>
 
 <script>

pages/product/basicSet.vue

@@ -132,7 +132,8 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
-			<view class="item_cell flex_a_c">
+			
+			<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
 			</view>
@@ -154,6 +155,7 @@
         <text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
       </view> -->
 
+
 		</view>
 
 		<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
@@ -265,7 +267,8 @@
 				credit_buy: false, //开启信用购
 				interest_rate: '', //利率
 				settle_cycle: '', //周期
-				mer_name:''
+				mer_name:'',
+				type_code:''
 			}
 		},
 		onLoad(e) {
@@ -295,6 +298,7 @@
 					res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
 					})
+					this.type_code= res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
 					this.cruxText = res.data.mer_keyword

pages/short_video/appSwiper/index.nvue

@@ -319,8 +319,7 @@
 		<view class="fixed-head">
 			<view class="sys-head" :style="{height:statusBarHeight}"></view>
 			<view class="tool-bar" @click='goBack()'>
-
+				<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
-				<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
 			</view>
 		</view>
 	</view>
@@ -707,9 +706,9 @@
 				videoList({
 					page: that.page,
 					limit: that.limit,
-							id:this.videoID
+					id: this.videoID
 
-						}).then(res=>{
+				}).then(res => {
 					that.getVideoData(res.data.list);
 				})
 
@@ -883,7 +882,7 @@
 				// 这个方法主要就是用来第一次进入视频播放时用来处理
 				deoList(this.videoID).then(async (res) => {
 					this.loadVideo = false
-					this.userUid=res.data.uid
+					this.userUid = res.data.uid
 					this.page = this.page + 1;
 					var msg = [res.data];
 					for (let i = 0; i < msg.length; i++) {
@@ -1240,6 +1239,7 @@
 		top: 70rpx;
 		height: 86rpx;
 		
+
 		.icon-xiangzuo {
 			margin-left: 10px;
 			width: 20px;

pages/short_video/nvueSwiper/index.nvue

@@ -775,8 +775,7 @@
 						page: that.page,
 						limit: that.limit,
 						id: this.videoID
-						// is_star: that.isSatrt,
+					
-						// community_id: that.videoID
 					}).then(res => {
 						that.videoData(res.data.list)
 						if (res.data.list.length < that.limit) {

pages/supply_chains/supply_chains.vue

@@ -88,7 +88,7 @@
 				</view>
 				<view class="list-con-right">
 					<view class="con-right" style="margin-bottom: 20rpx"
-						@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
+						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								当地美食
@@ -99,7 +99,8 @@
 						</view> -->
 						<image src="@/static/images/f7.png" mode="aspectFit"></image>
 					</view>
-					<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
+					<view class="con-right"
+						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								特色文旅
@@ -255,6 +256,10 @@
 
 			this.list()
 		},
+		beforeDestroy() {
+			// 销毁监听事件
+			this.$bus.$off('value-updated')
+		},
 		mounted() {
 
 			// #ifdef  H5
@@ -768,7 +773,7 @@
 
 						.titleb {
 							position: absolute;
-                            bottom:8rpx;
+							bottom: 8rpx;
 							font-size: 37rpx;
 							font-family: PingFang SC-Semibold, PingFang SC;
 							font-weight: 600;