diff --git a/api/behalfAdmin.js b/api/behalfAdmin.js
new file mode 100644
index 0000000..03facbd
--- /dev/null
+++ b/api/behalfAdmin.js
@@ -0,0 +1,19 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import request from "@/utils/request.js";
+
+/**
+ * 补货代发列表
+ * 
+ */
+export function behalfAdminOrderList(data) {
+  return request.get("behalf_admin/order_list", data);
+}
+
diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue
new file mode 100644
index 0000000..ae4b68a
--- /dev/null
+++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue
@@ -0,0 +1,425 @@
+<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="score"><span
+					style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
+				{{item.reply_count}}条评论</view>
+			<view class="" style="display: flex;justify-content: space-between;">
+				<view class='money'>
+					<span style="font-size:30rpx;">￥</span>
+					<text class='num'><span style="font-size: 35rpx;">{{item.price.split('.')[0]}}.</span><span
+							style="font-size: 20rpx;">{{item.price.split('.')[1]}}</span></text>
+				</view>
+				<view class="items-img">
+					<image src="@/static/images/LHYC/J.png" mode="aspectFit"></image>
+				</view>
+			</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="company" v-if="item.merchant" @click.stop="goShop(item.merchant.mer_id)">
+				<text class="line1">{{item.merchant.mer_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>
+	.items-img {
+		width: 44rpx;
+		height: 44rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.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;
+		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: #B3B3B3;
+		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>
\ No newline at end of file
diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue
new file mode 100644
index 0000000..81ce532
--- /dev/null
+++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue
@@ -0,0 +1,219 @@
+<template>
+	<view class="wf-item-page" @click="gogogo(item)">
+
+		<view class='pictrue'>
+			<!-- <image :src="item.image[0]" mode="widthFix" class="item-img" /> -->
+			<image :src="item.image" mode="aspectFill" class="item-img"></image>
+			<!-- <easy-loadimage mode="widthFix" :image-src="item.image[0]"></easy-loadimage> -->
+		</view>
+
+		<view class="title">{{item.store_name}}</view>
+		<!-- 	<view class="tag">
+			<view class="tag-one">
+				自营商品
+			</view>
+			<view class="tag-two">
+
+				<text class="tag-twoa">折</text>
+				<text class="tag-twob">满20包邮</text>
+			</view>
+		</view> -->
+		<view class="relase">
+			<view class="relase-one">
+				{{item.rate}}
+			</view>
+			<view class="relase-two">
+				{{item.reply_count}}评论
+			</view>
+		</view>
+		<view class="price">
+			<span>￥</span>{{item.price.split('.')[0]}}.<text>{{item.price.split('.')[1]}}</text>
+		</view>
+		<view class="item-info">
+			<view class="info-title" style="margin-right: 10rpx;">
+				{{item.merchant.mer_name}}
+			</view>
+			<view class="info-img">
+				<image src="@/static/images/you.png" mode="aspectFit"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			}
+		},
+
+		methods: {
+			gogogo(item) {
+
+				uni.navigateTo({
+					url: '/pages/goods_details/index?id=' + item.product_id
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wf-item-page {
+		background: #fff;
+		overflow: hidden;
+		border-radius: 5px;
+
+	}
+
+	.pictrue {
+		width: 100% !important;
+		height: 345rpx;
+
+		image {
+			width: 100%;
+			height: 345rpx;
+		}
+	}
+
+	.item-info {}
+
+	.title {
+		
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin: 12px 0;
+		padding-right: 12rpx;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+
+		margin-left: 21rpx;
+	}
+
+	.tag {
+		display: flex;
+		margin-left: 21rpx;
+
+		.tag-one {
+
+			text-align: center;
+			padding: 2rpx 9rpx;
+			border-radius: 11rpx 11rpx 11rpx 11rpx;
+			border: 1px solid #3274F9;
+			font-size: 19rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			margin-right: 15rpx;
+		}
+
+		.tag-two {
+
+			.tag-twoa {
+				width: 130rpx;
+				text-align: center;
+				padding-left: 15rpx;
+				padding-right: 7rpx;
+				border-radius: 11rpx 0px 0px 0rpx;
+				border: 1px solid #F84221;
+				font-size: 19rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+			}
+
+			.tag-twob {
+				width: 130rpx;
+				text-align: center;
+				padding: 2rpx 9rpx;
+				border-radius: 0px 11rpx 11rpx 0px;
+				border: 1px solid #F84221;
+				font-size: 19rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+			}
+		}
+	}
+
+	.relase {
+		display: flex;
+		margin-left: 21rpx;
+		margin-top: 12rpx;
+		height: 26rpx;
+		line-height: 26rpx;
+
+		.relase-one {
+			// font-style: italic;
+			transform: skewX(-15deg);
+			font-size: 26rpx;
+			font-family: SF Pro Display-Regular Italic, SF Pro Display;
+			font-weight: 600;
+			color: #FF6D20;
+
+		}
+
+		.relase-two {
+			font-size: 23rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 500;
+			color: #B3B3B3;
+			margin-left: 13rpx;
+		}
+	}
+
+	.price {
+		margin-left: 21rpx;
+		margin-bottom: 10rpx;
+		color: #F84221;
+		font-size: 44rpx;
+		font-weight: 600;
+
+		span {
+			color: #F84221;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+
+		text {
+			color: #F84221;
+			font-size: 37rpx;
+			font-weight: 400;
+		}
+	}
+
+	.item-info {
+		margin-left: 21rpx;
+		margin-bottom: 25rpx;
+		display: flex;
+
+		width: 280rpx;
+		height: 39rpx;
+		line-height: 39rpx;
+		background: #F4F7FE;
+		border-radius: 19rpx 19rpx;
+		opacity: 1;
+		font-size: 23rpx;
+		padding-left: 11rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+
+		.info-img {
+			width: 21rpx;
+			height: 21rpx;
+			margin-top: 5rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue
new file mode 100644
index 0000000..f6d8ee6
--- /dev/null
+++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="wf-item-page">
+		<view class='pictrue'>
+			<!-- <image :src="item.image[0]" mode="widthFix" class="item-img" /> -->
+			<image :src="item.image[0]" mode="aspectFill" class="item-img"></image>
+			<!-- <easy-loadimage mode="widthFix" :image-src="item.image[0]"></easy-loadimage> -->
+		</view>
+		<view class="goods_item_img" v-if="item.video_link.length>0">
+			<image src="@/static/images/sp.png" mode="aspectFit"></image>
+		</view>
+		<view class="title">{{item.title}}</view>
+		<view class="item-info">
+			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
+				class="info-avatar" />
+			<view class="info-nickname">{{ item.author.nickname }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		string
+	} from '../../plugin/clipboard/clipboard'
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			},
+			heightx: {
+				type: string,
+				require: true
+			}
+
+		},
+
+
+
+		data() {
+			return {
+
+			}
+		},
+
+
+		methods: {
+
+
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wf-item-page {
+		background: #fff;
+		overflow: hidden;
+		border-radius: 5px;
+
+		position: relative;
+	}
+
+	.pictrue {
+		width: 100% !important;
+		height: 345rpx;
+
+		image{
+			width: 100% ;
+			height: 345rpx;
+		}
+	}
+
+
+	.item-info {
+		display: flex;
+		align-items: center;
+		padding: 5px;
+	}
+
+	.goods_item_img {
+		position: absolute;
+		top: 20rpx;
+		right: 18rpx;
+		width: 52rpx;
+		height: 52rpx;
+		z-index: 1 !important;
+
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin: 12px 0;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		padding: 0 5px;
+	}
+
+	.info-avatar {
+		width: 49rpx;
+		height: 49rpx;
+		border-radius: 50%;
+		margin-right: 5px;
+	}
+
+	.info-nickname {
+		font-size: 12px;
+		color: #333;
+	}
+</style>
\ No newline at end of file
diff --git a/components/WaterfallsFlowSupply/WaterfallsFlow.vue b/components/WaterfallsFlowSupply/WaterfallsFlow.vue
new file mode 100644
index 0000000..b67e98c
--- /dev/null
+++ b/components/WaterfallsFlowSupply/WaterfallsFlow.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)">
+                    <WaterfallsFlowItem :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)">					  
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItem from '../WaterfallsFlowItemSupply/WaterfallsFlowItem.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItem
+    },
+    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/WaterfallsFlowSupply/WaterfallsFlowo.vue b/components/WaterfallsFlowSupply/WaterfallsFlowo.vue
new file mode 100644
index 0000000..4551c22
--- /dev/null
+++ b/components/WaterfallsFlowSupply/WaterfallsFlowo.vue
@@ -0,0 +1,208 @@
+<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-itema" @tap="itemTap(item)">
+                    <WaterfallsFlowItem :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-itemb" @tap="itemTap(item)">					  
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItemo.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItem
+    },
+    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: 5px;
+
+.wf-page {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: $grid-gap;
+}
+.wf-itema {
+   width: 356rpx;
+    padding-bottom: $grid-gap;
+}
+.wf-itemb {
+   width: 356rpx;
+  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/WaterfallsFlowSupply/WaterfallsFlows.vue b/components/WaterfallsFlowSupply/WaterfallsFlows.vue
new file mode 100644
index 0000000..faf88dc
--- /dev/null
+++ b/components/WaterfallsFlowSupply/WaterfallsFlows.vue
@@ -0,0 +1,207 @@
+<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-itema" @tap="itemTap(item)">
+                    <WaterfallsFlowItem :item="item" :isStore="isStore"  :heightx="251"  :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-itemb" @tap="itemTap(item)">					  
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :heightx="336"  :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItem
+    },
+    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
+        },
+		
+        // 监听标记，当标记发生变化，则执行下一个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: 5px;
+
+.wf-page {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: $grid-gap;
+}
+.wf-itema {
+   width: 356rpx;
+    padding-bottom: $grid-gap;
+}
+.wf-itemb {
+   width: 356rpx;
+  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/pages.json b/pages.json
index 1716098..936c716 100644
--- a/pages.json
+++ b/pages.json
@@ -224,7 +224,28 @@
     // 	}
 
     // }
-  ],
+      ,{
+            "path" : "pages/wholesale/wholesale/wholesale",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "供应链批发",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#ffffff"
+            }
+            
+        }
+        ,{
+            "path" : "pages/replace_replenishment/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "代发补货",
+                "enablePullDownRefresh": false,
+                "navigationBarBackgroundColor": "#ff5c2d",
+                "navigationBarTextStyle": "white"
+            }
+            
+        }
+    ],
   "subPackages": [{
       "root": "pages/goods_cate",
       "name": "goods_cate",
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 75e186c..e27c73a 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -219,6 +219,16 @@
                   </image>
                   <text class="text">发布管理</text>
                 </view>
+                <view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/wholesale/wholesale/wholesale`)">
+                  <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
+                  </image>
+                  <text class="text">供应链批发</text>
+                </view>
+                <view v-if="userInfoData.mer_info.type_code === 'TypeTownSupplyChain'" class="examine" @click="navigator(`/pages/replace_replenishment/index`)">
+                  <image class="icon_img" src="@/static/images/index15.png" mode="aspectFit">
+                  </image>
+                  <text class="text">代发补货</text>
+                </view>
 
                 <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
diff --git a/pages/replace_replenishment/index.vue b/pages/replace_replenishment/index.vue
new file mode 100644
index 0000000..5e74f3d
--- /dev/null
+++ b/pages/replace_replenishment/index.vue
@@ -0,0 +1,1330 @@
+	<template>
+		<view :style="viewColor">
+
+			<view class='my-order'>
+				<view class='header'>
+
+					<view class='picTxt acea-row row-between-wrapper'>
+						<view class='text'>
+							<view class='name'>代发信息</view>
+							<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
+						</view>
+						<view class='pictrue'>
+							<image :src="`${domain}/static/images/orderTime.png`"></image>
+						</view>
+					</view>
+				</view>
+				<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+					<text class="iconfont icon-sousuo"></text>
+					搜索我的订单
+				</navigator>
+				<view class='nav acea-row row-around'>
+					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+						<view>全部</view>
+						<view class='num'>{{orderData.orderCount+len || 0}}</view>
+					</view>
+					<!-- <view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
+						<view>待付款</view>
+						<view class='num'>{{orderData.noPay || 0}}</view>
+					</view> -->
+					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+						<view>待发货</view>
+						<view class='num'>{{orderData.noPostage || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
+						<view>待收货</view>
+						<view class='num '>{{orderData.noDeliver || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+						<view>待评价</view>
+						<view class='num'>{{orderData.noComment || 0}}</view>
+					</view>
+					<!-- <view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
+						<view>售后/退款</view>
+						<view class='num'>{{len || 0}}</view>
+					</view> -->
+				</view>
+				<!--定金预售订单-->
+				<view v-if="presellProList.length > 0" class="event_container">
+					<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+						<view class="info">
+							<view class="title">预售尾款订单转到这里了！</view>
+							<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+							</view>
+						</view>
+						<view class="photo acea-row row-between">
+							<view class='picture'>
+								<image
+									:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+								</image>
+							</view>
+							<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+						</view>
+					</navigator>
+				</view>
+				<view class='list'>
+					<!-- 代付款 -->
+					<view v-if="orderList.length > 0">
+						<block v-if="orderStatus == 0">
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.group_order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper">
+											{{item.group_order_sn}}
+										</view>
+										<view class='t-color'>
+											{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+										</view>
+									</view>
+									<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+										<!--预售-->
+										<view v-if="order.activity_type === 2">
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+														<view class='name line1'>
+															<text
+																class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+															<view class="event_ship event_color">发货时间：
+																<!--全款预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 1">
+																	{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+																</text>
+																<!--定金预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															</view>
+														</view>
+														<view class='money'>
+															<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+															</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+													<view v-if="goods.cart_info.productPresell.presell_type === 2"
+														class="event_price">
+														定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+														尾款待支付 <text
+															class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+													</view>
+												</view>
+											</block>
+										</view>
+										<view v-else>
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+
+														<view class='name line2'>{{goods.cart_info.product.store_name}}
+														</view>
+
+														<view class='money' v-if="item.orderList[0].activity_type == 4">
+															<view v-if="goods.cart_info.activeSku">
+																￥{{goods.cart_info.activeSku.active_price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+														<view v-else class='money'>
+															<view>￥{{goods.cart_info.productAttr.price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+												</view>
+											</block>
+										</view>
+									</view>
+									 
+									<view class='bottom acea-row row-right row-middle'>
+										<view class='bnt b-color'
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											立即付款</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<!-- 待发货 待收货 待评价 已完成 -->
+						<block v-else>
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.order_id)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+											<!-- <text class="iconfont icon-shangjiadingdan"></text> -->
+											<!-- <view class="store-name">{{item.merchant.mer_name}}</view>
+											<text class="iconfont icon-xiangyou"></text> -->
+                      <view class="store-name">订单号: {{item.order_sn}}</view>
+										</view>
+
+										<view v-if="item.order_status ==7" class='t-color'>
+											<text
+												v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+											<!-- <text v-else>待发货</text> -->
+										</view>
+
+
+										<view v-if="item.order_status == 2 " class='t-color'>待发货</view>
+										<view v-if="item.order_status == 1 " class='t-color'>待付款</view>
+										<view v-if="item.order_status == 3" class='t-color'>待收货</view>
+										<view v-if="item.order_status == 4" class='t-color'>待评价
+										</view>
+										<view v-if="item.order_status == 5" class='t-color'>已完成</view>
+										<view v-if="item.order_status == 6" class='t-color'>已退款</view>
+										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
+										</view>
+										<view v-if="item.order_status == 9" class='t-color'>待商家确认</view>
+									</view>
+									<view v-if="item.activity_type === 2">
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money'>
+													<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view v-else>
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name line2'>
+														<text>{{goods.cart_info.product.store_name}}</text>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money' v-if="item.activity_type == 3">
+													<view v-if="goods.cart_info.productAssistAttr">
+														￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else-if="item.activity_type == 4">
+													<view v-if="goods.cart_info.activeSku">
+														￥{{goods.cart_info.activeSku.active_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else>
+													<view>￥{{goods.cart_info.productAttr.price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view v-if="item.pay_type==8" style="text-align: right;width: 100%;font-size: 14px;">先货后款 实付:￥0.00</view>
+											</view>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.presell_price}}</text>
+									</view>
+                  <view class='totalPrice' v-else-if="item.pay_type==8">共{{item.orderNum || 0}}件商品，结算周期到期后付款
+                  	<text class='money p-color'>￥{{item.pay_price}}</text>
+                  </view>
+									<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<!-- <view v-if="!item.receipt && item.status != -1" 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>
+									</block>
+									<block v-if="item.status == 1">
+										<view class='bnt cancelBnt'
+											v-if="item.delivery_type == 1 || item.delivery_type == 2"
+											@click='goOrderDetails(item.order_id)'>查看物流</view>
+										<view class='bnt b-color' @tap='confirmOrder(item,index)'
+											v-if='item.activity_type==98&&item.pay_type==8'>
+											确认收货
+										</view>
+										<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
+									</block>
+
+									<block v-if="item.order_status == 1 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.order_status == 9 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.status == 2 ">
+										<!-- 	<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+
+										<!-- <view class='bnt b-color' v-if="item.order_status==8"
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去结算
+										</view> -->
+                    <view class='bnt b-color' v-if="item.order_status==8"
+                    	@click.stop='navToPay(item)'>
+                    	去结算
+                    </view>
+										<view v-else class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>
+											去评价
+										</view>
+									</block>
+									<block v-if="item.status == 3">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+											v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+											查看详情</view>
+										<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+									</block>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+				<view v-if="orderList.length == 0 && page > 1">
+					<emptyPage title="暂无订单~"></emptyPage>
+				</view>
+			</view>
+			<home></home>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+			<payment :payMode='payMode' :pay_close="pay_close" :order_type='order_type' @onChangeFun='onChangeFun'
+				:order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+
+
+			<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+			<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
+				<view class="warp">
+					<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+					<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+				</view>
+				<view class="textp">
+					<h3>确认收到货了吗?</h3>
+					<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+					<button class="shouhuobtn" @click="queding()">
+
+						确认
+					</button>
+					<view class="cle" @click="close">取消</view>
+				</view>
+			</u-popup>
+		</view>
+	</template>
+
+	<script>
+		// +----------------------------------------------------------------------
+		// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+		// +----------------------------------------------------------------------
+		// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+		// +----------------------------------------------------------------------
+		// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+		// +----------------------------------------------------------------------
+		// | Author: CRMEB Team <admin@crmeb.com>
+		// +----------------------------------------------------------------------
+		let app = getApp();
+		import {
+			getOrderList,
+			orderData,
+			unOrderCancel,
+			orderDel,
+			orderPay,
+			groupOrderList,
+			orderTake,
+			applyInvoiceApi,
+			refundList
+		} from '@/api/order.js';
+    import{
+      behalfAdminOrderList
+    } from "@/api/behalfAdmin.js"
+		import {
+			getUserInfo
+		} from '@/api/user.js';
+		import {
+			openOrderSubscribe
+		} from '@/utils/SubscribeMessage.js';
+		import payment from '@/components/payment';
+		import home from '@/components/home/index.vue';
+		import addInvoicing from '@/components/addInvoicing';
+		import {
+			mapGetters
+		} from "vuex";
+		import authorize from '@/components/Authorize';
+		import emptyPage from '@/components/emptyPage.vue';
+		import {
+			configMap
+		} from '@/utils'
+		import {
+			HTTP_REQUEST_URL
+		} from '@/config/app';
+		export default {
+			components: {
+				payment,
+				emptyPage,
+				home,
+				authorize,
+				addInvoicing
+			},
+			data() {
+				return {
+					loading: false, //是否加载中
+					loadend: false, //是否加载完毕
+					loadTitle: '加载更多', //提示语
+					orderList: [], //订单数组
+					presellProList: [], //定金预售订单
+					presellOrderCount: 0,
+					orderData: {}, //订单详细统计
+					orderStatus: -1, //订单状态
+					page: 1,
+					limit: 20,
+					receivingshow: false,
+					domain: HTTP_REQUEST_URL,
+					order_type: 0,
+					payMode: [{
+							name: "微信支付",
+							icon: "icon-weixinzhifu",
+							value: 'wechat',
+							title: '微信快捷支付',
+							payStatus: 1
+						},
+						{
+							name: "支付宝支付",
+							icon: "icon-zhifubao",
+							value: 'alipay',
+							title: '支付宝支付',
+							payStatus: this.$store.getters.globalData.alipay_open
+						},
+						{
+							name: "余额支付",
+							icon: "icon-yuezhifu",
+							value: 'balance',
+							title: '可用余额:',
+							number: 0,
+							payStatus: this.$store.getters.globalData.yue_pay_status
+						}
+					],
+					pay_close: false,
+					pay_order_id: '',
+					invoice_order_id: '',
+					totalPrice: '0',
+					order_id: 0,
+					isAuto: false, //没有授权的不会自动授权
+					isShowAuth: false, //是否隐藏授权
+					isReady: true,
+					invoice: {
+						invoice: false,
+						add: false,
+					},
+					len: 0
+				};
+			},
+			computed: {
+				...mapGetters(['isLogin', 'viewColor']),
+				...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+			},
+			watch: {
+				alipay_open(n) {
+					this.payMode[1].payStatus = n
+				},
+				yue_pay_status(n) {
+					this.payMode[2].payStatus = n
+				}
+			},
+			onShow() {
+				if (this.isLogin) {
+					this.page = 1;
+					this.loadend = false;
+					this.loading = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					// this.getpreSellOrderList();
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			},
+			onReady() {},
+			mounted: function() {
+				this.arrlist()
+			},
+			methods: {
+				arrlist() {
+
+					refundList({
+						product_type: 98,
+						type: 0,
+						page: 1,
+						limit: 1500
+
+					}).then(res => {
+						this.len = res.data.list.length
+					})
+				},
+				// 后退
+				returns() {
+					uni.navigateBack()
+				},
+				// 首页
+				goHome() {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				},
+				// 去商铺
+				goMall(item) {
+					if (this.hide_mer_status == 0) {
+						uni.navigateTo({
+							url: '/pages/store/home/index?id=' + item.mer_id
+						})
+					}
+				},
+        // 先货后款去支付
+        navToPay(item){
+          uni.navigateTo({
+            url: `/pages/users/payment/payment?order_id=${item.group_order_id}&product_type=${item.orderProduct[0]?.product_type||''}`
+          })
+        },
+				onLoadFun() {
+					this.isShowAuth = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+				},
+				// 授权关闭
+				authColse: function(e) {
+					this.isShowAuth = e
+				},
+				/**
+				 * 事件回调
+				 *
+				 */
+				onChangeFun: function(e) {
+					let opt = e;
+					let action = opt.action || null;
+					let value = opt.value != undefined ? opt.value : null;
+					(action && this[action]) && this[action](value);
+				},
+				/**
+				 * 获取用户信息
+				 *
+				 */
+				getUserInfo: function() {
+					let that = this;
+					getUserInfo().then(res => {
+						that.payMode[2].number = res.data.now_money;
+						// that.$set(that, 'payMode', that.payMode);
+					});
+				},
+				/**
+				 * 关闭支付组件
+				 *
+				 */
+				payClose: function() {
+					this.pay_close = false;
+				},
+				/**
+				 * 生命周期函数--监听页面加载
+				 */
+				onLoad: function(options) {
+					if (options.status) this.orderStatus = options.status;
+				},
+				/**
+				 * 获取订单统计数据
+				 *
+				 */
+				getOrderData: function() {
+					let that = this;
+					orderData({
+						product_type: 98
+					}).then(res => {
+						// console.log(res.data)
+						that.$set(that, 'orderData', res.data);
+					})
+				},
+				/**
+				 * 取消订单
+				 *
+				 */
+				cancelOrder: function(index, order_id) {
+					let that = this;
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法取消订单'
+					});
+					unOrderCancel(order_id).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						}, function() {
+							that.orderList.splice(index, 1);
+							that.$set(that, 'orderList', that.orderList);
+							that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+							that.getOrderData();
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+				},
+				/**
+				 * 打开支付组件
+				 *
+				 */
+				goPay: function(pay_price, order_id, order_type) {
+					this.$set(this, 'pay_close', true);
+					this.order_id = order_id;
+					this.pay_order_id = order_id.toString()
+					this.$set(this, 'totalPrice', pay_price);
+					this.order_type = order_type
+				},
+				/**
+				 * 支付成功回调
+				 *
+				 */
+				pay_complete: function() {
+					this.loadend = false;
+					this.page = 1;
+					this.$set(this, 'orderList', []);
+					this.pay_close = false;
+					this.pay_order_id = '';
+					this.getOrderData();
+					this.getOrderList();
+				},
+				/**
+				 * 支付失败回调
+				 *
+				 */
+				pay_fail: function() {
+					this.pay_close = false;
+					this.pay_order_id = '';
+				},
+				/**
+				 * 去订单详情
+				 */
+				goOrderDetails: function(order_id) {
+
+
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情'
+					});
+					// #ifdef MP
+					uni.showLoading({
+						title: '正在加载',
+					})
+					console.log(self.orderStatus)
+					openOrderSubscribe().then(() => {
+						uni.hideLoading();
+						if (self.orderStatus == 0) {
+							uni.navigateTo({
+								url: '/pages/order_details/stay?order_id=' + order_id
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/order_details/index?order_id=' + order_id
+							})
+						}
+					}).catch(() => {
+						uni.hideLoading();
+					})
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 提示
+				 */
+				dePay() {
+
+					uni.showModal({
+						title: '提示',
+						title: '该订单属于先货后款的订单，等商户确认后才能支付',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+
+				},
+				/**
+				 * 点击去评价
+				 */
+				goOrderDetails_Evaluation: function(order_id) {
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情和评价'
+					});
+					// #ifdef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 切换类型
+				 */
+				statusClick: function(status) {
+
+					if (status == 5) {
+						uni.navigateTo({
+							url: '/pages/users/refund/list?type=98'
+						})
+					} else {
+						if (status == this.orderStatus) return;
+						this.orderStatus = status;
+						this.loadend = false;
+						this.loading = false;
+						this.page = 1;
+						this.$set(this, 'orderList', []);
+						this.getOrderList();
+					}
+				},
+				/**
+				 * 获取订单列表
+				 */
+				getOrderList: function() {
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+					that.loading = true;
+					that.loadTitle = "加载更多";
+					if (that.isReady) {
+						that.isReady = false
+						if (that.orderStatus == -1) {
+              behalfAdminOrderList({
+								page: that.page,
+								limit: that.limit,
+							}).then(res => {
+								that.isReady = true;
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								// console.log(that.orderList)
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								// console.log(that.orderList)
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1
+							})
+						} else {
+							let arr;
+							if (that.orderStatus > -1) {
+								arr = that.orderStatus
+							} else {
+								arr = ''
+							}
+							getOrderList({
+								status: arr,
+								page: that.page,
+								limit: that.limit,
+								product_type: 98
+							}).then(res => {
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1;
+								that.isReady = true;
+							}).catch(err => {
+								that.loading = false;
+								that.loadTitle = "加载更多";
+							})
+						}
+					}
+				},
+				/**
+				 * 获取定金预售订单列表
+				 */
+				getpreSellOrderList: function() {
+					let that = this;
+					getOrderList({
+						status: 10,
+						page: 1,
+						limit: 1,
+					}).then(res => {
+						let list = res.data.list || [];
+						that.presellOrderCount = res.data.count;
+						that.$set(that, 'presellProList', list);
+					})
+				},
+				/**
+				 * 获取单个订单商品数量
+				 */
+				getProductCount: function() {
+					if (this.orderStatus !== 0) {
+						this.orderList.forEach((item, i) => {
+							let orderNum = 0
+							if (item.orderProduct) {
+								item.orderProduct.forEach((val) => {
+									orderNum += val.product_num
+								})
+								this.orderList[i]['orderNum'] = orderNum;
+							}
+						})
+					}
+				},
+				/**
+				 * 删除订单
+				 */
+				delOrder: function(order_id, index) {
+					let that = this;
+					orderDel(order_id).then(res => {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+						return that.$util.Tips({
+							title: '删除成功',
+							icon: 'success'
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				},
+				close() {
+					this.receivingshow = false
+				},
+				//收货弹窗
+				confirmOrder: function(item) {
+					console.log(item)
+					this.order_id = item.order_id
+					this.receivingshow = true
+
+				},
+				queding() {
+
+					let that = this;
+					orderTake(that.order_id).then(res => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: '成功收货',
+							icon: 'success'
+						}, function() {
+
+							that.getOrderInfo();
+						});
+					}).catch(err => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: err
+						});
+					})
+
+
+
+				},
+
+				// 确认收货
+				confirmOrdera: function(item, index) {
+					let that = this;
+					uni.showModal({
+						title: '确认收货',
+						content: '为保障权益，请收到货确认无误后，再确认收货',
+						success: function(res) {
+							if (res.confirm) {
+								orderTake(item.order_id).then(res => {
+									return that.$util.Tips({
+										title: '操作成功',
+										icon: 'success'
+									}, function() {
+										that.orderList.splice(index, 1);
+										that.getOrderData();
+									});
+								}).catch(err => {
+									return that.$util.Tips({
+										title: err
+									});
+								})
+							}
+						}
+					})
+				},
+				/*申请开票*/
+				applyInvoice(order_id) {
+					let that = this;
+					that.invoice_order_id = order_id
+					that.invoice.invoice = true;
+					that.$refs.addInvoicing.getInvoiceDefault();
+					that.$refs.addInvoicing.getInvoiceList();
+				},
+				// 关闭发票弹窗
+				changeInvoiceClose: function(data) {
+					if (data) this.getInvoiceData(data);
+					this.$set(this.invoice, 'invoice', false);
+				},
+				// 开票回调
+				getInvoiceData(data) {
+					let that = this
+					applyInvoiceApi(that.invoice_order_id, data).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+	</script>
+
+	<style scoped lang="scss">
+		.warp {
+			margin: auto;
+
+			.guanbi {
+				position: absolute;
+				right: 0px;
+				top: 120rpx;
+				z-index: 1;
+				width: 30px;
+				height: 30px;
+			}
+		}
+
+		.textp {
+			width: 320px;
+			padding-bottom: 20px;
+			position: absolute;
+			top: 110px;
+			border-radius: 10px;
+
+			span {
+				display: block;
+				width: 280px;
+				padding-top: 20px;
+				margin: auto;
+			}
+
+			h3 {
+				text-align: center;
+			}
+
+			.shouhuobtn {
+				margin: auto;
+				line-height: 54px;
+				margin-top: 30px;
+				width: 191px;
+				height: 54px;
+				color: white;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+			}
+
+			.cle {
+				margin: auto;
+				text-align: center;
+				margin-top: 15px;
+				height: 40px;
+				background-color: #FFFFFF;
+				border-radius: 10px;
+				color: #999999;
+			}
+		}
+
+		.head-menu {
+			height: 50rpx;
+			padding-left: 20rpx;
+			line-height: 50rpx;
+			font-weight: bold;
+		}
+
+		.my-order .header {
+			height: 260rpx;
+			padding: 0 30rpx;
+			background-color: var(--view-theme);
+		}
+
+		.t-color {
+			color: var(--view-theme);
+		}
+
+		.p-color {
+			color: var(--view-priceColor);
+		}
+
+		.b-color {
+			background-color: var(--view-theme);
+		}
+
+		.my-order .header .picTxt {
+			height: 190rpx;
+		}
+
+		.my-order .header .picTxt .text {
+			color: rgba(255, 255, 255, 0.8);
+			font-size: 26rpx;
+			// font-family: 'Guildford Pro';
+		}
+
+		.my-order .header .picTxt .text .name {
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #fff;
+			margin-bottom: 20rpx;
+		}
+
+		.my-order .header .picTxt .pictrue {
+			width: 122rpx;
+			height: 109rpx;
+		}
+
+		.my-order .header .picTxt .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.my-order .nav {
+			background-color: #fff;
+			width: 690rpx;
+			height: 140rpx;
+			border-radius: 16rpx;
+			margin: 20rpx auto 0 auto;
+		}
+
+		.my-order .nav .item {
+			text-align: center;
+			font-size: 26rpx;
+			color: #282828;
+			padding: 29rpx 0;
+		}
+
+		.my-order .nav .item.on {
+			font-weight: bold;
+			border-bottom: 5rpx solid var(--view-theme);
+		}
+
+		.my-order .nav .item .num {
+			margin-top: 18rpx;
+		}
+
+		.my-order .list {
+			width: 690rpx;
+			margin: 14rpx auto 0 auto;
+		}
+
+		.my-order .list .item {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-bottom: 14rpx;
+		}
+
+		.my-order .list .item .title {
+			height: 84rpx;
+			padding: 0 30rpx;
+			border-bottom: 1px solid #eee;
+			font-size: 28rpx;
+			color: #282828;
+
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
+
+				.store-name {
+					margin: 0 10rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
+		}
+
+		.my-order .list .item .title .sign {
+			font-size: 24rpx;
+			padding: 0 7rpx;
+			height: 36rpx;
+			margin-right: 15rpx;
+		}
+
+		.my-order .list .item .item-info {
+			padding: 0 30rpx;
+			margin-top: 22rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue {
+			width: 120rpx;
+			height: 120rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue image {
+			width: 100%;
+			height: 100%;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text {
+			width: 486rpx;
+			font-size: 28rpx;
+			color: #999;
+			margin-top: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text .name {
+			width: 320rpx;
+			color: #282828;
+		}
+
+		.event_bg {
+			background: #FF7F00;
+		}
+
+		.event_color {
+			color: #FF7F00;
+		}
+
+		.my-order .list .item .event_name {
+			display: inline-block;
+			margin-right: 9rpx;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			line-height: 30rpx;
+			text-align: center;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .event_ship {
+			font-size: 20rpx;
+			margin-top: 10rpx;
+		}
+
+		.my-order .list .event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+
+		.my-order .list .item .item-info .text .money {
+			text-align: right;
+		}
+
+		.my-order .list .item .totalPrice {
+			font-size: 26rpx;
+			color: #282828;
+			text-align: right;
+			margin: 27rpx 0 0 30rpx;
+			padding: 0 30rpx 30rpx 0;
+		}
+
+		.my-order .list .item .totalPrice .money {
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		.my-order .list .item .bottom {
+			height: 107rpx;
+			padding: 0 30rpx;
+			border-top: 1px solid #f0f0f0;
+		}
+
+		.my-order .list .item .bottom .bnt {
+			width: 176rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 50rpx;
+			font-size: 27rpx;
+		}
+
+		.my-order .list .item .bottom .bnt.cancelBnt {
+			border: 1px solid #ddd;
+			color: #aaa;
+		}
+
+		.my-order .list .item .bottom .bnt.colorBnt {
+			border: 1px solid var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.my-order .list .item .bottom .bnt .icon-fabu {
+			font-size: 26rpx;
+			margin-right: 10rpx;
+		}
+
+		.my-order .list .item .bottom .bnt~.bnt {
+			margin-left: 17rpx;
+		}
+
+		.noCart {
+			margin-top: 171rpx;
+			padding-top: 0.1rpx;
+		}
+
+		.noCart .pictrue {
+			width: 414rpx;
+			height: 336rpx;
+			margin: 78rpx auto 56rpx auto;
+		}
+
+		.noCart .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.event_container {
+			width: 690rpx;
+			background-image: url(/static/images/presell_orderBg.png);
+			background-size: cover;
+			background-repeat: no-repeat;
+			margin: 20rpx auto;
+			padding: 26rpx 30rpx;
+			border-radius: 16rpx;
+
+			.info {
+				width: 420rpx;
+
+				.title {
+					color: #282828;
+					font-size: 26rpx;
+				}
+
+				.desc {
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 30rpx;
+				}
+			}
+
+			.photo {
+				width: 180rpx;
+
+				.picture {
+					width: 120rpx;
+					height: 120rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 8rpx;
+					}
+				}
+
+				.more_btn {
+					color: #fff;
+					background: #F97E3B;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 40rpx;
+					text-align: center;
+					line-height: 40rpx;
+					position: relative;
+					top: 40rpx;
+
+					text {
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+
+		.search {
+			height: 70rpx;
+			padding: 0 30rpx;
+			border-radius: 35rpx;
+			margin: -35rpx 30rpx 0;
+			background-color: #FFFFFF;
+			font-size: 26rpx;
+			color: #999999;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 23rpx;
+			}
+		}
+	</style>
\ No newline at end of file
diff --git a/pages/wholesale/wholesale/wholesale.vue b/pages/wholesale/wholesale/wholesale.vue
new file mode 100644
index 0000000..b1181bc
--- /dev/null
+++ b/pages/wholesale/wholesale/wholesale.vue
@@ -0,0 +1,1664 @@
+<template>
+	<view :style="viewColor">
+		<view class='productList'>
+			<view class="nav-wrapper">
+				<view v-if="hide_mer_status == 0" class="tab-bar">
+					<view class="tab-item" :class="{on:tabIndex==1}" @click="tabIndex = 1">商品</view>
+					<view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">商户</view>
+				</view>
+				<block v-if="tabIndex==1">
+					<view class='nav acea-row row-middle' >
+						<view class='item' @click="downStatus = !downStatus"
+							:class="{'t-color':downKey>0 && firstKey == 0}">
+							{{downMenu[downKey].title}}
+							<text v-if="!downStatus" class="iconfont icon-xiala1 spin"></text>
+							<text v-else class="iconfont icon-xiala1"></text>
+						</view>
+						<view class='item' :class="{'t-color': where.order=='sales'}" @click='set_where(3)'>
+							销量
+						</view>
+						<view class='item' :class="{'t-color': where.order=='price_desc'}" @click='set_where(2)'>
+							价格
+							<image v-if="price==1" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
+							<image v-else-if="price==2" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
+							<image v-else src='/static/images/horn.png'></image>
+						</view>
+						<!-- down -->
+						<view class='item' @click='bindRight'>
+							筛选
+							<text class="iconfont icon-shaixuan"></text>
+						</view>
+					</view>
+				</block>
+				<block v-if="tabIndex==2">
+					<view class='nav acea-row row-middle'>
+						<view class='item' v-for="item in shopTab" :key="item.key"
+							:class=" {'t-color':storeKey==item.key}" @click="storeTab(item.key)">
+							{{item.title}}
+						</view>
+						<view class="item" :class="{'t-colors':firstKey == 4}" @click="bindRight2">
+							<view>筛选
+								<text class="iconfont icon-shaixuan"></text>
+							</view>
+							<view class="line" :class="{'font-line':firstKey == 4}">
+							</view>
+						</view>
+					</view>
+				</block>
+			</view>
+			<!-- 商品 -->
+			<block v-if="tabIndex == 1">
+				<view class="list" :style="{ marginTop: mTop }">
+					<WaterfallsFlow :wfList='productList' :isStore="hide_mer_status" @itemTap="godDetail" :type="1"
+						@goShop="goStore" />
+					<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+					</view>
+				</view>
+				<view class='noCommodity' v-if="productList.length==0 && !loading">
+					<view class='pictrue' style="margin: 0 auto;">
+						<image src='/static/images/noCart.png'></image>
+						<text>暂无商品，快去搜索其他商品吧</text>
+					</view>
+					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
+				</view>
+			</block>
+			<!-- 店铺 -->
+			<block v-if="tabIndex == 2">
+				<view v-if="storeList.length" class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<!-- <view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view> -->
+							<!-- <view class="zhezhao">
+							</view> -->
+							<view class="zhezhao1"  @click="goStore(item.mer_id)">
+								<view class="title">
+									<view class="left">
+                    <view>{{item.mer_name}}
+                    </view>
+                    <span>
+                    	{{item.type_name}}
+                    </span>
+                  </view>
+                  <view class="right">
+                    进店
+                  </view>
+								</view>
+                <u-line></u-line>
+								<view class="coent" style="margin-top: 20rpx;">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class="text">
+                    <view class="score">
+                    	<view class="star">
+                    		<view
+                    			:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+                    		</view>
+                    	</view>
+                    	<view class="score_text">{{ item.service_score }}</view>
+                    </view>
+										<view class="text_three">
+											<image src="@/static/images/phone_r.png" mode=""></image>
+											{{item.service_phone}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/clock_r.png" mode=""></image>
+											{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei_r.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+
+							</view>
+
+						</view>
+					</view>
+					<view class='loadingicon acea-row row-center-wrapper' v-if='loading'>
+						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+					</view>
+
+				</view>
+				<view class='no-shop' v-if="!storeList.length && !loading">
+					<view class='pictrue' style="margin: 0 auto;">
+						<image src='/static/images/no-Cart.png'></image>
+						<text>暂无店铺，快去搜索其他店铺吧</text>
+					</view>
+				</view>
+			</block>
+			<rightSlider1 v-if="rightBox" :status="rightBox" :activeIndex="activeIndex" :brandList="brandList"
+				:price_on="where.price_on" :price_off="where.price_off" @confirm="confirm" @close="close">
+			</rightSlider1>
+		</view>
+		<view class="down-wrapper" v-if="downStatus">
+			<view class="bg"></view>
+			<view class="down-box" :style="{ top: mTop }">
+				<view class="down-item" v-for="(item,index) in downMenu" :key="item.key"
+					:class="{'on':index == downKey}" @click="bindDown(item,index)">
+					{{item.title}}
+					<text v-if="index == downKey" class="iconfont icon-gou"></text>
+				</view>
+			</view>
+		</view>
+		<rightSlider2 v-if="rightBox2" :status="rightBox2" :activeIndex="activeIndex" :merList="merList"
+			:storeTypeArr="storeTypeArr" @confirm="confirm2" @close="close"></rightSlider2>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- #ifndef H5 -->
+		<passwordPopup></passwordPopup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		getProductslist,
+		getProductHot,
+		getBrandlist,
+		storeMerchantList,
+		getGeocoder
+	} from '@/api/store.js';
+	import {
+		initiateAssistApi
+	} from '@/api/activity.js';
+	import recommend from '@/components/recommend';
+	import rightSlider1 from '@/components/rightSlider.vue';
+	import rightSlider2 from '@/components/rightSlider/index';
+	import WaterfallsFlow from '@/components/WaterfallsFlowSupply/WaterfallsFlow.vue'
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifndef H5
+	import passwordPopup from '@/components/passwordPopup';
+	// #endif
+	import authorize from '@/components/Authorize';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		getconfig,
+	} from '@/api/public.js';
+	const app = getApp();
+	export default {
+		components: {
+			recommend,
+			rightSlider1,
+			rightSlider2,
+			WaterfallsFlow,
+			// #ifndef H5
+			passwordPopup,
+			// #endif
+			authorize,
+		},
+		watch: {
+			tabIndex(nVal, oVal) {
+				if (nVal == 1) {
+					this.loadend = false;
+					this.$set(this.where, 'page', 1)
+					this.get_product_list(true);
+				} else {
+					this.downStatus = false
+					this.storeScroll = true
+					this.storeList = []
+					this.storeMerchantList('')
+				}
+			}
+		},
+		data() {
+			return {
+				domain: HTTP_REQUEST_URL,
+				productList: [],
+				is_switch: true,
+				where: {
+					cate_id: '',
+					order: '',
+					price_on: '',
+					price_off: '',
+					brand_id: '',
+					keyword: '',
+					is_trader: '',
+					page: 1,
+					limit: 30
+				},
+				shopTabs: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				price: 0,
+				stock: 0,
+				nows: false,
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
+				title: '',
+				hostProduct: [],
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				rightBox2: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				// 下拉菜单
+				downMenu: [{
+						title: '综合',
+						key: 1,
+					},
+					{
+						title: '评分',
+						key: 2,
+					},
+					{
+						title: '新品',
+						key: 3,
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// tab切换
+				tabIndex: 1,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: ''
+				},
+				storeKey: 0,
+				storeScroll: true,
+				detaile_address: "", //详细地址
+				recommend_address: "", //当前地点
+				latitude: "",
+				longitude: "",
+				mer_location: 0,
+				count: 0, //店铺总条数
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				mTop: 0,
+				activeIndex: 0,
+			};
+		},
+		onLoad: function(options) {
+			// console.log(this.isLogin)
+			this.$set(this.where, 'cate_id', options.id || '');
+			this.title = options.title || '';
+			this.$set(this.where, 'keyword', options.searchValue || '');
+			this.get_product_list();
+			this.get_host_product();
+			this.getClassfication();
+			this.getStoreType();
+      this.tabIndex = 2
+		},
+		onReady() {},
+		mounted() {
+			uni.getStorage({
+				key: 'GLOBAL_DATA',
+				success: (res) => {
+					// console.log(res);
+					if (res.data.mer_location == 1) {
+						this.mer_location = res.data.mer_location
+						this.selfLocation()
+					}
+				}
+			});
+			// this.mTop = this.hide_mer_status == 0 ? '308rpx' : '170rpx'
+		},
+		computed: {
+			shopTab: function() {
+				return this.shopTabs.filter((item) => {
+					if (this.mer_location == 1) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				hide_mer_status: 0,
+				recommend_switch: 0
+			}, mapGetters(['uid', 'isLogin', 'scrollTop', 'viewColor', 'keyColor'])),
+		},
+		// 滚动监听
+		onPageScroll() {
+			uni.$emit('scroll');
+		},
+		methods: {
+			//查看地图
+			showMaoLocation(lat, lon) {
+				// console.log(lat, lon)
+				if (!lat || !lon) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(lon)
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(lon),
+						scale: 8,
+						geocode: true,
+						name: '当前位置',
+						address: this.detaile_address,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif
+			},
+			//获取定位
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						// console.log(res)
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						// console.log(res)
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.detaile_address = res.data.address;
+							this.recommend_address = res.data.formatted_addresses.recommend;
+						})
+					},
+					complete: function() {
+						// self.getList();
+					}
+				});
+			},
+			// 获取商户分类
+			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 => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.type_id.length > 0) {
+							this.sotreParam.type_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.mer_type_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 查找店铺
+			storeMerchantList(type) {
+				if (!this.storeScroll) return
+				this.loading = true
+				let serachData = {
+					keyword: this.where.keyword,
+					page: this.sotreParam.page,
+					limit: this.sotreParam.limit,
+					order: this.sotreParam.order,
+					category_id: this.sotreParam.category_id,
+					type_id: this.sotreParam.type_id
+
+				}
+				console.log(this.sotreParam.category_id)
+				if (this.latitude) {
+					serachData.location = this.latitude + ',' + this.longitude
+				}
+				storeMerchantList(serachData).then(res => {
+					res.data.list.forEach(item => {
+						var tempNum = parseFloat(item.product_score) + parseFloat(item.service_score) +
+							parseInt(item.postage_score)
+						tempNum = tempNum / 3 / 5 * 100
+						item.allScore = tempNum.toFixed(2)
+					})
+					this.storeScroll = res.data.list.length >= this.sotreParam.limit
+					this.storeList = this.storeList.concat(res.data.list)
+					this.count = res.data.count
+					this.loading = false
+				
+				})
+			},
+			// 店铺排序
+			storeTab(key) {
+				if (this.loading) return
+				this.storeKey = key
+				this.sotreParam.order = this.shopTabs[key].order
+				this.sotreParam.page = 1
+				this.storeScroll = true
+				this.storeList = []
+				this.storeMerchantList()
+			},
+			// 右侧切换
+			bindRight() {
+				this.price = 0;
+				this.firstKey = 4
+				this.getBrandlist()
+			},
+			// 品牌列表
+			getBrandlist() {
+				let temp = []
+				getBrandlist({
+					cate_id: this.where.cate_id,
+					keyword: this.where.keyword
+				}).then(res => {
+					temp = res.data.list.map(item => {
+						return {
+							...item,
+							check: false
+						}
+					})
+					if (this.where.brand_id.length > 0) {
+						this.where.brand_id.forEach((ids, index) => {
+							temp.forEach(el => {
+								if (ids == el.brand_id) {
+									el.check = true
+								}
+							})
+						})
+					}
+					this.brandList = temp
+					this.rightBox = true
+				})
+			},
+			onLoadFun: function(e) {
+				this.isShowAuth = false
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			// 去详情页
+			godDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					if (this.isLogin) {
+						initiateAssistApi(item.activity_id).then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/activity/assist_detail/index?id=' + id
+							});
+						}).catch((err) => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						});
+					} else {
+						this.isAuto = true;
+						this.isShowAuth = true
+					}
+				})
+			},
+			// 组件确定
+			confirm(data, index) {
+				let arr = []
+				if (data.brandList.length == 0) {
+					this.where.brand_id = ''
+				} else {
+					data.brandList.forEach(item => {
+						arr.push(item.brand_id)
+					})
+					this.where.brand_id = arr
+				}
+				this.activeIndex = index
+				// console.log(this.where.brand_id)
+				this.rightBox = data.status
+				this.where.price_on = data.price_on
+				this.where.price_off = data.price_off
+				this.where.is_trader = data.is_trader
+				this.loadend = false;
+				// console.log(this.where)
+				this.$set(this.where, 'page', 1)
+				this.get_product_list(true);
+
+			},
+			// 右侧切换
+			bindRight2() {
+				this.price = 0;
+				this.sotreParam.page = 1
+				this.sotreParam.order = '',
+					this.rightBox2 = true
+			},
+			// 组件确定
+			confirm2(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.rightBox2 = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeScroll = true
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.rightBox2 = false
+			},
+			// 下拉选项
+			bindDown(item, index) {
+				this.firstKey = 0
+				if (index == 0) {
+					this.where.order = ''
+				} else if (index == 1) {
+					this.where.order = 'rate'
+				} else if (index == 2) {
+					this.where.order = 'is_new'
+				}
+				this.downKey = index
+				this.downStatus = false
+				this.loadend = false;
+				this.$set(this.where, 'page', 1)
+				this.get_product_list(true);
+			},
+			Changswitch: function() {
+				let that = this;
+				that.is_switch = !that.is_switch
+			},
+			searchSubmit: function(e) {
+				let that = this;
+				if (!e.detail.value.trim()) {
+					uni.showToast({
+						title: '请输入搜索内容',
+						icon: 'none',
+						duration: 1000
+					});
+					return
+				}
+				that.$set(that.where, 'keyword', e.detail.value);
+				if (this.tabIndex == 1) {
+					that.loadend = false;
+					that.$set(that.where, 'page', 1)
+					this.get_product_list(true);
+				} else {
+					this.sotreParam.page = 1
+					this.storeScroll = true
+					this.storeList = []
+					this.storeMerchantList('search')
+				}
+			},
+			inputChange: function(e) {
+				let that = this;
+				that.$set(that.where, 'keyword', e.detail.value);
+			},
+			/**
+			 * 获取我的推荐
+			 */
+			get_host_product: function() {
+				let that = this;
+				if (that.hotScroll) return
+				getProductHot(
+					that.hotPage,
+					that.hotLimit,
+				).then(res => {
+					// console.log(res);
+					that.hotPage++
+					that.hotScroll = res.data.list.length < that.hotLimit
+					that.hostProduct = that.hostProduct.concat(res.data.list)
+					if (that.hostProduct.length == res.data.count) {
+						
+						uni.showToast({
+							title: '推荐商品,加载完毕',
+							duration: 2000, // 显示时长，单位为毫秒
+							icon:'none'
+						})
+					}
+				});
+			},
+			//点击事件处理
+			set_where: function(e) {
+				switch (e) {
+					case 1:
+						uni.navigateBack()
+						break
+					case 2:
+						this.firstKey = e
+						if (this.price == 0) {
+							this.price = 1;
+							this.where.order = 'price_asc'
+						} else if (this.price == 1) {
+							this.price = 2;
+							this.where.order = 'price_desc'
+						} else if (this.price == 2) {
+							this.price = 0;
+							this.where.order = ''
+						}
+						this.$set(this.where, 'page', 1)
+						this.get_product_list(true);
+						break;
+					case 3:
+						this.price = 0;
+						this.loadend = false;
+						this.$set(this.where, 'order', 'sales')
+						this.$set(this.where, 'page', 1)
+						this.get_product_list(true);
+						this.firstKey = e
+						break;
+				}
+				this.loadend = false;
+				this.$set(this.where, 'page', 1);
+				this.get_product_list(true);
+			},
+			//查找产品
+			get_product_list: function(isPage) {
+				let that = this;
+				
+				if (that.loadend) return;
+				if (that.loading) return;
+				
+				if (isPage === true) that.$set(that, 'productList', []);
+				that.loading = true;
+				that.loadTitle = '';
+				getProductslist(that.where).then(res => {
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'productList', productList);
+					// console.log(that.productList)
+					that.$set(that.where, 'page', that.where.page + 1);
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
+			},
+			goStore: function(id) {
+				if (this.hide_mer_status != 1) {
+					uni.navigateTo({
+						url: `/pages/store/home/index?id=${id}`
+					})
+				} else if (this.storeList.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				}
+			},
+		},
+		onPullDownRefresh() {
+
+		},
+		onReachBottom() {
+			if (this.tabIndex == 1) {
+				if (this.productList.length > 0) {
+					this.get_product_list(false);
+				} else {
+					this.get_host_product();
+				}
+			} else {
+				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()
+				}
+			}
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				const newList = this.productList.reverse();
+				this.productList = newList;
+				uni.stopPullDownRefresh();
+			}, 500)
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.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 {
+		width: 100%;
+		// background-color: var(--view-theme);
+    background-color: #fff;
+
+		.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: #333;
+				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;
+            background-color: var(--view-theme)
+					}
+				}
+			}
+		}
+	}
+
+	.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: 260rpx;
+		height: 260rpx;
+
+		.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: 260rpx;
+		height: 260rpx;
+	}
+
+	.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;
+			}
+
+		}
+	}
+
+	.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;
+        margin: 0 20rpx;
+
+				.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;
+          background-color: #fff;
+          color: #333 !important;
+
+					.title {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+						.left{
+              flex: 1;
+              display: flex;
+              // height: 50px;
+              padding: 20rpx 0;
+              align-items: center;
+              margin-left: 20px;
+              z-index: 1;
+              
+              span {
+                flex-shrink: 0;
+              	// background-color: #F84221;
+                border: 1px solid #F84221;
+                color: #F84221;
+              	font-size: 12px;
+              	padding: 3px;
+              	border-radius: 5px;
+              	margin-left: 5px;
+                margin-right: 5px;
+              }
+            }
+            .right{
+              flex-shrink: 0;
+              background: linear-gradient(to right, #ff7b36,#F84221);
+              color: #fff;
+              height: 50rpx;
+              line-height: 50rpx;
+              width: 100rpx;
+              text-align: center;
+              margin-right: 30rpx;
+              border-radius: 50rpx;
+            }
+					}
+
+					.coent {
+						display: flex;
+						margin: 0 20px;
+            width: 100%;
+            padding-bottom: 20rpx;
+
+						.avater {
+              flex-shrink: 0;
+							width: 80px;
+							height: 80px;
+              border-radius: 14rpx;
+              overflow: hidden;
+
+							image {
+								width: 80px;
+								height: 80px;
+							}
+						}
+
+						.text {
+              flex: 1;
+              width: 100%;
+							.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 {
+                display: flex;
+                align-items: center;
+								width: 270px;
+								padding-left: 10rpx;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10rpx;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.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;
+	}
+  .score {
+  	display: flex;
+  	align-items: center;
+    margin-left: 15rpx;
+    margin-bottom: 16rpx;
+  	font-weight: 500;
+  	font-size: 24rpx;
+  	line-height: 1;
+  	color: #000;
+  
+  	.score-title {
+  		margin-right: 15rpx;
+  
+  	}
+    .score_text{
+      color: #fd5d2e;
+    }
+  
+  	.star {
+  		position: relative;
+  		width: 111rpx;
+  		height: 19rpx;
+  		margin-right: 10rpx;
+  		background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+  		overflow: hidden;
+  
+  		view {
+  			position: absolute;
+  			top: 0;
+  			left: 0;
+  			width: 100%;
+  			height: 100%;
+  			background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+  
+  			&.star_purple {
+  				background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+  			}
+  		}
+  	}
+  }
+</style>
\ No newline at end of file
diff --git a/static/images/SMRK/bar.png b/static/images/SMRK/bar.png
new file mode 100644
index 0000000..0baebee
Binary files /dev/null and b/static/images/SMRK/bar.png differ
diff --git a/static/images/SMRK/img.png b/static/images/SMRK/img.png
new file mode 100644
index 0000000..c573534
Binary files /dev/null and b/static/images/SMRK/img.png differ
diff --git a/static/images/SMRK/name.png b/static/images/SMRK/name.png
new file mode 100644
index 0000000..ed9c1f6
Binary files /dev/null and b/static/images/SMRK/name.png differ
diff --git a/static/images/clock_r.png b/static/images/clock_r.png
new file mode 100644
index 0000000..7bba90d
Binary files /dev/null and b/static/images/clock_r.png differ
diff --git a/static/images/dingwei_r.png b/static/images/dingwei_r.png
new file mode 100644
index 0000000..b2bac68
Binary files /dev/null and b/static/images/dingwei_r.png differ
diff --git a/static/images/phone_r.png b/static/images/phone_r.png
new file mode 100644
index 0000000..f924215
Binary files /dev/null and b/static/images/phone_r.png differ