Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into wpf

App.vue

@@ -77,17 +77,15 @@
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
 
-      // #ifdef APP-PLUS
 			//监听uni小程序发送的事件
-      mp.onUniMPEventReceive(ret=>{
+			mp.onUniMPEventReceive(ret => {
 				console.log('小程序事件: ', ret);
-        if(ret.event=='closeApp'){
+				if (ret.event == 'closeApp') {
-          mp.closeUniMP(ret.fromAppid, (ret)=>{
+					mp.closeUniMP(ret.fromAppid, (ret) => {
-            console.log('closeUniMP: '+JSON.stringify(ret));
+						console.log('closeUniMP: ' + JSON.stringify(ret));
 					});
 				}
 			});
-      // #endif
 
 			let that = this;
 			// #ifdef MP
@@ -231,6 +229,20 @@
 			}, 1500)
 			// #endif	
 		},
+		mounted() {
+			uni.onTabBarMidButtonTap((e) => {
+				// console.log("点击了", e);
+				uni.switchTab({
+					url: '/pages/plant_release/index'
+				})
+				// uni.navigateTo({
+				// 		url: '/pages/plant_release/index'
+				// })
+
+			});
+			uni.setTabBarItem((e) => { console.log("点击了", e)});
+		},
+
 		methods: {
 			/**
 			 * 语音播报

pages.json

@@ -278,6 +278,22 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "food/index",
+					"style": {
+						"navigationBarTitleText": "当地美食",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
+				}, {
+					"path": "tourism/index",
+					"style": {
+						"navigationBarTitleText": "特色文旅",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}
 			]
 		},
@@ -1497,6 +1513,7 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
+		"fontSize": "25rpx",
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
@@ -1513,10 +1530,12 @@
 				"pagePath": "pages/plant_release/index",
 				"iconPath": "static/tabbar_icon/d.png",
 				"selectedIconPath": "static/tabbar_icon/d-a.png",
-				"text": "发布"
+				"text": "发布",
+			    "visible":false
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
+				
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "供应"
@@ -1529,7 +1548,7 @@
 			}
 		],
 		"midButton": {
-			"width": "138rpx",
+			"width": "78rpx",
 			"height": "126rpx",
 			"iconWidth": "78rpx",
 			"pagePath": "pages/plant_release/index",

pages/gather/gather.vue

@@ -31,7 +31,7 @@
       :show="jurisdiction"
       mode="permission"
       :text="emptyText"
-      icon="/static/empty/permission.png"
+      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">
@@ -101,9 +101,12 @@
       </view>
     </view>
 
-    <!-- <view class="" v-if="jurisdiction == false && isShow == false">
+    <view class="" v-if="jurisdiction == false && isShow == false">
       <emptyPage title="暂无信息"></emptyPage>
-    </view> -->
+    </view>
+	<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+		@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+	
   </view>
 </template>
 
@@ -139,9 +142,7 @@ import {
 import {
   getDiy
 } from '@/api/api.js';
-// #ifdef APP-PLUS
 import uniMP from '@/utils/uniMP.js';
-// #endif
 
 export default {
   components: {
@@ -337,7 +338,7 @@ export default {
       uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
     },
     getUniMp (appid) {
-      console.log('点击小程序');
+      console.log('点击供销平台');
       // #ifdef APP-PLUS
       uniMP.loadMP(appid);
       return;
@@ -364,7 +365,7 @@ export default {
       }
     },
 
-    Area () {
+ Area() {
  	getArea({
  		city_code: 510500
  	}).then(res => {

pages/index/index.vue

@@ -2,15 +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">
@@ -18,34 +32,53 @@
 						<img :src="bgColor" alt="">
 					</view>
 				</view> -->
-
       </view>
 
-
+      <zbpSwiper
-			<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr" @kkchange='kkchange'
+        ref="list"
-				@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>
@@ -55,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: {
 
@@ -150,7 +179,7 @@
     }
   },
 
-		onPullDownRefresh() {
+  onPullDownRefresh () {
     this.getCateList()
     this.cateGoods = []
     this.getGoods()
@@ -158,12 +187,19 @@
     uni.stopPullDownRefresh()
   },
 
-		onLoad() {
+  onLoad () {
+
+
+
     this.getCateList()
-			this.getArticle()
+    // this.getArticle()
     this.getGoods()
     this.Area()
-			// this.setPermissions()
+    //this.setPermissions()
+
+
+
+
     // this.openTongZhi()
     uni.$on('connectstatusChange', (connectstatus) => {
       var connectstr = ''
@@ -177,14 +213,22 @@
     })
 
   },
+  onTabItemTap (e) {
+    if (e.text.length >= 4) {
+      uni.pageScrollTo({
+        selector: ".Circle_friends",
+        scrollTop: 0
+      })
 
-		onReachBottom() {
+    }
+  },
+  onReachBottom () {
     if (this.status == 'nomore') return;
     this.status = 'loading';
     this.where.page = ++this.where.page;
     this.getGoods()
   },
-		mounted() {
+  mounted () {
     this.selfLocation()
     // #ifdef  H5
     // 监听页面滚动事件
@@ -198,7 +242,7 @@
     });
   },
   // #ifdef APP-PLUS
-		onPageScroll(e) {
+  onPageScroll (e) {
 
     const scrollTop = e.scrollTop;
 
@@ -208,6 +252,12 @@
       this.backColor = 'rgba(252, 252, 252, 0.0)'
       this.isFshow = false
       this.show = true
+      uni.setTabBarItem({
+        index: 0,
+        text: "泸州",
+        iconPath: '/static/tabbar_icon/a.png',
+        selectedIconPath: '/static/tabbar_icon/a-a.png'
+      });
     } else if (20 < scrollTop && scrollTop <= 100) {
       this.backColor = 'rgba(255, 255, 255, 0.5)'
       this.isFshow = true
@@ -216,15 +266,24 @@
       this.backColor = 'rgba(252, 252, 252, 1.0)'
       this.isFshow = true
       this.show = false
+      uni.setTabBarItem({
+        index: 0,
+        text: '返回顶部',
+        iconPath: '/static/tabbar_icon/top.png',
+        selectedIconPath: '/static/tabbar_icon/top.png'
+      });
     }
 
 
   },
   // #endif
-
+  beforeDestroy () {
+    // 销毁监听事件
+    this.$bus.$off('value-updated')
+  },
   methods: {
 
-			scrolling() {
+    scrolling () {
       // 滚动条距文档顶部的距离
       let scrollTop =
         window.pageYOffset ||
@@ -250,6 +309,12 @@
       if (scrollTop <= 20) {
         this.backColor = 'rgba(252, 252, 252, 0.0)'
         this.isFshow = false
+        uni.setTabBarItem({
+          index: 0,
+          text: "泸州",
+          iconPath: '/static/tabbar_icon/a.png',
+          selectedIconPath: '/static/tabbar_icon/a-a.png'
+        });
       } else if (20 < scrollTop && scrollTop <= 100) {
         this.backColor = 'rgba(255, 255, 255, 0.5)'
         this.isFshow = true
@@ -257,23 +322,28 @@
         this.backColor = 'rgba(252, 252, 252, 1.0)'
         this.isFshow = true
 
-
+        uni.setTabBarItem({
+          index: 0,
+          text: '返回顶部',
+          iconPath: '/static/tabbar_icon/top.png',
+          selectedIconPath: '/static/tabbar_icon/top.png'
+        });
       }
 
 
     },
 
-			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 {
@@ -292,7 +362,7 @@
       this.tabsData1.list = list
       this.getArticleList(list[0].article_category_id)
     },
-			async getArticleList(id) {
+    async getArticleList (id) {
       let obj = {
         is_home: 1
       }
@@ -301,35 +371,35 @@
       } = 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
 
       this.$nextTick(() => {
-				this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
+        this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
       })
       this.showPicker = false
     },
-			changeHandler(e) {
+    changeHandler (e) {
       const {
         columnIndex,
         value,
@@ -345,7 +415,7 @@
         });
       }
     },
-			Area() {
+    Area () {
       getArea({
         city_code: 510500
       }).then(res => {
@@ -353,19 +423,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
@@ -383,7 +453,7 @@
         })
       }
     },
-			giveStart(item) {
+    giveStart (item) {
       let status = item.relevance_id ? 0 : 1
       graphicStartApi(item.community_id, {
         status: status
@@ -398,7 +468,7 @@
         }
       })
     },
-			getGoods: function(item) {
+    getGoods: function (item) {
 
       graphicLstApi(this.where).then(res => {
         this.cateGoods.push(...res.data.list)
@@ -424,7 +494,7 @@
       })
     },
     /*获取分类列表*/
-			async getCateList() {
+    async getCateList () {
       const {
         data
       } = await getTopicList()
@@ -433,7 +503,7 @@
         category_id: 0
       }, ...data]
     },
-			tabsChange(item) {
+    tabsChange (item) {
       this.cateGoods = []
       this.where.category_id = item.category_id
       this.emptyShow = false
@@ -444,7 +514,7 @@
       this.tabsData.tabsActive = item.index
 
     },
-			selfLocation() {
+    selfLocation () {
       if (uni.getStorageSync('loction') == true) {
         this.isshow = false
       } else {
@@ -468,7 +538,8 @@
             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);
 
             })
           }).catch(err => {
@@ -492,7 +563,7 @@
     /**
      * 设置手机通知权限
      */
-			setPermissions() {
+    setPermissions () {
       // #ifdef APP-PLUS  
       if (plus.os.name == 'Android') { // 判断是Android
         var main = plus.android.runtimeMainActivity();
@@ -513,7 +584,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");
@@ -559,7 +630,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:',
@@ -575,18 +646,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;
@@ -610,50 +681,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;
   }
@@ -661,10 +728,9 @@
   to {
     opacity: 1;
   }
-	}
+}
 
-
+.site-box {
-	.site-box {
   width: 100%;
   /* #ifdef MP || APP-PLUS */
   height: 160rpx;
@@ -705,47 +771,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;
@@ -796,9 +858,9 @@
       }
     }
   }
-	}
+}
 
