From 40c21cef29868a16143781f478683982d12eb28b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 13 Jan 2024 18:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store.js                                  |    9 +
 api/user.js                                   |    5 +
 components/WaterfallsFlow/WaterfallsFlowp.vue |  195 ++
 .../WaterfallsFlowItemp.vue                   |  347 +++
 components/shortPopup.vue                     |    4 +-
 pages.json                                    |    8 +
 pages/goods_details/index_v.vue               |   12 +-
 pages/nongKe/specialty/index.vue              |    7 +-
 pages/nongKe/specialty/short_index.vue        | 2040 +++++++++++++++++
 pages/order_details/stay.vue                  |   10 +-
 pages/order_pay_status/index.vue              |    7 +-
 pages/select_address/select_address_n.nvue    |    1 -
 pages/supply_chains/supply_chains.vue         |   10 +-
 pages/user/index.vue                          |    2 +-
 pages/users/order_confirm/index.vue           |   19 +-
 pages/users/order_list/index.vue              |   12 +-
 pages/users/user_info/index.vue               |   27 +-
 17 files changed, 2672 insertions(+), 43 deletions(-)
 create mode 100644 components/WaterfallsFlow/WaterfallsFlowp.vue
 create mode 100644 components/WaterfallsFlowItem/WaterfallsFlowItemp.vue
 create mode 100644 pages/nongKe/specialty/short_index.vue