-	.tabs_wrapper {
+.tabs_wrapper {
   width: 723rpx;
   margin: 0rpx auto;
   margin-bottom: 21.05rpx;
@@ -808,23 +870,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;
 
@@ -921,7 +983,7 @@
           align-items: center;
 
           .isshow {
-							color: #FE3530 !important;
+            color: #fe3530 !important;
           }
 
           .iconfont {
@@ -929,7 +991,7 @@
           }
 
           .icon-shoucang1 {
-							color: #F84221;
+            color: #f84221;
           }
 
           .collect {
@@ -941,11 +1003,9 @@
     }
   }
 
-
   .goods_items {
     width: 356rpx;
 
-
     border-radius: 8px;
     overflow: hidden;
     background-color: #fff;
@@ -1026,7 +1086,7 @@
           align-items: center;
 
           .isshow {
-							color: #FE3530 !important;
+            color: #fe3530 !important;
           }
 
           .iconfont {
@@ -1034,7 +1094,7 @@
           }
 
           .icon-shoucang1 {
-							color: #F84221;
+            color: #f84221;
           }
 
           .collect {
@@ -1045,6 +1105,5 @@
       }
     }
   }
-
+}
-	}
 </style>

pages/nongKe/specialty/indexa.vue

@@ -0,0 +1,324 @@
+<template>
+	<view class="box">
+		<view class="head">
+			<view style="height: var(--status-bar-height);"></view>
+			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
+				height="748.25rpx" @click="click"></u--image> -->
+			<view class="head_tit">
+				<view class="head_tit_l">
+					<view class="iconfont icon-xiangzuo"></view>
+					<view
+						style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);color:white;">
+						名优特产
+					</view>
+				</view>
+				<view class="head_tit_r" style="font-size: 29.79rpx;">
+					江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
+					<view class="" style="font-size: 22.78rpx;">
+						晴天30℃
+					</view>
+				</view>
+			</view>
+
+			<view class="head_serch">
+				<view style="position: relative;">
+					<!-- 	<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+						v-model="keyword" class="serch_cls"></u-search> -->
+					<!-- 	<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
+						src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
+				</view>
+			</view>
+
+			<view class="head_content">
+				<view style="font-size: 40rpx;font-weight: 700;color:white; margin-bottom: 10rpx;">
+					精选特产
+				</view>
+				<view class="head_content_card">
+
+					<u-scroll-list>
+						<view v-for="(item, index) in list" :key="index" class="goods_card">
+							<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+								width="210.28rpx" height="210.28rpx"></u--image>
+							<view class="goods_tit">
+								笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+							</view>
+							<view class="goods_price">
+								￥ 10.00
+							</view>
+
+							<!-- <image :src="item.thumb"></image> -->
+						</view>
+					</u-scroll-list>
+
+				</view>
+			</view>
+		</view>
+
+		<view class="store" style="background-color: white;">
+			<view class="goods_list">
+				<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
+					<view class="left">
+						<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+							height="157.71rpx"></u--image>
+					</view>
+					<view class="right">
+						<view class="li heads" style="display: flex;">
+							<text class="flag">特产</text>
+							<text class="com_name">{{item.mer_name}}</text>
+							<text
+								style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
+						</view>
+						<view class="li">
+							<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+								src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+							<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
+							<text>月销2000+</text>
+							<text>20分钟</text>
+							<text>1.1km</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+
+						<view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view style="color: red;">
+										$10.00
+									</view>
+
+									<!-- <image :src="item.thumb"></image> -->
+								</view>
+								<!-- <view v-for="(item, index) in list" :key="index">
+									<image :src="item.thumb"></image>
+								</view> -->
+							</u-scroll-list>
+						</view>
+						<!-- <view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" class="goods_card_a">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx" @click="click"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view class="goods_price">
+										$10.00
+									</view>
+								</view>
+							</u-scroll-list>
+						</view>
+ -->
+
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+	} from '@/api/store.js';
+	export default {
+		data() {
+			return {
+				keyword: "",
+				list: [1, 1, 1, 11, 1, 11, 11],
+				storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		onLaunch() {
+			console.log(46545)
+			// storeMerchantList().then(res => {
+			// 	// this.count = res.data.count
+			// 	// this.storeList = this.storeList.concat(res.data.list)
+			// 	// this.loading = false
+			// 	// this.loadingIcon = false
+			// 	console.log(res)
+			// })
+
+		},
+		onShow() {
+			// console.log(46545)
+			storeMerchantList().then(res => {
+				// this.count = res.data.count
+				this.storeList = res.data.list
+				// this.loading = false
+				// this.loadingIcon = false
+				// console.log(res)
+			})
+		},
+		methods: {},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head {
+		// background-color: #F94621;
+		background: url('/static/images/MYTC/BG.png') no-repeat;
+		padding: 20rpx;
+		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
+
+		.head_tit {
+			display: flex;
+			justify-content: space-between;
+			color: white;
+			// margin-bottom: 20rpx;
+
+			.head_tit_l {
+				display: flex;
+				align-items: center;
+			}
+
+			.head_tit_r {
+				// display: flex;
+				// align-items: center;
+			}
+		}
+
+		.head_serch {
+			margin: 20rpx 0;
+		}
+
+		.head_content {
+			.head_content_card {
+				background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
+				border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+				overflow: hidden;
+				padding: 20rpx 10rpx;
+
+				.goods_card {
+					margin-right: 20rpx;
+				}
+
+				.goods_tit {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+
+				.goods_price {
+					color: #F84221;
+					font-size: 29.79rpx;
+				}
+
+			}
+		}
+	}
+
+	.store {
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_cards {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					// background-color: red;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					// box-sizing: border-box;
+					width: 75vw;
+					overflow: hidden;
+					// background-color: red;
+
+					.heads {
+						font-weight: bold;
+
+						.flag {
+							background: linear-gradient(to bottom, #F84221, #FF6D20);
+							width: 66.59rpx;
+							height: 36.8rpx;
+							text-align: center;
+							font-size: 22.78rpx;
+							color: white;
+							border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+						}
+
+					}
+
+					.goods_card_a {
+						margin-right: 20rpx;
+					}
+
+					.goods_price_a {
+						color: #F84221;
+					}
+
+					.goods_tit_a {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+
+						align-items: center;
+						color: #737373;
+
+						text {
+							margin: 0 10rpx 0;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+</style>

pages/nongKe/supply_chain/supplier.vue

@@ -7,22 +7,26 @@
 				<view style="height: 10px;">
 
 				</view>
-				<view style="display: flex;justify-content: space-around; align-items: center;">
+
-					<view class="back" @click='backjJump()'>
+
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
 							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
 						</view>
 						<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
 							供销综合云市场
 						</view>
+					</view>
+
 					<view style="position: relative;width: 289.14rpx;">
 						<!-- <text class='iconfont icon-sousuo'></text>
 			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
 							placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
-							height="56.82rpx"></u--image>
 					</view>
 					<view class='iconfont search-right'
 						@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
@@ -30,6 +34,9 @@
 							height="50.82rpx"></u--image>
 					</view>
 				</view>
+
+
+
 			</view>
 			<view class="content">
 				<view style="background-color: red;height: 10px">
@@ -771,6 +778,14 @@
 		/* 可根据实际情况调整容器宽度 */
 	}
 
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
 	.productList {
 		// padding-top: 50rpx;
 		// padding: 0 20rpx 0;
@@ -1350,6 +1365,14 @@
 		margin: 30px auto;
 	}
 
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
+
+	}
+
 	.pop {
 		z-index: 1;
 	}

pages/nongKe/supply_chain/supplierA.vue

@@ -6,22 +6,26 @@
 			<view class="top">
 				<view style="height: 10px;">
 				</view>
-				<view style="display: flex;justify-content: space-around; align-items: center;">
+				<view class="head_tit">
-					<view class="back" @click='backjJump()'>
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
 							<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
 						</view>
-					<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+						<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
 							{{titName}}
 						</view>
+					</view>
+					<view class="">
+
+					</view>
 					<view style="position: relative;">
 						<!-- <text class='iconfont icon-sousuo'></text>
 			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
-						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
-							height="56.82rpx"></u--image>
 					</view>
 
 				</view>
@@ -374,6 +378,7 @@
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
 			}
+
 			this.credit_buy = options.credit_buy
 			this.sotreParam.type_id = options.type_id
 			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
@@ -391,7 +396,14 @@
 				let index = this.menuList.findIndex((item) => {
 					return item.merchant_category_id == options.merchant_category_id;
 				});
+				if (options.tit) {
+					this.titName = "先货后款"
+					return
+				}
 				this.titName = this.menuList[index].category_name
+
+
+
 				// console.log(this.menuList)
 			})
 			// console.log(this.menuList)
@@ -1034,6 +1046,14 @@
 		margin-left: 10rpx;
 	}
 
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
 	.store-wrapper {
 		margin-top: 235rpx;
 		border-top: 1px solid #F6F6F6;
@@ -1307,13 +1327,11 @@
 		}
 	}
 
-	.guanbi {
+	.img_cls {
-		width: 20px;
+		position: absolute;
-		height: 20px;
+		top: 50%;
-		margin: 30px auto;
+		right: 7rpx;
-	}
+		transform: translateY(-50%);
 
-	.pop {
-		z-index: 1;
 	}
 </style>

pages/short_video/appSwiper/index.nvue

@@ -320,7 +320,7 @@
 			<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>
@@ -704,7 +704,12 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
-				videoList().then(res=>{
+				videoList({
+							page: that.page,
+							limit: that.limit,
+							id:this.videoID
+						
+						}).then(res=>{
 				   that.getVideoData(res.data.list);
 				})
 				
@@ -1325,7 +1330,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 120px;
+		bottom: 400rpx;
 		right: 10px;
 		display: flex;
 		align-items: center;

pages/short_video/nvueSwiper/index.nvue

@@ -15,10 +15,14 @@
 		<!-- 头部导航 -->
 
 
-		<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
 
 		<view class="header">
 			<view class="tool-bar">
+				<view class='xiangzuo' @tap='goBack'>
+					<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
+				</view>
+			</view>
+			<!-- <view class="tool-bar">
 				<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
 			</view>
 			<view class="items" @click.stop="navTap(2)">
@@ -32,11 +36,12 @@
 			</view>
 			<view class="items" @click.stop="navTap(4)">
 				<text class="tName" :class="currentNav==4?'on':''">社区</text>
-			</view>
-			
 			</view> -->
-		<swiper v-show="currentNav !== 3&&currentNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
+
-			:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
+		</view>
+		<swiper v-show="currentNav !== 3&&currentNav != 4"
+			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :vertical="true"
+			@animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
 			<swiper-item v-for="(list,index) in dataList">
 				<view v-if="max > index">
 
@@ -425,6 +430,7 @@
 				communityId: '',
 				Listcount: '',
 				loadMore: true,
+				videoshow: true
 			}
 		},
 		watch: {
@@ -742,9 +748,11 @@
 				}
 			},
 			get() {
+
 				let that = this
+
 				// 1.这里引入后端请求数据
-				    if(this.videoID){
+				if (that.videoshow) {
 					deoList(this.videoID).then(res => {
 						that.videoData([res.data])
 						if (res.data.list.length < that.limit) {
@@ -757,10 +765,29 @@
 							duration: 2000
 						});
 					})
-						this.videoID=''
+					this.videoshow = false
-					}else{
+				} else {
-						videoList().then(res=>{
+					// videoList().then(res=>{
-						  that.videoData(res.data.list);
+					//   that.videoData(res.data.list);
+					// })
+					// console.log(that.userUid,that.videoID)
+					videoList({
+						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) {
+							this.loadMore = false;
+						}
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
 					})
 				}
 
@@ -781,7 +808,8 @@
 				// 			icon: 'none',
 				// 			duration: 2000
 				// 		});
-				// 	}) :
+				// 	})
+				//:
 				// 	graphicLstApi({
 				// 		page: that.page,
 				// 		limit: that.limit,
@@ -1307,12 +1335,16 @@
 			display: flex;
 			justify-content: center;
 
-			.icon-xiangzuo {
+			.xiangzuo {
+				width: 23rpx;
+				height: 42rpx;
 				margin-right: 40rpx;
 				margin-left: 20rpx;
-				font-size: 30rpx;
+
-				color: #333;
+				image {
-				margin-top: 60rpx;
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 
@@ -1413,7 +1445,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 60rpx;
+		bottom: 420rpx;
 		right: 20rpx;
 		flex-direction: column;
 		text-align: center;

pages/supply_chains/supply_chains.vue

@@ -74,7 +74,8 @@
 			</view>
 
 			<view class="list-con">
-				<view class="list-con-left" @tap="navgo('/pages/nongKe/specialty/index')">
+				<view class="list-con-left"
+					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
 					<!-- <view class="list-con-title">
 						<view class="con-titlea">
 							名优特产
@@ -86,7 +87,8 @@
 					<image src="@/static/images/f5.png" mode="aspectFit"></image>
 				</view>
 				<view class="list-con-right">
-					<view class="con-right" style="margin-bottom: 20rpx" @click="navaction(1)">
+					<view class="con-right" style="margin-bottom: 20rpx"
+						@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								当地美食
@@ -97,7 +99,7 @@
 						</view> -->
 						<image src="@/static/images/f7.png" mode="aspectFit"></image>
 					</view>
-					<view class="con-right" @click="navaction(2)">
+					<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
 						<!-- <view class="list-con-title">
 							<view class="con-titlea">
 								特色文旅

pages/users/order_confirm/index.vue

@@ -1301,6 +1301,7 @@
 									});
 								},
 								fail: (e) => {
+										console.log(e,'111111111')
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
 										'&msg=取消支付' + '&product_type=' + that.product_type;
@@ -1311,16 +1312,17 @@
 										url: url
 									});
 								},
-								complete: () => {
+								complete: (res) => {
+								uni.hideLoading();
 									// 暂不跳转
-									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&product_type=' + that.product_type;
+									// 	'&msg=取消支付' + '&product_type=' + that.product_type;
-									return that.$util.Tips({
+									// return that.$util.Tips({
-										title: '取消支付',
+									// 	title: '取消支付',
-									}, {
+									// }, {
-										tab: 4,
+									// 	tab: 4,
-										url: url
+									// 	url: url
-									});
+									// });
 								},
 							});
 							// #endif
@@ -1414,17 +1416,17 @@
 								},
 								complete: () => {
 									uni.hideLoading();
-									// 暂不跳转
+									// // 暂不跳转
-									let pages = '/pages/order_pay_status/index?order_id=' +
+									// let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&product_type=' + that
+									// 	orderId + '&msg=取消支付' + '&product_type=' + that
-										.product_type
+									// 	.product_type
 
-									return that.$util.Tips({
+									// return that.$util.Tips({
-										title: '取消支付'
+									// 	title: '取消支付'
-									}, {
+									// }, {
-										tab: 5,
+									// 	tab: 5,
-										url: pages
+									// 	url: pages
-									});
+									// });
 								},
 							});
 							break;