diff --git a/api/store.js b/api/store.js
index eee6dc6..3ef1f67 100644
--- a/api/store.js
+++ b/api/store.js
@@ -599,4 +599,13 @@ export function merchantLicenseIdentify(data) {
 	return request.post(`merchant_license_identify`, data, {
 		noAuth: true
 	});
+}
+
+/*
+	从供销平台获取村店铺负责人,联系电话
+*/
+export function getVillageInfo(data) {
+	return requestb.get(`shop_call/getVillageCompany`, data, {
+		noAuth: true
+	});
 }
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index 4594d26..5d2c556 100644
--- a/api/user.js
+++ b/api/user.js
@@ -730,3 +730,8 @@ export function getBillDetil() {
 export function merstreet(data) {
   return request1.get(`company/street_company`, data);
 }
+
+//填写邀请码
+export function bindPromotionCode(data) {
+  return request.post(`user/change/bind_promotion_code`, data)
+}
\ No newline at end of file
diff --git a/components/WaterfallsFlow/WaterfallsFlowp.vue b/components/WaterfallsFlow/WaterfallsFlowp.vue
new file mode 100644
index 0000000..5dae0de
--- /dev/null
+++ b/components/WaterfallsFlow/WaterfallsFlowp.vue
@@ -0,0 +1,195 @@
+<template>
+    <view :class="'wf-page wf-page'+type">
+        <!--    left    -->
+        <view>
+            <view id="left" v-if="leftList.length">
+                <view v-for="(item,index) in leftList" :key="index"
+                      class="wf-item" @tap="itemTap(item)">
+                    <WaterfallsFlowItemp :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+        <!--    right    -->
+        <view>
+            <view id="right" v-if="rightList.length">
+                <view v-for="(item,index) in rightList" :key="index"
+                      class="wf-item" @tap="itemTap(item)">					  
+                    <WaterfallsFlowItemp :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItemp from '../WaterfallsFlowItem/WaterfallsFlowItemp.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItemp
+    },
+    props: {
+        // 瀑布流列表
+        wfList: {
+            type: Array,
+            require: true
+        },
+        updateNum: {
+            type: Number,
+            default: 10
+        },
+		type: {
+			type: Number,
+			default: 0			
+		},
+		isStore: {
+			type: [String, Number],
+			default: '1'
+		},
+    },
+    data() {
+        return {
+            allList: [],       // 全部列表
+            leftList: [],      // 左边列表
+            rightList: [],     // 右边列表
+            mark: 0,           // 列表标记
+            boxHeight: [],     // 下标0和1分别为左列和右列高度
+        };
+    },
+    watch: {
+        // 监听列表数据变化
+        wfList:  {
+			handler(nVal,oVal){
+				// 如果数据为空或新的列表数据少于旧的列表数据（通常为下拉刷新或切换排序或使用筛选器），初始化变量
+				if (!this.wfList.length ||
+				    (this.wfList.length === this.updateNum && this.wfList.length <= this.allList.length)) {
+				    this.allList = [];
+				    this.leftList = [];
+				    this.rightList = [];
+				    this.boxHeight = [];
+				    this.mark = 0;
+				}
+				
+				// 如果列表有值，调用waterfall方法
+				if (this.wfList.length) {
+				    this.allList = this.wfList;
+					this.leftList = [];
+					this.rightList = [];
+					this.boxHeight = [];
+					this.allList.forEach((v, i) => {
+						if(this.allList.length < 3 || (this.allList.length <= 7  && this.allList.length - i > 1) || (this.allList.length > 7 && this.allList.length - i > 2)) {
+							if(i % 2){
+								this.rightList.push(v);
+							}else{
+								this.leftList.push(v);
+							}
+						}
+					});
+					if(this.allList.length < 3){
+						this.mark = this.allList.length+1;
+					}else if(this.allList.length <= 7){
+						this.mark = this.allList.length - 1;
+					}else{
+						this.mark = this.allList.length - 2;
+					}
+					if(this.mark < this.allList.length){
+						this.waterFall()
+					}
+				}
+			},
+			immediate: true,
+			deep:true
+        },
+		mounted(){
+		},
+
+        // 监听标记，当标记发生变化，则执行下一个item排序
+        mark() {
+            const len = this.allList.length;
+            if (this.mark < len && this.mark !== 0 && this.boxHeight.length) {
+                this.waterFall();
+            }
+        }
+    },
+    methods: {
+        // 瀑布流排序
+        waterFall() {
+            const i = this.mark;
+            if (i == 0) {
+                // 初始化，从左边开始插入
+                this.leftList.push(this.allList[i]);
+                // 更新左边列表高度
+                this.getViewHeight(0);
+            } else if (i == 1) {
+                // 第二个item插入，默认为右边插入
+                this.rightList.push(this.allList[i]);
+                // 更新右边列表高度
+                this.getViewHeight(1);
+            } else {
+                // 根据左右列表高度判断下一个item应该插入哪边
+                if(!this.boxHeight.length){
+                	this.rightList.length < this.leftList.length 
+                	? this.rightList.push(this.allList[i])
+                	: this.leftList.push(this.allList[i]);
+                } else {
+                	const leftOrRight = this.boxHeight[0] > this.boxHeight[1] ? 1 : 0;
+                	if (leftOrRight) {
+                	    this.rightList.push(this.allList[i])
+                	} else {
+                	    this.leftList.push(this.allList[i])
+                	}
+                }
+				// 更新插入列表高度
+				this.getViewHeight();
+            }
+        },
+        // 获取列表高度
+        getViewHeight() {
+            // 使用nextTick，确保页面更新结束后，再请求高度
+            this.$nextTick(() => {
+            	setTimeout(()=>{
+            		uni.createSelectorQuery().in(this).select('#right').boundingClientRect(res => {
+            				res ? this.boxHeight[1] = res.height : '';
+            			uni.createSelectorQuery().in(this).select('#left').boundingClientRect(res => {
+            				res ? this.boxHeight[0] = res.height : '';	
+            				this.mark = this.mark + 1;				
+            			}).exec();
+            		}).exec();
+            	},100)               
+            })
+        },
+        // item点击
+        itemTap(item) {
+            this.$emit('itemTap', item)
+        },
+        // item点击
+        goShop(item) {
+            this.$emit('goShop', item)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+$page-padding: 10px;
+$grid-gap: 10px;
+
+.wf-page {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: $grid-gap;
+}
+.wf-item {
+    width: calc((100vw - 2 * #{$page-padding} - #{$grid-gap}) / 2);
+    padding-bottom: $grid-gap;
+}
+.wf-page1 .wf-item{
+	margin-top: 20rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	padding-bottom: 0;
+}
+.wf-item-page{
+	padding-bottom: 20rpx;
+}
+</style>
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemp.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemp.vue
new file mode 100644
index 0000000..6c34a99
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItemp.vue
@@ -0,0 +1,347 @@
+<template>
+    <view v-if="type == 0" class="wf-item-page wf-page0" :style="viewColor">
+		<view class='pictrue'>
+			<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+			<view v-if="item.stock == 0" class="sell_out">已售罄</view>
+			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+		</view> 
+		<view class="text">
+			<view class='name line2'>{{item.store_name}}</view>			
+			<view class="acea-row row-middle">
+				<view class='money'>￥<text class='num'>{{item.price}}</text></view>				
+			</view>
+			<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle svip">
+				<text class='vip-money'>￥{{item.svip_price}}</text>
+				<view class="vipImg">
+					<image src="/static/images/svip.png"></image>
+				</view>
+			</view>
+			<view class="item_tags">
+			<!-- 	<text v-if="item.product_type == 0 && item.merchant.type_name" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
+				<text v-else-if="item.product_type == 0 && item.merchant.is_trader" class="font-bg-red b-color">自营</text> -->
+				<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+				<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+				<!-- <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> -->
+			</view>
+		</view>
+    </view>
+	<view v-else-if="type == 1" class="wf-page1" :style="viewColor">
+		<view class='pictrue'>
+			<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+			<view v-if="item.stock == 0" class="sell_out">已售罄</view>
+			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+		</view>
+		<view class='text'>
+			<view class='name line2'>{{item.store_name}}</view>
+			<view class='money'>
+				￥<text class='num'>{{item.price}}</text>	
+			</view>
+			<view v-if="item.show_svip_info.show_svip && item.show_svip_info.show_svip_price" class="acea-row row-middle svip">
+				<text class='vip-money'>￥{{item.svip_price}}</text>
+				<view class="vipImg">
+					<image src="/static/images/svip.png"></image>
+				</view>
+			</view>
+			<view class="item_tags acea-row">
+			<!-- 	<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
+				<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red b-color">自营</text> -->
+				<text v-if="item.product_type != 0" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+				<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+				<!-- <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> -->
+			</view>
+			<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论<text v-if="item.merchant" style="margin-left: 10rpx;">{{item.merchant.street_name}}</text></view>
+			<view class="company" v-if="item.merchant" @click.stop="goShop(item.merchant.mer_id)">
+				<text class="line1">{{item.merchant.village_name}}</text>
+				<!-- <view class="flex" v-if="isStore != '1'">
+					进店
+					<text class="iconfont icon-xiangyou"></text>
+				</view> -->
+			</view>
+		</view>
+		<!-- 返佣 -->
+		<block v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)">
+			<view class="foot-bar">
+				<text class="iconfont icon-fenxiang"></text>
+				最高赚 ¥{{item.max_extension}}
+			</view>
+		</block>
+	</view>	
+</template>
+
+<script>
+import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
+import {mapGetters} from "vuex";
+export default {
+	components:{easyLoadimage},
+	computed: mapGetters(['viewColor']),
+    props: {
+			item: {
+				type: Object,
+				require: true
+			},
+		type: {
+			type: Number|String,
+			default: 0
+		},
+		isStore: {
+			type: [String, Number],
+			default: '1'
+		},
+		isLogin: {
+			type: Boolean,
+			require: false
+		}
+  },
+	data(){
+		return {
+		}
+	},
+	methods: {
+		goShop(id) {
+			this.$emit('goShop', id);
+		},
+		authOpen(){
+			this.$emit('authOpen');
+		},
+		followToggle(item){
+			this.$emit('followToggle', item);
+		}
+	}	
+}
+
+</script>
+<style lang="scss" scoped>
+.wf-item-page {
+	background: #fff;
+	overflow: hidden;
+	border-radius: 16rpx;
+	padding-bottom: 20rpx;
+}
+.wf-page0 .coupon{
+	background:rgba(255,248,247,1);
+	border:1px solid rgba(233,51,35,1);
+	border-radius:4rpx;
+	font-size:20rpx;
+	margin-left: 18rpx;
+	padding: 1rpx 4rpx;
+}
+.wf-page0 .pictrue{
+	width: 100%!important;
+	height: 345rpx;
+	position: relative;
+	/deep/image,/deep/.easy-loadimage,uni-image{
+		height: 345rpx;
+		border-radius: 16rpx 16rpx 0 0;
+	}
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		border-radius: 16rpx 16rpx 0 0;
+		background: center/cover no-repeat;
+	}
+}
+ .loadfail-img{
+		width: 100%;
+    height: 360rpx;
+}
+.svip{
+	margin: 5rpx 0 15rpx;
+}
+.vip-money {
+	color: #282828;
+	font-size: 22rpx;
+	margin-left: 6rpx;
+	font-weight: bold;
+}
+.vipImg {
+	width: 65rpx;
+	height: 28rpx;
+	margin-left: 4rpx;
+	image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+}
+.wf-page0 .name {
+	color: #282828;
+	margin: 20rpx 0 10rpx 0;
+	font-size: 13px;
+	overflow:hidden; 
+	text-overflow: ellipsis; 
+	display: -webkit-box; 
+	-webkit-line-clamp: 2; 
+	-webkit-box-orient: vertical;
+	text-align: left;
+}
+.wf-page0 .text{
+	padding: 0 20rpx;
+}	
+.wf-page0 .money {
+	font-size: 20rpx;
+	font-weight: bold;
+	color: var(--view-priceColor);
+}
+.b-color {
+	background-color: var(--view-theme);
+	border: 1px solid var(--view-theme);
+}
+.wf-page0 .money .num {
+	font-size: 34rpx;
+}
+.wf-page1 .wf-item{
+	.name{
+		font-size: 13px;
+		overflow:hidden; 
+		text-overflow: ellipsis; 
+		display: -webkit-box; 
+		-webkit-line-clamp: 2; 
+		-webkit-box-orient: vertical;
+		text-align: left;
+	}
+}
+.wf-page1 .pictrue {
+	position: relative;
+	height: 345rpx;
+	width: 100%!important;
+	/deep/image,/deep/.easy-loadimage,uni-image{
+		height: 345rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		border-radius: 20rpx 20rpx 0 0;
+		background: center/cover no-repeat;
+	}
+	
+}
+.sell_out {
+	display: flex;
+	width: 150rpx;
+	height: 150rpx;
+	align-items: center;
+	justify-content: center;
+	border-radius: 100%;
+	background: rgba(0,0,0,.6);
+	color: #fff;
+	font-size: 30rpx;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin: -75rpx 0 0 -75rpx;
+	&::before{
+		content: "";
+		display: block;
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 100%;
+		border: 1px dashed #fff;
+		position: absolute;
+		top: 5rpx;
+		left: 5rpx;
+	}
+}
+.loading-img{
+	height: 345rpx;
+  max-height: 360rpx;
+}
+.wf-page1 .text {
+	padding: 20rpx 17rpx 26rpx 17rpx;
+	font-size: 30rpx;
+	color: #222;
+}
+.wf-page1 .text .money {
+	display: flex;
+	align-items: center;
+	font-size: 26rpx;
+	font-weight: bold;
+	margin-top: 8rpx;
+	color: var(--view-priceColor);
+}
+.wf-page1 .text .money .num {
+	font-size: 34rpx;
+}
+.item_tags{
+	margin-top: 8rpx;
+	display: flex;
+}
+.item_tags .tags_item {
+	display: flex;
+	font-size: 20rpx;
+	text-align: center;
+	border-radius: 5rpx;
+	padding: 0 4rpx;
+	height: 28rpx;
+	align-items: center;
+	justify-content: center;
+	margin-right: 8rpx;
+}
+.item_tags .tags_item.ticket{
+	color: var(--view-theme);
+	border: 1px solid var(--view-theme);
+}
+.item_tags .tags_item.delivery{
+	color: #FF9000;
+	border: 1px solid #FF9000;
+}
+.wf-page1 .text .money .ticket-big {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	max-width: 163rpx;
+	padding: 0 6rpx;
+	height: 28rpx;
+	margin-left: 10rpx;
+	background-image: url(~static/images/yh.png);
+	background-size: 100% 100%;
+	font-size: 20rpx;
+	font-weight: normal;
+}
+.wf-page1 .text .score {
+	margin-top: 10rpx;
+	color: #737373;
+	font-size: 20rpx;
+}
+.wf-page1 .text .company {
+	display: flex;
+	align-items: center;
+	color: #737373;
+	font-size: 20rpx;
+	margin-top: 10rpx;
+	.line1{
+		// max-width: 200rpx;
+	}
+	.flex {
+		display: flex;
+		align-items: center;
+		margin-left: 10rpx;
+		color: #282828;
+		.iconfont {
+			font-size: 16rpx;
+			margin-top: 4rpx;
+		}
+	}
+}
+.foot-bar {
+	width: 100%;
+	height: 52rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+	border-radius: 0px 0px 16rpx 16rpx;
+	color: #fff;
+	font-size: 24rpx;
+	.icon-fenxiang {
+		font-size: 24rpx;
+		margin-right: 10rpx;
+	}
+}
+</style>
diff --git a/components/shortPopup.vue b/components/shortPopup.vue
index b353eab..648ed55 100644
--- a/components/shortPopup.vue
+++ b/components/shortPopup.vue
@@ -58,10 +58,10 @@
         <view class="button">
           <view class="b_icon" @click="navgo('/pages/order_addcart/order_addcart')">
             <image src="@/static/images/icon/car.png"></image>
-            <view>采购车</view>
+            <view>购物车</view>
             <view class="badge" v-if="goodsNum">{{goodsNum}}</view>
           </view>
-          <view class="btn" @click.stop="$u.throttle(addcart, 1500)">加入采购清单</view>
+          <view class="btn" @click.stop="$u.throttle(addcart, 1500)">加入购物车</view>
         </view>
       </view>
     </uni-popup>
diff --git a/pages.json b/pages.json
index 0744972..92abdf0 100644
--- a/pages.json
+++ b/pages.json
@@ -417,6 +417,14 @@
 						"navigationStyle": "custom"
 					}
 
+				},{
+					"path": "specialty/short_index",
+					"style": {
+						"navigationBarTitleText": "集体店铺",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "specialty/indexa",
 					"style": {
diff --git a/pages/goods_details/index_v.vue b/pages/goods_details/index_v.vue
index 379cc2f..c129ee9 100644
--- a/pages/goods_details/index_v.vue
+++ b/pages/goods_details/index_v.vue
@@ -227,10 +227,6 @@
 										<image
 											v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
 											:src="margin_ico" class="store-margin"></image>
-										<text v-if="storeInfo.merchant.type_name"
-											class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
-										<text v-else-if="storeInfo.merchant.is_trader"
-											class="font-bg-red ml8 bt-color">自营</text>
 									</view>
 									<view v-if="storeInfo.merchant.care_count" class="txt">
 										{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
@@ -240,8 +236,8 @@
 								<!-- <navigator v-if="hide_mer_status != 1"
 									:url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link"
 									hover-class="none">进店</navigator> -->
-                  <navigator v-if="hide_mer_status != 1 && storeInfo.merchant.village_id"
-                  	:url="'/pages/nongKe/specialty/index?type_code=PersonalStore&village_id='+storeInfo.merchant.village_id" class="link"
+                  <navigator v-if="hide_mer_status != 1 && storeInfo.merchant.village_id && !this.village_id"
+                  	:url="`/pages/nongKe/specialty/short_index?type_code=PersonalStore&village_id=${storeInfo.merchant.village_id}&name=${storeInfo.merchant.village_name.replace('集体经营合作店铺','')}`" class="link"
                   	hover-class="none">进店</navigator>
 							</view>
 							<view class="score-wrapper">
@@ -620,7 +616,8 @@
 					params: []
 				},
 				product_type: 0,
-				referer: ''
+				referer: '',
+        village_id: ''
 			};
 		},
 		computed: {
@@ -636,6 +633,7 @@
 		onLoad(options) {
 			// console.log(options)
 			this.referer = options.referer
+			this.village_id = options.village_id
 			if (options.product_type) {
 				this.product_type = options.product_type
 			}
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index c085b25..d341882 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -39,7 +39,7 @@
 
 			</view>
       <view class="goodslist">
-        <WaterfallsFlow :wfList="storeList" @itemTap="itemTap" :type="1" />
+        <WaterfallsFlowp :wfList="storeList" @itemTap="itemTap" :type="1" />
       </view>
 
 		</view>
@@ -83,11 +83,12 @@
 		configMap
 	} from '@/utils';
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  import WaterfallsFlowp from '@/components/WaterfallsFlow/WaterfallsFlowp.vue'
 	const app = getApp();
 	export default {
 		components: {
-			easyLoadimage
+			easyLoadimage,
+      WaterfallsFlowp
 		},
 		data() {
 			return {
diff --git a/pages/nongKe/specialty/short_index.vue b/pages/nongKe/specialty/short_index.vue
new file mode 100644
index 0000000..90a9aa4
--- /dev/null
+++ b/pages/nongKe/specialty/short_index.vue
@@ -0,0 +1,2040 @@
+<template>
+	<view style="background-color: #ffffff;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></view>
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<!-- <view style="height: 10px;">
+				</view> -->
+				<view class="head_tit">
+					<view class="" style="display: flex;align-items: center;">
+						<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+							<!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx"></u--image> -->
+							<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i>
+
+						</view>
+						<view style="font-size: 40rpx;">
+							<!-- {{titName}} -->
+              {{village_name||'集体店铺'}}
+						</view>
+					</view>
+					<view class="">
+
+					</view>
+
+					<view style="position: relative;">
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索商品名称"
+							v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<view class="serchbtn img_cls" @tap="searchSubmit">搜索</view>
+					</view>
+
+				</view>
+			</view>
+			<view class="content" style="background-color: #ff5c2d;">
+				<view class="hot_serch">
+				</view>
+        <view class="village-info" v-if="villageInfo.avatar">
+          <image :src="villageInfo.avatar"></image>
+          <view>
+            <view class="name"><u-icon name="account" color="#fff"></u-icon>{{villageInfo.master_name}}</view>
+            <view class="phone"><u-icon name="phone" color="#fff"></u-icon>{{villageInfo.master_phone}}</view>
+          </view>
+        </view>
+			</view>
+      <view class="goodslist">
+        <view class='list acea-row row-between-wrapper on'>
+        	<view class='item on' v-for="(item,index) in storeList" :key="index" @click="itemTap(item)">
+        		<view class='pictrue on'>
+        			<image :src='item.image' class="on"></image>
+        			<view v-if="item.stock == 0" class="sell_out">已售罄</view>
+        			<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
+        				class="border-picture"></view>
+        		</view>
+        		<view class='text on acea-row row-between-wrapper' style="height: 220rpx;">
+        			<view class='name'>
+        				<text class="name_text line2">{{item.store_name}}</text>
+        			</view>
+        			<view class="item_bot">
+        				<view class="acea-row row-bottom">
+        					<view class='money on'>
+        						￥<text class='num'>{{item.price}}</text>
+        					</view>
+        					<view v-if="item.show_svip_info.show_svip_price && item.svip_price"
+        						class="acea-row row-middle">
+        						<text class='vip-money'>￥{{item.svip_price}}</text>
+        						<view class="vipImg">
+        							<image src="/static/images/svip.png"></image>
+        						</view>
+        					</view>
+        				</view>
+        				<view class="item_tags acea-row">
+        					<!-- <text v-if="item.merchant.type_name && item.product_type == 0"
+        						class="font-bg-red bt-color line1">{{item.merchant.type_name}}</text>
+        					<text v-else-if="item.merchant.is_trader && item.product_type == 0"
+        						class="font-bg-red bt-color line1">自营</text> -->
+        					<text v-if="item.product_type != 0"
+        						:class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+        					<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+        					<!-- <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> -->
+        					<!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> -->
+        				</view>
+        				<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论 <text style="margin-left: 10rpx;" v-if="item.merchant">{{item.merchant.street_name}}</text></view>
+        				<view class="company" v-if="item.merchant && hide_mer_status==0">
+        					<text class='name line1'>{{item.merchant.village_name}}</text>
+        
+        					<!-- <view class="flex" v-if="item.merchant" @click.stop="goStore(item.merchant.mer_id)">
+        						进店
+        						<text class="iconfont icon-xiangyou"></text>
+        					</view> -->
+        				</view>
+        			</view>
+        		</view>
+        		<!-- 返佣 -->
+        		<block v-if="item.max_extension>0 && (item.product_type == 2 || item.product_type == 0)">
+        			<view class="foot-bar on">
+        				<text class="iconfont icon-fenxiang" v-if="is_switch==true"></text>
+        				<text class="line1">最高赚 ¥{{item.max_extension}}</text>
+        			</view>
+        		</block>
+        	</view>
+        </view>
+        <!-- <WaterfallsFlow :wfList="storeList" @itemTap="itemTap" :type="1" /> -->
+      </view>
+
+		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;background-color: #ffffff;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无商品，快去搜索其他商品吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+    getProductslist,
+		getGeocoder,
+		supMenuApi,
+		supAgoodsApi,
+	} from '@/api/store.js';
+  import { wgsToGcj } from "@/utils/wgs.js";
+
+	import {
+		merClassifly,
+		getStoreTypeApi,
+    getVillageInfo
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowp.vue'
+	const app = getApp();
+	export default {
+		components: {
+			easyLoadimage
+		},
+		data() {
+			return {
+
+				titName: "坝坝宴",
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				menuList: [],
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: '',
+          village_id: '',
+					type_code: '',
+
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //商品类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+        villageInfo:{ //村公司信息
+          
+        },
+        village_name: ''
+			};
+		},
+		onLoad(options) {
+			this.sotreParam.type_code = options.type_code;
+      this.sotreParam.street_id = options.street_id || null;
+      this.sotreParam.village_id = options.village_id || null;
+      this.village_name = options.name || null;
+			this.storeList = [];
+      this.getVillageInfo();
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+
+
+
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
+		},
+		methods: {
+      getVillageInfo(){
+        getVillageInfo({
+          village_id: this.sotreParam.village_id
+        }).then(res=>{
+          this.villageInfo = res.data.company;
+          console.log({...this.villageInfo});
+        }).catch(err=>{
+          console.log(err);
+        })
+      },
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
+				})
+			},
+      itemTap(item){
+        uni.navigateTo({
+        	url: `/pages/goods_details/index_v?id=${item.product_id}&village_id=${this.sotreParam.village_id}`,
+          fail: (err) => {
+            console.log(err);
+          }
+        })
+      },
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取商品类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				if (uni.getStorageSync('RejectTarget')) return
+				uni.getLocation({
+					type: 'wgs84',
+					success: (res) => {
+            res = wgsToGcj(res);
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找商品
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					type_code: this.sotreParam.type_code,
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+        if(this.sotreParam.street_id){
+          rqData.street_id = this.sotreParam.street_id;
+        }
+        if(this.sotreParam.village_id){
+          rqData.village_id = this.sotreParam.village_id;
+        }
+				// console.log(rqData)
+				getProductslist(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list);
+					this.loading = false
+					this.loadingIcon = false
+					// this.titName = this.storeList[0].mer_info
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function() {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.serchbtn {
+		// position: absolute;
+		// right: 5rpx;
+		// top: 5rpx;
+		width: 100rpx;
+		height: 50rpx;
+		border-radius: 30rpx;
+		text-align: center;
+		line-height: 50rpx;
+		// background-color: #FEAB00;
+		color: #fff;
+		background: linear-gradient(to right, #F84221, #FF6D20);
+	}
+
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		max-width: 40vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			background-color: #ff5c2d;
+      color: #fff;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
+		}
+
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				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;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+						// color: red;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+		/* #ifdef H5 */
+		padding-top: 80rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+  .village-info{
+    height: 80rpx;
+    display: flex;
+    color: #fff;
+    padding-left: 20rpx;
+    image{
+      width: 70rpx;
+      height: 70rpx;
+      margin-right: 20rpx;
+    }
+    .name, .phone{
+      display: flex;
+      align-items: center;
+    }
+  }
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		// padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 5rpx;
+		transform: translateY(-50%);
+
+	}
+  .goodslist {
+    margin: 0 auto;
+    width: 725rpx;
+  
+    .no-more {
+      text-align: center;
+      padding-top: 18rpx;
+    }
+  
+    .pictrue_tips {
+      color: $uni-nothing-text;
+    }
+  
+    .common-hd {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 118rpx;
+  
+      .title {
+        padding: 0 80rpx;
+        font-size: 34rpx;
+        color: $theme-color;
+        font-weight: bold;
+        background-image: url("~@/static/images/index-title.png");
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        background-position: left center;
+      }
+    }
+  }
+  	.b-color {
+  		background-color: var(--view-theme) !important;
+  		border: 1px solid var(--view-theme) !important;
+  	}
+  
+  	.productList .search {
+  		width: 100%;
+  		height: 170rpx;
+  		padding: 0 20rpx;
+  		// box-sizing: border-box;
+  		position: fixed;
+  		left: 0;
+  		top: 0rpx;
+  		padding-top: 60rpx;
+  		z-index: 9;
+  		background-color: var(--view-theme);
+  
+  		.icon-dingwei {
+  			color: #fff;
+  			font-weight: 0;
+  			font-size: 40rpx;
+  			line-height: 86rpx;
+  			width: 62rpx;
+  		}
+  	}
+  
+  	.productList .search .back {
+  		display: flex;
+  		align-items: center;
+  		width: 40rpx;
+  		height: 60rpx;
+  
+  		.iconfont {
+  			color: #fff;
+  			font-size: 36rpx;
+  		}
+  	}
+  
+  	.productList .search .input {
+  		flex: 1;
+  		height: 60rpx;
+  		background-color: #fff;
+  		border-radius: 50rpx;
+  		padding: 0 20rpx;
+  		box-sizing: border-box;
+  	}
+  
+  	.productList .search .input input {
+  		flex: 1;
+  		height: 100%;
+  		font-size: 26rpx;
+  		margin-left: 10rpx;
+  	}
+  
+  	.productList .search .input .placeholder {
+  		color: #999;
+  	}
+  
+  	.productList .search .input .iconfont {
+  		font-size: 35rpx;
+  		color: #555;
+  	}
+  
+  	.productList .search .icon-pailie,
+  	.productList .search .icon-tupianpailie,
+  	.productList .search .iconempty {
+  		color: #fff;
+  		width: 62rpx;
+  		font-size: 40rpx;
+  		height: 86rpx;
+  		line-height: 86rpx;
+  	}
+  
+  	.productList .nav-wrapper {
+  		z-index: 9;
+  		position: fixed;
+  		left: 0;
+  		top: 70rpx;
+  		width: 100%;
+  		margin-top: 86rpx;
+  		background-color: var(--view-theme);
+  
+  		.tab-bar {
+  			display: flex;
+  			align-items: center;
+  
+  			.tab-item {
+  				position: relative;
+  				flex: 1;
+  				display: flex;
+  				justify-content: center;
+  				align-items: center;
+  				padding: 8rpx 0 20rpx;
+  				color: #fff;
+  				font-size: 28rpx;
+  				font-weight: bold;
+  
+  				&::after {
+  					content: ' ';
+  					position: absolute;
+  					left: 50%;
+  					bottom: 18rpx;
+  					width: 30rpx;
+  					height: 3rpx;
+  					background: transparent;
+  					transform: translateX(-50%);
+  				}
+  
+  				&.on {
+  					&::after {
+  						background: #fff;
+  					}
+  				}
+  			}
+  		}
+  	}
+  
+  	.productList .nav {
+  		height: 86rpx;
+  		color: #454545;
+  		font-size: 28rpx;
+  		background-color: #fff;
+  		display: flex;
+  		justify-content: space-between;
+  		padding: 0 28rpx;
+  	}
+  
+  	.productList .nav .item {
+  		display: flex;
+  		align-items: center;
+  		justify-content: center;
+  		flex: 1;
+  	}
+  
+  	.t-color {
+  		color: var(--view-theme);
+  	}
+  
+  	.productList .nav .item.t-color {
+  		font-weight: bold;
+  		color: #454545;
+  	}
+  
+  	.productList .nav .item image {
+  		width: 15rpx;
+  		height: 19rpx;
+  		margin-left: 10rpx;
+  	}
+  
+  	.productList .list {
+  		padding: 0 20rpx;
+  
+  	}
+  
+  	.productList .list.on {
+  		background-color: #fff;
+  		border-top: 1px solid #f6f6f6;
+  	}
+  
+  	.productList .list .item {
+  		position: relative;
+  		width: 345rpx;
+  		margin-top: 20rpx;
+  		background-color: #fff;
+  		border-radius: 20rpx;
+  
+  		.name {
+  			display: flex;
+  			align-items: center;
+  
+  			.name_text {
+  				// max-width: 420rpx;
+  			}
+  		}
+  	}
+  
+  	.productList .list .item.on {
+  		width: 100%;
+  		display: flex;
+  		padding: 30rpx 0;
+  		margin: 0;
+  	}
+  
+  	.productList .list .item .pictrue {
+  		position: relative;
+  		width: 100%;
+  		height: 345rpx;
+  
+  	}
+  
+  	.productList .list .item .pictrue.on {
+  		width: 220rpx;
+  		height: 220rpx;
+  
+  		.sell_out {
+  			display: flex;
+  			width: 110rpx;
+  			height: 110rpx;
+  			align-items: center;
+  			justify-content: center;
+  			border-radius: 100%;
+  			background: rgba(0, 0, 0, .6);
+  			color: #fff;
+  			font-size: 24rpx;
+  			position: absolute;
+  			top: 50%;
+  			left: 50%;
+  			margin: -55rpx 0 0 -55rpx;
+  
+  			&::before {
+  				content: "";
+  				display: block;
+  				width: 100rpx;
+  				height: 100rpx;
+  				border-radius: 100%;
+  				border: 1px dashed #fff;
+  				position: absolute;
+  				top: 5rpx;
+  				left: 5rpx;
+  			}
+  		}
+  
+  		.border-picture {
+  			position: absolute;
+  			top: 0;
+  			left: 0;
+  			width: 100%;
+  			height: 100%;
+  			border-radius: 16rpx;
+  			background: center/cover no-repeat;
+  		}
+  	}
+  
+  	.productList .list .item .pictrue image {
+  		width: 100%;
+  		height: 100%;
+  		border-radius: 20rpx 20rpx 0 0;
+  	}
+  
+  	.productList .list .item .pictrue image.on {
+  		border-radius: 16rpx;
+  		width: 220rpx;
+  		height: 220rpx;
+  	}
+  
+  	.productList .list .item .text {
+  		padding: 20rpx 17rpx 26rpx 17rpx;
+  		font-size: 30rpx;
+  		color: #222;
+  	}
+  
+  	.productList .list .item .text.on {
+  		width: 508rpx;
+  		padding: 0 0 0 22rpx;
+  		justify-content: space-between;
+  
+  		.font-bg-red {
+  			max-width: 120rpx;
+  		}
+  
+  		.bt-color {
+  			background-color: var(--view-theme);
+  			border: 1px solid var(--view-theme);
+  
+  			&.type2 {
+  				background-color: #FD6523;
+  				border: 1px solid #FD6523;
+  			}
+  		}
+  
+  		.name,
+  		.item_bot {
+  			width: 100%;
+  		}
+  
+  		.vip-money {
+  			color: #282828;
+  			font-size: 22rpx;
+  			margin-left: 6rpx;
+  			font-weight: bold;
+  		}
+  
+  		.vipImg {
+  			width: 65rpx;
+  			height: 28rpx;
+  			margin-left: 4rpx;
+  
+  			image {
+  				width: 100%;
+  				height: 100%;
+  				display: block;
+  			}
+  		}
+  
+  		.item_bot {
+  			position: relative;
+  
+  			&::after {
+  				content: '';
+  				display: block;
+  				width: 100%;
+  				border-bottom: 1px solid #f6f6f6;
+  				position: absolute;
+  				right: 20rpx;
+  				bottom: -30rpx;
+  			}
+  
+  		}
+  	}
+  
+      
+    .text_flex{
+      display: flex;
+      align-items: center;
+    }
+    
+  	.productList .list .item .text .money {
+  		display: flex;
+  		align-items: center;
+  		font-size: 26rpx;
+  		font-weight: bold;
+  		color: var(--view-priceColor);
+  	}
+  
+  	.productList .list .item .text .money .num {
+  		font-size: 34rpx;
+  	}
+  
+  	.productList .distance {
+  		display: flex;
+  		align-items: center;
+  		font-size: 24rpx;
+  		color: #999999;
+  
+  		.icon-xiangyou {
+  			font-size: 24rpx;
+  			line-height: 24rpx;
+  		}
+  	}
+  
+  	.productList .list .item .text .money .ticket {
+  		margin-left: 10rpx;
+  		padding: 0 5rpx;
+  		font-weight: initial;
+  		font-size: 20rpx;
+  		border: 1px solid var(--view-theme);
+  		border-radius: 4rpx;
+  	}
+  
+  	.productList .list .item .text .money .ticket-big {
+  		display: flex;
+  		align-items: center;
+  		justify-content: center;
+  		min-width: 163rpx;
+  		height: 28rpx;
+  		margin-left: 10rpx;
+  		background-image: url(~static/images/yh.png);
+  		background-size: 100% 100%;
+  		font-size: 20rpx;
+  		font-weight: normal;
+  		padding: 0 10rpx;
+  	}
+  
+  	.productList .list .item .item_tags {
+  		margin-top: 8rpx;
+  	}
+  
+  	.productList .list .item .item_tags .tags_item {
+  		display: inline-block;
+  		font-size: 20rpx;
+  		text-align: center;
+  		border-radius: 5rpx;
+  		padding: 0 4rpx;
+  		line-height: 28rpx;
+  		margin-right: 8rpx;
+  	}
+  
+  	.productList .list .item .item_tags .tags_item.ticket {
+  		color: var(--view-theme);
+  		border: 1px solid var(--view-theme);
+  	}
+  
+  	.item_tags .tags_item.delivery {
+  		color: #FF9000;
+  		border: 1px solid #FF9000;
+  	}
+  
+  	.productList .list .item .text .score {
+  		margin-top: 10rpx;
+  		color: #737373;
+  		font-size: 20rpx;
+  	}
+  
+  	.productList .list .item .text .company {
+  		display: flex;
+  		align-items: center;
+  		color: #737373;
+  		font-size: 20rpx;
+  		margin-top: 10rpx;
+  
+  		// width: 300rpx;
+  		.name {
+  			display: inline-block;
+  			width: auto;
+  			// max-width: 200rpx;
+  			overflow: hidden;
+  			white-space: nowrap;
+  			text-overflow: ellipsis;
+  
+  		}
+  
+  		.flex {
+  			display: flex;
+  			align-items: center;
+  			margin-left: 10rpx;
+  			color: #282828;
+  			width: 100rpx;
+  
+  			.iconfont {
+  				font-size: 16rpx;
+  				margin-top: 4rpx;
+  			}
+  		}
+  	}
+  
+  	.productList .list .item .foot-bar {
+  		width: 100%;
+  		height: 52rpx;
+  		display: flex;
+  		align-items: center;
+  		justify-content: center;
+  		background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+  		border-radius: 0px 0px 16rpx 16rpx;
+  		color: #fff;
+  		font-size: 24rpx;
+  
+  		.icon-fenxiang {
+  			font-size: 24rpx;
+  			margin-right: 10rpx;
+  		}
+  
+  		&.on {
+  			position: absolute;
+  			right: 0;
+  			bottom: 30rpx;
+  			width: 200rpx;
+  			height: 44rpx;
+  			border-radius: 22rpx;
+  		}
+  	}
+  
+  	.noCommodity {
+  		background-color: #fff;
+  
+  		.pictrue {
+  			height: 420rpx;
+  			color: $uni-nothing-text;
+  
+  			image {
+  				width: 414rpx;
+  				height: 336rpx;
+  			}
+  		}
+  	}
+  
+  	.no-shop {
+  		margin-top: 240rpx;
+  		background-color: #fff;
+  		padding-bottom: calc(100% - 109rpx);
+  
+  		.pictrue {
+  			display: flex;
+  			flex-direction: column;
+  			align-items: center;
+  			color: $uni-nothing-text;
+  
+  			image {
+  				width: 414rpx;
+  				height: 336rpx;
+  			}
+  		}
+  	}
+  
+  	.spin {
+  		display: block;
+  		transform: rotate(180deg);
+  		font-size: 36rpx;
+  	}
+  
+  	.icon-xiala1 {
+  		margin-top: 6rpx;
+  	}
+  
+  	.icon-shaixuan {
+  		font-size: 30rpx;
+  		margin-left: 10rpx;
+  	}
+  
+  	.down-wrapper {
+  		.bg {
+  			z-index: 8;
+  			position: fixed;
+  			left: 0;
+  			top: 0;
+  			width: 100%;
+  			height: 100%;
+  			background: rgba(0, 0, 0, .5);
+  		}
+  
+  		.down-box {
+  			z-index: 8;
+  			position: fixed;
+  			left: 0;
+  			top: 238rpx;
+  			width: 100%;
+  			padding: 0 40rpx 28rpx 74rpx;
+  			background-color: #F8F8F8;
+  			border-radius: 0 0 24rpx 24rpx;
+  
+  			.down-item {
+  				margin-top: 28rpx;
+  				font-size: 24rpx;
+  				color: #454545;
+  
+  				&.on {
+  					color: var(--view-theme);
+  				}
+  
+  				.iconfont {
+  					float: right;
+  				}
+  			}
+  		}
+  	}
+  
+  	.store-wrapper {
+  		margin-top: 310rpx;
+  
+  		border-top: 1px solid #F6F6F6;
+  
+  		.star-box {
+  			display: flex;
+  			align-items: center;
+  
+  			.line {
+  				width: 2rpx;
+  				height: 20rpx;
+  				background: #BFBFBF;
+  				margin: 0 12rpx;
+  			}
+  
+  			.star {
+  				position: relative;
+  				width: 111rpx;
+  				height: 19rpx;
+  				background: url(~pages/columnGoods/images/star.png);
+  				background-size: 111rpx 19rpx;
+  			}
+  
+  			.star-active {
+  				position: absolute;
+  				left: 0;
+  				top: 0;
+  				width: 111rpx;
+  				height: 19rpx;
+  				overflow: hidden;
+  				background: url(~pages/columnGoods/images/star_active.png);
+  				background-size: 111rpx 19rpx;
+  			}
+  
+  			.num {
+  				color: var(--view-theme);
+  				font-size: 24rpx;
+  				margin-left: 10rpx;
+  			}
+  		}
+  
+  		.store-item {
+  			margin: 20rpx auto;
+  
+  			.head {
+  				display: flex;
+  				align-items: center;
+  				justify-content: center;
+  				color: #fff;
+  
+  				.zhezhao {
+  					position: absolute;
+  					width: 95%;
+  					height: 150px;
+  					border-radius: 20rpx;
+  					z-index: 0;
+  					opacity: 0.5;
+  					background-color: #999;
+  				}
+  
+  				.bgc_img {
+  					position: absolute;
+  					width: 95%;
+  					height: 150px;
+  					background-size: cover;
+  					border-radius: 20rpx;
+  					z-index: 0;
+  				}
+  
+  				.zhezhao1 {
+  					width: 100%;
+  					height: 150px;
+  					border-radius: 20rpx;
+  					z-index: 1;
+  
+  					.title {
+  						display: flex;
+  						height: 50px;
+  						align-items: center;
+  						margin-left: 20px;
+  						z-index: 1;
+  
+  						span {
+  							background-color: #F84221;
+  							color: white;
+  							font-size: 12px;
+  							padding: 3px;
+  							border-radius: 5px;
+  							margin-left: 5px;
+  						}
+  					}
+  
+  					.coent {
+  						display: flex;
+  						margin-left: 20px;
+  
+  						.avater {
+  							width: 80px;
+  							height: 80px;
+                flex-shrink: 0;
+  
+  							image {
+  								width: 80px;
+  								height: 80px;
+  							}
+  						}
+  
+  						.text {
+  							.text_one {
+  								display: flex;
+  								height: 30px;
+  								line-height: 30px;
+  								padding-left: 10px;
+  
+  								image {
+  									width: 20px;
+  									height: 20px;
+  									margin-right: 10px;
+                    flex-shrink: 0;
+  								}
+  
+  								.text_one_r {
+                    flex: 1;
+  									margin-left: 10px;
+                    
+  								}
+  							}
+  
+  							.text_two {
+  								width: 270px;
+  								height: 30px;
+  								line-height: 30px;
+  								padding-left: 10px;
+                  .text_tip{
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;          
+                  }
+  
+  								image {
+  									width: 20px;
+  									height: 20px;
+  									margin-right: 10px;
+                    flex-shrink: 0;
+  								}
+  							}
+  
+  							.text_three {
+  								width: 270px;
+  								height: 30px;
+  								line-height: 30px;
+  								padding-left: 10px;
+                  .text_tip{
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;          
+                  }
+  
+  								image {
+  									width: 20px;
+  									height: 20px;
+  									margin-right: 10px;
+  								}
+  							}
+  						}
+  
+  					}
+  				}
+  
+  
+  			}
+  
+  			.pro-box {
+  				white-space: nowrap;
+  				display: flex;
+  				align-items: center;
+  				padding: 20rpx 20rpx 30rpx;
+  
+  				.pro-item {
+  					display: inline-block;
+  					width: 218rpx;
+  					margin-right: 14rpx;
+  
+  					.picture,
+  					/deep/image,
+  					uni-image {
+  						width: 100%;
+  						height: 214rpx;
+  						border-radius: 8rpx;
+  						position: relative;
+  					}
+  
+  					.price {
+  						margin-top: 5rpx;
+  						font-size: 28rpx;
+  						color: var(--view-priceColor);
+  						font-weight: bold;
+  
+  						text {
+  							font-size: 28rpx;
+  						}
+  					}
+  
+  					&:last-child {
+  						margin-right: 0;
+  					}
+  				}
+  
+  				&.styleType3 {
+  					padding: 20rpx;
+  
+  					.pro-item {
+  						display: inline-block;
+  						background-color: #fff;
+  						border-radius: 16rpx;
+  						text-align: center;
+  						padding: 10rpx 0 20rpx;
+  
+  						.picture,
+  						/deep/image,
+  						uni-image {
+  							width: 194rpx;
+  							height: 194rpx;
+  							text-align: center;
+  							border-radius: 8rpx;
+  							position: relative;
+  							margin: 0 auto;
+  						}
+  					}
+  				}
+  			}
+  		}
+  	}
+  
+  	.guanbi {
+  		width: 20px;
+  		height: 20px;
+  		margin: 30px auto;
+  	}
+  
+  	.pop {
+  		z-index: 1;
+  	}
+</style>
\ No newline at end of file
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 663e932..924ce03 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -539,10 +539,10 @@
 					that.$set(that, 'orderInfo', res.data);
 					this.pay_type = this.orderInfo.pay_type
 					if (this.orderInfo.interest !== null) {
-						this.moerTime(this.orderInfo.interest.start_time)
+						this.moerTime(this.orderInfo.interest.start_time, this.orderInfo.cancel_unix)
 					} else {
 						this.isSelfOrder = true
-						this.moerTime(this.orderInfo.create_time)
+						this.moerTime(this.orderInfo.create_time, this.orderInfo.cancel_unix)
 						// console.log(this.orderInfo.create_time)
 					}
 
@@ -593,16 +593,16 @@
 				});
 			},
 			//计算是否逾期
-			moerTime(autoTime) {
-
+			moerTime(autoTime, c_time) {
 				if (this.isSelfOrder) {
 					let limitPayTime = 60 //支付时间限制
 					let curData = new Date(autoTime);
+					// curData.setSeconds(curData.getSeconds() + (60 * limitPayTime));
 					curData.setSeconds(curData.getSeconds() + (60 * limitPayTime));
 					this.be_overdue = curData.getFullYear() + '-' + (curData.getMonth() + 1) + '-' + curData.getDate() +
 						' ' +
 						curData.getHours() + ':' +
-						(curData.getMinutes() > 10 ? curData.getMinutes() : "0" + curData.getMinutes())
+						(curData.getMinutes() > 9 ? curData.getMinutes() : "0" + curData.getMinutes())
 					return
 				}
 
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index a18793a..b179c34 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -139,7 +139,7 @@
 				text: '展开更多',
 				timer: null,
 				product_type: '',
-
+        source: null
 			};
 		},
 		computed: mapGetters(['isLogin', 'viewColor', 'keyColor']),
@@ -152,6 +152,7 @@
 			});
 			this.orderId = options.order_id;
 			this.order_type = options.order_type;
+      this.source = options.source || null;
 			this.status = options.status || 0;
 			this.msg = options.msg || '';
 			this.product_type = options.product_type
@@ -221,7 +222,7 @@
 			 */
 			goOrderDetails: function(val) {
 				let that = this;
-				if (this.product_type == 98) {
+				if (this.product_type == 98 && this.source!=103) {
 					if(val==1){
 						uni.navigateTo({
 							url: `/pages/users/order_list/indexCopy?status=2&product_type=${this.product_type}`
@@ -232,7 +233,7 @@
 							})
 						}
 					
-				} else if (this.product_type == 99) {
+				} else if (this.product_type == 99 && this.source!=103) {
 					if(val==1){
 						uni.navigateTo({
 							url: `/pages/users/order_list/relase?status=2&product_type=${this.product_type}`
diff --git a/pages/select_address/select_address_n.nvue b/pages/select_address/select_address_n.nvue
index dfe66c8..978de97 100644
--- a/pages/select_address/select_address_n.nvue
+++ b/pages/select_address/select_address_n.nvue
@@ -117,7 +117,6 @@
         this.locationInfo.formatted_addresses.recommend = '定位中'
         uni.getLocation({
           type: 'wgs84',
-          timeout: '4',
           success: (res) => {
             res = wgsToGcj(res);
             let latitude, longitude;
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index bad8858..0197e3f 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -99,7 +99,7 @@
           <image src="@/static/images/f5.png" mode="aspectFit"></image>
         </view>
         <view class="list-con-right">
-          <view class="con-right" style="margin-bottom: 20rpx"
+          <view class="con-right"
             @click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
             <!-- <view class="list-con-title">
 							<view class="con-titlea">
@@ -124,9 +124,9 @@
           </view>
         </view>
       </view>
-      <view class="list-bon">
+      <!-- <view class="list-bon" info="中秋团圆节">
         <image src="@/static/images/f4.png" mode="aspectFit"></image>
-      </view>
+      </view> -->
       <view class="goodslist">
         <WaterfallsFlow v-if="productList.length>0" :wfList="productList" :type="1" />
         <block v-else>
@@ -1140,6 +1140,10 @@ import { data } from '../../uni_modules/uview-ui/libs/mixin/mixin';
 
     .list-con-right {
       width: 356rpx;
+      height: 482rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
 
       .con-right {
         width: 356rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 91e3c40..970d9af 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -601,7 +601,7 @@
 			},
 			// 订单数字
 			orderNum() {
-				orderData().then(({
+				orderData({source: 103}).then(({
 					data
 				}) => {
           // console.log(data);
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 3dfe967..6eb0020 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1229,7 +1229,7 @@
 						jsConfig = res.data.result.config,
 						// 暂不跳转
 						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
-						'&product_type=' + that.product_type,
+						'&product_type=' + that.product_type + '&source=' + that.source,
 						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
 						'&credit_buy=1&product_type=' + that.product_type;
 
@@ -1300,7 +1300,7 @@
 								success: (e) => {
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=支付成功' + '&product_type=' + that.product_type;
+										'&msg=支付成功' + '&product_type=' + that.product_type + '&source=' + that.source;
 
 									return that.$util.Tips({
 										title: '支付成功',
@@ -1314,7 +1314,7 @@
 										console.log(e,'111111111')
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&product_type=' + that.product_type;
+										'&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -1326,7 +1326,7 @@
 								uni.hideLoading();
 									// 暂不跳转
 									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
-									// 	'&msg=取消支付' + '&product_type=' + that.product_type;
+									// 	'&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
 									// return that.$util.Tips({
 									// 	title: '取消支付',
 									// }, {
@@ -1363,8 +1363,7 @@
 								fail: function(e) {
 									// 暂不跳转
 									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&product_type=' + that
-										.product_type
+										orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付'
 									}, {
@@ -1388,7 +1387,7 @@
 						case 'h5':
 							let host = window.location.protocol + "//" + window.location.host;
 							let url =
-								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}`
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
 							let eUrl = encodeURIComponent(url)
 							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
 							let locations = `${jsurl}&redirect_url=${eUrl}`
@@ -1416,7 +1415,7 @@
 									// 暂不跳转
 									let pages = '/pages/order_pay_status/index?order_id=' +
 										orderId + '&msg=支付失败' + '&product_type=' + that
-										.product_type
+										.product_type + '&source=' + that.source
 									return that.$util.Tips({
 										title: '支付失败'
 									}, {
@@ -1429,7 +1428,7 @@
 									// // 暂不跳转
 									// let pages = '/pages/order_pay_status/index?order_id=' +
 									// 	orderId + '&msg=取消支付' + '&product_type=' + that
-									// 	.product_type
+									// 	.product_type + '&source=' + that.source
 
 									// return that.$util.Tips({
 									// 	title: '取消支付'
@@ -1444,7 +1443,7 @@
 						default:
 							// 暂不跳转
 							let pages = '/pages/order_pay_status/index?order_id=' +
-								orderId + '&msg=取消支付' + '&product_type=' + that.product_type
+								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' + that.source
 
 							return that.$util.Tips({
 								title: '取消支付'
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index fae4355..a404a4b 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -253,7 +253,7 @@
 									<view v-if="!item.receipt && item.status != -1 && (item.status != 0)" class='bnt cancelBnt'
 										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
-										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id, item )'>查看详情</view>
 									</block>
 									<block v-if="item.status == 1">
 										<view class='bnt cancelBnt'
@@ -501,7 +501,8 @@ import { Toast } from '../../../libs/uniApi';
 				getOrderData: function() {
 					let that = this;
 					orderData({
-						product_type: 0
+						product_type: 0,
+            source: 103
 					}).then(res => {
 						that.$set(that, 'orderData', res.data);
 					})
@@ -674,7 +675,8 @@ import { Toast } from '../../../libs/uniApi';
 							groupOrderList({
 								page: that.page,
 								limit: that.limit,
-								product_type: 0
+								product_type: 0,
+                source: 103
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -701,7 +703,8 @@ import { Toast } from '../../../libs/uniApi';
 								status: arr,
 								page: that.page,
 								limit: that.limit,
-								product_type: 0
+								product_type: 0,
+                source: 103
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
@@ -730,6 +733,7 @@ import { Toast } from '../../../libs/uniApi';
 						status: 10,
 						page: 1,
 						limit: 1,
+            source: 103
 					}).then(res => {
 						let list = res.data.list || [];
 						that.presellOrderCount = res.data.count;
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 8ff0b3f..8553b09 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -90,14 +90,14 @@
           <view class='item acea-row row-between-wrapper'>
             <view>填写邀请码</view>
             <view class='input acea-row row-between-wrapper' @click="showPopup">
-              <input type='text' placeholder="填写他人邀请码" disabled='true' class='id'></input>
+              <input type='text' placeholder="填写他人邀请码" v-model="promotion_code" disabled='true' class='id'></input>
               <text class='iconfont icon-you'></text>
             </view>
             <uni-popup ref="popup">
               <view class="code-popup">
                 <text class="title">填写邀请码</text>
-                <u-input type='text' placeholder="填写他人邀请码" class='id'></u-input>
-                <u-button class="code-btn">确认</u-button>
+                <u-input type='text' placeholder="填写他人邀请码" v-model="promotion_code" :border="'surround'" class='id'></u-input>
+                <u-button class="code-btn" @click="submitCode">确认</u-button>
               </view>
             </uni-popup>
           </view>
@@ -162,7 +162,8 @@
     getLogout,
     userAcc,
     editAvatar,
-    updateInfo
+    updateInfo,
+    bindPromotionCode
   } from '@/api/user.js';
   import { switchH5Login, getAppVersion } from '@/api/api.js';
   import { mapGetters } from "vuex";
@@ -171,6 +172,7 @@
   import authorize from '@/components/Authorize';
   import Cache from '@/utils/cache';
   import { HTTP_REQUEST_URL } from '@/config/app';
+import { Toast } from '../../../libs/uniApi';
   export default {
     components: {
       authorize
@@ -180,6 +182,7 @@
         domain: HTTP_REQUEST_URL,
         userInfo: {},
         loginType: 'h5',
+        promotion_code: '', //邀请码
         userIndex: 0,
         switchUserInfo: [],
         isAuto: false, //没有授权的不会自动授权
@@ -368,6 +371,7 @@
         }
       },
       showPopup(){
+        if(this.promotion_code) return Toast('已经填写过了');
         this.$refs.popup.open();
       },
       //注销账号
@@ -383,6 +387,7 @@
         let that = this;
         getUserInfo().then(res => {
           that.$set(that, 'userInfo', res.data);
+          this.promotion_code = this.userInfo.promotion_code;
           if (res.data.phone) {
             that.userAcc();
           }
@@ -393,6 +398,20 @@
        */
       getVerion(){
         this.$store.dispatch('INIT_CONFIG', true);
+      },
+      // 填写邀请码
+      submitCode(){
+        if(!this.promotion_code) return ;
+        bindPromotionCode({
+          promotion_code: this.promotion_code
+        }).then(res=>{
+          this.$refs.popup.close();
+          this.$nextTick(()=>{
+            Toast('修改成功');
+          })
+        }).catch(err=>{
+          console.log(err);
+        })
       }
     }
   }