pages/users/supply_procurement/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="conent">
-		<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
+		<view class="con_kuo"
+			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
 			<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
 			<view class="con_text">
@@ -8,7 +9,8 @@
 				<span>先付款后发货</span>
 			</view>
 		</view>
-		<view class="con_kuo"  @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)">
+		<view class="con_kuo"
+			@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)">
 			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
 			<view class="con_text">
@@ -21,16 +23,16 @@
 
 <script>
 	export default {
-		data(){
+		data() {
-			return{
+			return {
-				id:''
+				id: ''
 			}
 		},
 		onLoad(option) {
 
-			this.id=option.cate_id
+			this.id = option.cate_id
 		},
-		methods:{
+		methods: {
 			navigator(url, t) {
 				uni.navigateTo({
 					url: url
@@ -38,33 +40,37 @@
 			},
 		}
 	}
-
 </script>
 
 <style lang="scss" scoped>
-	*{
+	* {
 		padding: 0;
 		margin: 0;
 	}
-	.conent{
+
+	.conent {
 		width: 100%;
 		display: flex;
 		justify-content: space-around;
 		margin-top: 20px;
-		.con_kuo{
+
+		.con_kuo {
 			position: relative;
-			.con_img{
+
+			.con_img {
 				width: 192px;
 				height: 92px;
 			}
-			.con_ico{
+
+			.con_ico {
 				position: absolute;
 				left: 25px;
 				top: 32px;
 				width: 31px;
 				height: 32px;
 			}
-			.con_text{
+
+			.con_text {
 				position: absolute;
 				left: 66px;
 				top: 20px;