diff --git a/api/sale.js b/api/sale.js
new file mode 100644
index 0000000..7fc62dc
--- /dev/null
+++ b/api/sale.js
@@ -0,0 +1,10 @@
+// +----------------------------------------------------------------------
+// | 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";
\ No newline at end of file
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 86242be..58c59a0 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -10,75 +10,114 @@
 					<view class='item presell_item'>
 						<view class="acea-row row-between-wrapper">
 							<view class='pictrue' @click="jumpCon(item)">
-								<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image>
+								<image
+									:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
+								</image>
 							</view>
 							<view class='text'>
 								<view class='acea-row row-between-wrapper'>
-									<view class='name line1' style="width: 360rpx;"><text class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}</view>
-									<view class='num'><text class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br/>x {{item.product_num}}</view>
+									<view class='name line1' style="width: 360rpx;"><text
+											class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}
+									</view>
+									<view class='num'><text
+											class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br />x
+										{{item.product_num}}</view>
 								</view>
-								<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">{{item.cart_info.productAttr.sku}}</view>
-								<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11" class="event_ship event_color">发货时间：
+								<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">
+									{{item.cart_info.productAttr.sku}}</view>
+								<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11"
+									class="event_ship event_color">发货时间：
 									<!--全款预售-->
-									<text v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
+									<text
+										v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
 									<!--定金预售-->
-									<text v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
-								</view>	
-								<view class="right-btn-box event_box" >
-									
-									<view class="btn-item" v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate>=0 && evaluate != 1&& evaluate == 2" @click.stop="refund(item)">申请退款</view>
-									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
-									<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-									<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
+									<text
+										v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
+								</view>
+								<view class="right-btn-box event_box">
+
+									<view class="btn-item"
+										v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate>=0 && evaluate != 1&& evaluate == 2"
+										@click.stop="refund(item)">申请退款</view>
+									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
+										{{item.product_num - item.refund_num}}</view>
+									<view class='btn-item err' v-if="item.is_refund >1">已退款 x
+										{{item.product_num - item.refund_num}}</view>
+									<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0'
+										@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 									<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view v-if="orderData.status >= 10" class="event_progress">
-						<view class="progress_list">									
+						<view class="progress_list">
 							<view class="progress_name">阶段一： 买家已付款</view>
-							<view class="progress_price">商品定金  <text class="align_right">￥{{ orderData.pay_price }}</text></view>
-							<view class="progress_pay">定金实付款<text class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
+							<view class="progress_price">商品定金 <text
+									class="align_right">￥{{ orderData.pay_price }}</text></view>
+							<view class="progress_pay">定金实付款<text
+									class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
 						</view>
 						<view class="progress_list">
-							<view class="progress_name">阶段二： 
-								<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
-								<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
-								<text v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
+							<view class="progress_name">阶段二：
+								<text
+									v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
+								<text
+									v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
+								<text
+									v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
 							</view>
-							<view class="progress_price">商品尾款  <text class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view>
-							<view class="progress_pay">尾款需付款<text class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view>
+							<view class="progress_price">商品尾款 <text
+									class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view>
+							<view class="progress_pay">尾款需付款<text
+									class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view>
 						</view>
 					</view>
 				</view>
 				<view v-else class='item'>
+			
 					<view class="acea-row row-between-wrapper">
 						<view class='pictrue' @click="jumpCon(item)">
-							<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image>
+							<image
+								:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
+							</image>
 						</view>
 						<view class='text'>
-								<view class='acea-row row-between-wrapper'>
-									<view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10" :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>{{item.cart_info.product.store_name}}</view>
-									<view class='num'>x {{item.product_num}}</view>
-								</view>
-								<view class='attr line1' v-if="item.cart_info.productAttr.sku">{{item.cart_info.productAttr.sku}}</view>
-								<view class='money p-color' v-if="item.cart_info.product_type ==3">￥{{item.cart_info.productAssistAttr.assist_price}}</view>
-								<view class='money p-color' v-else-if="item.cart_info.product_type ==4">￥{{item.cart_info.activeSku.active_price}}</view>
-								<view class='money acea-row row-middle' v-else>
-									<text>￥{{item.cart_info.productAttr.price}}</text>
-									<image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img" src="/static/images/svip.png"></image>
+							<view class='acea-row row-between-wrapper'>
+								<view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10"
+										: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>{{item.cart_info.product.store_name}}
 								</view>
+								<view class='num'>x {{item.product_num}}</view>
+							</view>
+							<view class='attr line1' v-if="item.cart_info.productAttr.sku">
+								{{item.cart_info.productAttr.sku}}</view>
+							<view class='money p-color' v-if="item.cart_info.product_type ==3">
+								￥{{item.cart_info.productAssistAttr.assist_price}}</view>
+							<view class='money p-color' v-else-if="item.cart_info.product_type ==4">
+								￥{{item.cart_info.activeSku.active_price}}</view>
+							<view class='money acea-row row-middle' v-else>
+								<text>￥{{item.cart_info.productAttr.price}}</text>
+								<image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img"
+									src="/static/images/svip.png"></image>
+							</view>
 						</view>
 					</view>
-					<view class="right-btn-box" >
-						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
-						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-						<view class="btn-item" v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&&evaluate>=0&& evaluate != 1&& evaluate==2" @click.stop="refund(item)">申请退款</view>
-						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
+
+					<view class="right-btn-box">
+						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
+							{{item.product_num - item.refund_num}}</view>
+						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}
+						</view>
+
+						<view class="btn-item"
+							v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&& evaluate != 1&&evaluate !=4&& evaluate!=3  || evaluate==2 ||activityType==98"
+							@click.stop="refund(item)">申请退款</view>
+						<view class='btn-item'
+							v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3 && item.refund_num > 0'
+							@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</view>
 	</view>
@@ -94,10 +133,18 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js';
-	import { goShopDetail } from '@/libs/order.js'
-	import { initiateAssistApi } from '@/api/activity.js';
-	import { mapGetters } from "vuex";	
+	import {
+		openOrderRefundSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		initiateAssistApi
+	} from '@/api/activity.js';
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		props: {
 			evaluate: {
@@ -132,14 +179,14 @@
 		computed: mapGetters(['viewColor']),
 		data() {
 			return {
-				totalNmu:'',
+				totalNmu: '',
 				isTimePay: false, //是否到支付时间
 			};
 		},
-		watch:{
-			cartInfo:function(nVal,oVal){
+		watch: {
+			cartInfo: function(nVal, oVal) {
 				let num = 0
-				nVal.forEach((item,index)=>{
+				nVal.forEach((item, index) => {
 					num += item.cart_num
 				})
 				this.totalNmu = num
@@ -150,52 +197,59 @@
 		},
 		mounted() {},
 		methods: {
-			evaluateTap:function(unique,orderId){
+			evaluateTap: function(unique, orderId) {
 				uni.navigateTo({
-					url:`/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}`
+					url: `/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}`
 				})
 			},
 			// 判断是否到支付尾款时间
-			isPayBalance(){
+			isPayBalance() {
 				let that = this;
-				if(that.orderData.status === 10){
-					if(new Date() < new Date(that.orderData.presellOrder.final_start_time)){
+				if (that.orderData.status === 10) {
+					if (new Date() < new Date(that.orderData.presellOrder.final_start_time)) {
 						that.isTimePay = false; //未开始
-					}else if((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <= new Date(that.orderData.presellOrder.final_start_time)) ){
+					} else if ((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <=
+							new Date(that.orderData.presellOrder.final_start_time))) {
 						that.isTimePay = true; //立即支付
 					}
 				}
 			},
-			jumpCon:function(item){
-				if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id
-				if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id
+			jumpCon: function(item) {
+				if (item.product_type == 4) item.activity_id = item.cart_info && item.cart_info.activeSku
+					.product_group_id
+				if (item.product_type == 3) item.activity_id = item.cart_info && item.cart_info.productAssistAttr
+					.product_assist_id
 				goShopDetail(item).then(res => {
 					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'
-							})	
+						uni.hideLoading();
+						uni.navigateTo({
+							url: '/pages/activity/assist_detail/index?id=' + id
+						});
+					}).catch((err) => {
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
 					});
-				})	
+				})
 			},
 			// 退款
-			refund(item){  
+			refund(item) {
 				// #ifdef MP
 				openOrderRefundSubscribe().then(() => {
 					uni.hideLoading();
-					if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){	
+					if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
 						uni.navigateTo({
-							url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
+							url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' +
+								'&ids=' + item.order_product_id + '&refund_type=1&order_type=' + this
+								.orderData.order_type
 						})
-					}else{
+					} else {
 						uni.navigateTo({
-							url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id
+							url: '/pages/users/refund/select?order_id=' + this.orderId +
+								'&type=1&order_type=' + this.orderData.order_type + '&ids=' + item
+								.order_product_id
 						})
 					}
 				}).catch(() => {
@@ -203,13 +257,15 @@
 				})
 				// #endif
 				// #ifdef H5 || APP-PLUS
-				if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){					
+				if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
 					uni.navigateTo({
-						url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
+						url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item
+							.order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id
+						url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this
+							.orderData.order_type + '&ids=' + item.order_product_id
 					})
 				}
 				// #endif
@@ -222,83 +278,101 @@
 	.orderGoods {
 		background-color: #fff;
 	}
+
 	.p-color {
 		color: var(--view-priceColor);
 	}
-	.t-color{
+
+	.t-color {
 		color: var(--view-theme);
 	}
-	.svip-img{
+
+	.svip-img {
 		width: 65rpx;
 		height: 28rpx;
 		margin: 4rpx 0 0 4rpx;
 	}
-	.title{
+
+	.title {
 		height: 86rpx;
 		position: relative;
 		padding: 0 30rpx;
-		&::after{
+
+		&::after {
 			content: "";
 			width: 750rpx;
-			border-bottom: 2rpx dotted #D8D8D8; 
+			border-bottom: 2rpx dotted #D8D8D8;
 			position: absolute;
 			bottom: 0;
 			left: 0;
 		}
-		.item-status{
+
+		.item-status {
 			color: #999999;
 			font-size: 30rpx;
-			&.status0{
+
+			&.status0 {
 				color: #2291F8;
 			}
 		}
-		.item-date{
+
+		.item-date {
 			color: #666666;
 			font-size: 28rpx;
 		}
-		}
-	.right-btn-box{
+	}
+
+	.right-btn-box {
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
-		&.event_box{
+
+		&.event_box {
 			position: static;
 		}
-		.btn-item{
+
+		.btn-item {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			width:140rpx;
-			height:46rpx;
+			width: 140rpx;
+			height: 46rpx;
 			margin-left: 10rpx;
-			border:1px solid rgba(187,187,187,1);
-			border-radius:23rpx;
+			border: 1px solid rgba(187, 187, 187, 1);
+			border-radius: 23rpx;
 			font-size: 24rpx;
 			color: #282828;
-			&.on{
-				background:rgba(220,220,220,1);
-				border-color: rgba(220,220,220,1);
+
+			&.on {
+				background: rgba(220, 220, 220, 1);
+				border-color: rgba(220, 220, 220, 1);
 			}
-			&.err{
-				background:rgba(247,247,247,1);
-				border-color: rgba(247,247,247,1);
+
+			&.err {
+				background: rgba(247, 247, 247, 1);
+				border-color: rgba(247, 247, 247, 1);
 				color: #AAAAAA;
 			}
 		}
 	}
-	.event_bg{
+
+	.event_bg {
 		background: #FF7F00;
 	}
-	.event_color{
+
+	.event_color {
 		color: #FF7F00;
 	}
-	.presell_item{
+
+	.presell_item {
 		height: auto;
 		padding-bottom: 15rpx;
 	}
-	.event_progress{
+
+	.event_progress {
 		margin-top: 20rpx;
 		background: #fff;
+
 		.progress_name {
 			padding-left: 30rpx;
 			height: 60rpx;
@@ -307,7 +381,8 @@
 			font-weight: bold;
 			position: relative;
 			color: var(--view-theme);
-			&::before{
+
+			&::before {
 				content: "";
 				display: inline-block;
 				width: 5rpx;
@@ -318,43 +393,49 @@
 				left: 0;
 			}
 		}
-		.align_right{
+
+		.align_right {
 			float: right;
 			font-weight: bold;
 		}
-		.progress_price{
+
+		.progress_price {
 			padding: 20rpx 30rpx;
 			color: #999999;
 			font-size: 22rpx;
 		}
-		.progress_pay{
+
+		.progress_pay {
 			padding: 25rpx 30rpx;
 			background: var(--view-minorColor);
 			font-size: 26rpx;
 			color: #282828;
 		}
 	}
-	.event_name{
+
+	.event_name {
 		display: inline-block;
 		margin-right: 9rpx;
 		color: #fff;
 		font-size: 20rpx;
 		padding: 0 8rpx;
-		line-height: 30rpx;	
+		line-height: 30rpx;
 		text-align: center;
-		border-radius: 6rpx;						
+		border-radius: 6rpx;
 	}
-	.event_ship{
+
+	.event_ship {
 		font-size: 20rpx;
-		margin-top: 10rpx;						
+		margin-top: 10rpx;
 	}
-	.goodWrapper.item1{
-		&::after{
+
+	.goodWrapper.item1 {
+		&::after {
 			content: "";
 			display: block;
 			width: 750rpx;
 			height: 14rpx;
 			background: #F0F0F0;
-		}			
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue
new file mode 100644
index 0000000..e1b31f6
--- /dev/null
+++ b/components/realselist/realselist.vue
@@ -0,0 +1,621 @@
+<template>
+	<view class="containers" :style="viewColor">
+		<view class="header">
+
+			<view class="search">
+				<text class="iconfont icon-xiazai5"></text>
+				<input type="text" placeholder="请输入商品名称" v-model="searchVal" @input="setValue" confirm-type="search"
+					@confirm="searchBut()" placeholder-class='placeholder'>
+			</view>
+
+			<view class="iconclose" @click="close">
+				X
+			</view>
+		</view>
+		<view class="main">
+			<scroll-view scroll-y="true" @touchmove.stop>
+				<block>
+					<view v-if="bought.length" @touchmove="onTouchmove" id="goods" class="goods">
+						<view class="picTxt acea-row" v-for="(item, i) in bought" :key="i">
+							<view class="checkbox">
+								<text @click.stop="goodsCheck(item)" v-if="item.check"
+									class="iconfont icon-xuanzhong1"></text>
+								<text @click.stop="goodsCheck(item)" v-else
+									:class="checkedArr.length >=5 ? 'disabled': ''"
+									class="iconfont icon-weixuanzhong"></text>
+							</view>
+							<view class='pictrue'>
+								<image :src='item.image'></image>
+							</view>
+
+							<view class='text'>
+								<view class='line2 name'>{{item.store_name}}</view>
+
+
+								<view class="picTxt_one" v-if="item.attrValue.length>0">
+									<picker class="slecte" v-if="item.attrValue.length>1"
+										@change="bindPickerChange($event,item.attrValue,i)" :value="index"
+										:range="item.attrValue" :range-key="'sku'">
+										<view class="uni-input">{{item.attrValue[index].sku}}</view>
+									</picker>
+
+									<view class="" style="margin-top: 10rpx;">
+										库存:{{item.attrValue[index].stock}}
+									</view>
+								</view>
+
+
+
+
+
+							</view>
+
+
+							<view class="picTxt_price">
+								<view class="price">
+									<span>委托价格</span>
+									<input type="text" :value="item.price" placeholder="输入出售价格"
+										@input="producrprice($event,i,item)" adjust-position=""
+										placeholder-style="color: #CCCCCC;" />
+								</view>
+								<view class="price_num">
+									<span>委托数量</span>
+									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
+										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
+									</subtractive>
+
+									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
+										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
+										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
+										@eventChange="numberChange($event,i)"></subtractive>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-else class="empty">
+						<image src="/static/images/no_thing.png"></image>
+						<text>暂无内容哦~</text>
+					</view>
+				</block>
+			</scroll-view>
+			<view class="foot_bar">
+				<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Loading from '@/components/Loading/index.vue';
+	import subtractive from '@/components/subtractive/subtractive.vue';
+
+	import {
+		getCommunitygetOrderList
+	} from "@/api/trading-floor";
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
+		props: {
+			checkedObj: {
+				type: Array,
+				default: []
+			}
+		},
+		computed: mapGetters(['viewColor']),
+		components: {
+			Loading,
+			subtractive
+		},
+		data() {
+			return {
+				isActive: 0,
+				loadedb: false,
+				loadingb: false,
+				loadedc: false,
+				loadingc: false,
+				loadeds: false,
+				loadings: false,
+				whereb: {
+					page: 1,
+					limit: 10,
+					keyword: '',
+				},
+				peicenumber: 0,
+
+				searchVal: "",
+				checked: [],
+				list: [],
+
+				bought: [],
+
+				checkedArr: [],
+				aryys: [],
+				// picker下拉数据源
+				storageCustomList: [{
+					CustGoodsCode: "TEST001",
+					CustGoodsName: "测试货主001",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST002",
+					CustGoodsName: "测试货主002",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}, {
+					CustGoodsCode: "TEST003",
+					CustGoodsName: "测试货主003",
+					IfBoxId: 0,
+					IfProductId: 0,
+				}],
+				index: 0,
+				pickerData: '请选择',
+				itstock: '',
+
+			};
+		},
+		watch: {
+			checkedObj: {
+				handler(n) {
+
+					this.checkedArr = n
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.checkedArr = this.checkedObj
+			this.aryys = this.checkedObj
+			this.getBounht();
+		},
+		methods: {
+			//价格
+			producrprice(e, i, item) {
+				this.bought[i].price = e.detail.value
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+			},
+			incrementTotal(e, i, item) {
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+
+
+			},
+			// picker修改事件
+			bindPickerChange: function(e, storage, num) {
+				this.bought[num].attrValue[this.index].sku = storage[e.detail.value].sku
+				this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
+				this.bought[num].product_attr_unique = storage[e.detail.value].unique
+				this.pickerData = storage[this.index] // 这里就是选中的对象
+
+				if (this.bought[num].attrValue[this.index].stock == 0) {
+					this.$util.Tips({
+						title: '库存不足'
+					});
+				}
+			},
+
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			},
+			numberChange(data, i) {
+				this.peicenumber = data.number;
+				this.bought[i].number = data.number
+
+			},
+
+			tabs(index) {
+				this.isActive = index
+				this.$set(this.whereb, 'keyword', '');
+				this.searchVal = ''
+				this.searchBut()
+			},
+			onTouchmove(e) {
+				if (this.loadendb) return;
+				if (this.loadingb) return;
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#goods').boundingClientRect(data => {
+					if (data.bottom < 1500 && data.top < 0) {
+						this.getBounht();
+					}
+				}).exec();
+
+				// 模拟触底刷新
+			},
+
+
+			setValue: function(event) {
+				this.$set(this.whereb, 'keyword', event.detail.value);
+				if (!event.detail.value) {
+					this.whereb.page = 1
+					this.loadedb = false
+					this.getBounht()
+				}
+
+			},
+			searchBut() {
+				this.bought = []
+				this.whereb.page = 1
+				this.loadedb = false
+				this.getBounht()
+			},
+			getBounht() {
+				var that = this;
+				// console.log('1111111', that.loadingb, that.loadedb)
+				if (that.loadingb || that.loadedb) return;
+				that.loadingb = true;
+
+				getCommunitygetOrderList(that.whereb).then(
+					res => {
+						that.loadingb = false;
+						that.loadedb = res.data.list.length < that.whereb.limit;
+						that.bought.push.apply(that.bought, res.data.list);
+						that.whereb.page = that.whereb.page + 1;
+						that.getInitchecked(that.bought);
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+
+
+			/*获取初始化选中的数据*/
+			getInitchecked(arr) {
+				let that = this;
+				arr.forEach((item, index) => {
+					that.$set(item, 'check', false);
+					that.checkedArr.forEach((val, i) => {
+						if (item.product_id == val.product_id) {
+							that.$set(item, 'check', true);
+							that.$set(item, 'number', val.number);
+							that.$set(item, 'price', val.price);
+						}
+					})
+				})
+
+			},
+			/*已选中的商品打钩*/
+			getCheckedGoods() {
+				this.checked = []
+				this.checkedArr.forEach((item, index) => {
+					this.checkedArr.push(item)
+
+
+				})
+			},
+			/*点击选中与否*/
+			goodsCheck(item) {
+				this.$set(item, 'check', !item.check);
+				if (item.check) {
+					if (this.peicenumber == 0) {
+						item.number = 1
+					}
+					if (!item.product_attr_unique) {
+						item.product_attr_unique = item.attrValue[0].unique
+					}
+					this.checkedArr.push(item)
+					this.arrayUnique(this.checkedArr, 'product_id')
+				} else {
+					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
+
+				}
+			},
+			//去重
+			arrayUnique(arr, name) {
+				let hash = {}
+				const result = arr.reduce((acc, cru, index) => {
+					if (!hash[cru[name]]) {
+						hash[cru[name]] = {
+							index: acc.length
+						}
+						acc.push(cru)
+					} else {
+						console.log(acc, hash[cru[name]])
+						acc.splice(hash[cru[name]]['index'], 1, cru)
+					}
+
+
+					return acc;
+
+				}, [])
+				this.checkedArr = result
+
+
+			},
+			/*确定提交*/
+			submit() {
+
+				this.$emit('getProduct', this.checkedArr);
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.containers {
+		background: #ffffff;
+		border-radius: 16rpx 16rpx 0 0;
+		padding: 40rpx 0;
+		position: relative;
+
+		.header {
+			position: relative;
+			padding: 0 30rpx;
+
+			.title {
+				width: 100%;
+				text-align: center;
+
+				text {
+					position: relative;
+					margin: 0 50rpx;
+					color: #999999;
+					font-size: 30rpx;
+
+					&.on {
+						color: #333333;
+						font-weight: bold;
+						font-size: 34rpx;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							width: 40rpx;
+							height: 5rpx;
+							background: var(--view-theme);
+							position: absolute;
+							bottom: -10rpx;
+							left: 10rpx;
+						}
+					}
+				}
+			}
+
+			.iconclose {
+				width: 44rpx;
+				height: 44rpx;
+				line-height: 44rpx;
+				border: 2rpx solid #fff;
+				border-radius: 50%;
+				text-align: center;
+				color: #fff;
+				position: absolute;
+				top: -150rpx;
+				right: 30rpx;
+			}
+
+			.search {
+				margin-top: 44rpx;
+				background: #F5F5F5;
+				border-radius: 30rpx;
+				padding: 12rpx 30rpx 12rpx 66rpx;
+				position: relative;
+
+				.iconfont {
+					font-size: 24rpx;
+					color: #939393;
+					position: absolute;
+					top: 20rpx;
+					left: 30rpx;
+				}
+
+				.placeholder {
+					color: #999999;
+					font-size: 26rpx;
+				}
+			}
+
+			.sub_title {
+				color: #282828;
+				font-size: 26rpx;
+				margin-top: 30rpx;
+			}
+
+			.iconfont {
+				color: #8A8A8A;
+				font-size: 28rpx;
+				position: absolute;
+				top: 0;
+				right: 30rpx;
+			}
+		}
+
+		scroll-view {
+			height: 650rpx;
+		}
+
+		.main {
+			height: 650rpx;
+			margin: 40rpx 0 80rpx;
+			padding: 0 30rpx;
+		}
+	}
+
+	.picTxt {
+		width: 100%;
+		padding: 25rpx 0;
+		position: relative;
+		align-items: center;
+		justify-content: space-between;
+
+		border-top: 2rpx solid #E7E6E4;
+
+		.picTxt_one {
+			white-space: nowrap;
+			overflow: hidden;
+		}
+
+		.picTxt_one {
+			display: flex;
+			margin-top: 20rpx;
+
+
+			.slecte {
+				margin-right: 30rpx;
+				width: 280rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #959595;
+				background-color: #E7E6E4;
+				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				white-space: nowrap;
+				overflow: hidden;
+
+			}
+		}
+
+
+		.picTxt_price {
+			display: flex;
+			margin-top: 37rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+
+			.price {
+				display: flex;
+				margin-right: 15rpx;
+
+				input {
+					width: 210rpx;
+					text-align: center;
+					height: 70rpx;
+					background: #F5F5F5;
+					border-radius: 7rpx 7rpx 7rpx 7rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+
+					margin-left: 20rpx;
+
+
+				}
+			}
+
+			.price_num {
+				display: flex;
+
+
+			}
+		}
+
+		.checkbox {
+			margin-right: 30rpx;
+
+			.iconfont {
+				font-size: 38rpx;
+				color: #CCCCCC;
+			}
+
+			.icon-xuanzhong1 {
+				color: var(--view-theme);
+			}
+
+			.disabled {
+				pointer-events: none;
+				cursor: default;
+				opacity: 0.3;
+			}
+		}
+
+		.pictrue {
+			width: 160rpx;
+			height: 160rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 8rpx;
+			}
+		}
+
+		.text {
+			width: 430rpx;
+			margin-left: 30rpx;
+			font-size: 28rpx;
+			color: #282828;
+			position: relative;
+			height: 160rpx;
+
+			.name {
+				color: #282828;
+				font-size: 28rpx;
+			}
+
+			.money {
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				color: var(--view-priceColor);
+				font-size: 22rpx;
+				font-weight: bold;
+
+				text {
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+
+	.foot_bar {
+		width: 100%;
+		position: fixed;
+		// bottom: 54px;
+		left: 0;
+		padding: 20rpx 0;
+		z-index: 5;
+
+		.confirm_btn {
+			width: 710rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			color: #ffffff;
+			text-align: center;
+			font-size: 32rpx;
+			background: var(--view-theme);
+			border-radius: 43rpx;
+			margin: 0 auto;
+		}
+	}
+
+	.empty {
+		margin: 130rpx 0 150rpx;
+		text-align: center;
+
+		image,
+		uni-image {
+			display: inline-block;
+			width: 414rpx;
+			height: 305rpx;
+		}
+
+		text {
+			display: block;
+			color: #999999;
+			font-size: 26rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
index 3b921a9..d5aac0b 100644
--- a/components/shoppinglist/shoppinglist.vue
+++ b/components/shoppinglist/shoppinglist.vue
@@ -62,12 +62,13 @@
 									<span>出售数量</span>
 									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
 										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
-										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)"  >
+										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
 									</subtractive>
 
 									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
 										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
-										:isMin="true" index="11" @eventChange="numberChange($event,i)"  ></subtractive>
+										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
+										@eventChange="numberChange($event,i)"></subtractive>
 								</view>
 							</view>
 						</view>
@@ -130,7 +131,7 @@
 				bought: [],
 
 				checkedArr: [],
-
+				aryys: [],
 				// picker下拉数据源
 				storageCustomList: [{
 					CustGoodsCode: "TEST001",
@@ -165,14 +166,35 @@
 		},
 		mounted() {
 			this.checkedArr = this.checkedObj
+			this.aryys = this.checkedObj
 			this.getBounht();
 		},
 		methods: {
 			//价格
-			producrprice(e, i,item) {
-				
+			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
-                this.$set(item, 'check',false);
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+			},
+			incrementTotal(e, i, item) {
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+
+
 			},
 			// picker修改事件
 			bindPickerChange: function(e, storage, num) {
@@ -220,15 +242,22 @@
 
 			setValue: function(event) {
 				this.$set(this.whereb, 'keyword', event.detail.value);
+				if (!event.detail.value) {
+					this.whereb.page = 1
+					this.loadedb = false
+					this.getBounht()
+				}
 
 			},
 			searchBut() {
-				this.whereb.page = this.wherec.page = this.wheres.page =
-					this.bought = []
-				this.isActive == 0 ? this.getBounht() : ''
+				this.bought = []
+				this.whereb.page = 1
+				this.loadedb = false
+				this.getBounht()
 			},
 			getBounht() {
 				var that = this;
+				// console.log('1111111', that.loadingb, that.loadedb)
 				if (that.loadingb || that.loadedb) return;
 				that.loadingb = true;
 
@@ -268,7 +297,9 @@
 			getCheckedGoods() {
 				this.checked = []
 				this.checkedArr.forEach((item, index) => {
-					this.check.push(item)
+					this.checkedArr.push(item)
+
+
 				})
 			},
 			/*点击选中与否*/
@@ -278,22 +309,41 @@
 					if (this.peicenumber == 0) {
 						item.number = 1
 					}
-
 					if (!item.product_attr_unique) {
 						item.product_attr_unique = item.attrValue[0].unique
 					}
 					this.checkedArr.push(item)
-
+					this.arrayUnique(this.checkedArr, 'product_id')
 				} else {
-					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item
-						.spu_id == (
-							itemn.spu && itemn.spu.spu_id)))), 1)
+					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
 
 				}
+			},
+			//去重
+			arrayUnique(arr, name) {
+				let hash = {}
+				const result = arr.reduce((acc, cru, index) => {
+					if (!hash[cru[name]]) {
+						hash[cru[name]] = {
+							index: acc.length
+						}
+						acc.push(cru)
+					} else {
+						console.log(acc, hash[cru[name]])
+						acc.splice(hash[cru[name]]['index'], 1, cru)
+					}
+
+
+					return acc;
+
+				}, [])
+				this.checkedArr = result
+
+
 			},
 			/*确定提交*/
 			submit() {
-			
+
 				this.$emit('getProduct', this.checkedArr);
 
 			},
diff --git a/components/subtractive/subtractive.vue b/components/subtractive/subtractive.vue
index 8ee625e..153637f 100644
--- a/components/subtractive/subtractive.vue
+++ b/components/subtractive/subtractive.vue
@@ -114,6 +114,7 @@
 					return;
 				}
 				this.inputValue = newValue / scale;
+				this.$emit('increment',this.inputValue)
 			},
 			_getDecimalScale() {
 				let scale = 1;
diff --git a/pages.json b/pages.json
index 40e01e4..7a0f22d 100644
--- a/pages.json
+++ b/pages.json
@@ -705,57 +705,65 @@
 			"root": "pages/releaseManagement",
 			"name": "releaseManagement",
 			"pages": [{
-				"path": "/index",
+				"path": "index",
 				"style": {
 					"navigationBarTitleText": "发布管理",
 					"enablePullDownRefresh": false
 				}
 
-			}]
+			},
+				{
+					"path": "details/index",
+					"style": {
+						"navigationBarTitleText": "发起委托",
+						"enablePullDownRefresh": false
+					}
+
+				}]
 		},
 		{
 			"root": "pages/commissionedSales",
 			"name": "commissionedSales",
 			"pages": [{
-				"path": "index/index",
-				"style": {
-					"navigationBarTitleText": "委托销售",
-					"enablePullDownRefresh": false
-				}
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "委托销售",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "initiateDelegation/index",
+					"style": {
+						"navigationBarTitleText": "发起委托",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "addDelegation/index",
+					"style": {
+						"navigationBarTitleText": "新增委托",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "receivedCommission/index",
+					"style": {
+						"navigationBarTitleText": "收到委托",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "delegation_details/index",
+					"style": {
+						"navigationBarTitleText": "委托销售详情",
+						"enablePullDownRefresh": false
+					}
 
-			},
-			{
-				"path": "initiateDelegation/index",
-				"style": {
-					"navigationBarTitleText": "发起委托",
-					"enablePullDownRefresh": false
 				}
-			
-			},
-			{
-				"path": "addDelegation/index",
-				"style": {
-					"navigationBarTitleText": "新增委托",
-					"enablePullDownRefresh": false
-				}
-			
-			},
-			{
-				"path": "receivedCommission/index",
-				"style": {
-					"navigationBarTitleText": "收到委托",
-					"enablePullDownRefresh": false
-				}
-			
-			},
-			{
-				"path": "delegation_details/index",
-				"style": {
-					"navigationBarTitleText": "委托销售详情",
-					"enablePullDownRefresh": false
-				}
-			
-			}
 			]
 		},
 		{
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index c51bfad..6c792e1 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -164,10 +164,11 @@
 			<view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0" @click="offlinePay">
 				确认付款
 			</view>
-			<view class="bnt delivery" @click="toPostagequ(orderInfo)">
+			
+			<view class="bnt delivery" @click="toPostagequ(orderInfo)"  v-if="orderInfo.status == 0&&orderInfo.activity_type==0">
 				收件码
 			</view>
-			<navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0" :url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
+			<navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0&&orderInfo.activity_type==98" :url="'/pages/admin/delivery/index?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
 			<view class="bnt delivery" v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1" @click="goCancellation">去核销</view>
 		</view>
 		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 7746811..eaf37f8 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -18,7 +18,11 @@
 						<view class="item-one">
 							委托周期
 						</view>
-						<e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select>
+						<view class="" @click="calendar">
+
+							<input type="number" v-model="date" />
+						</view>
+						<!-- <e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> -->
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})
@@ -34,42 +38,21 @@
 							</view>
 						</view>
 					</view>
-					<view class="content_center-one">
+					<view class="content_center-one"   v-for="(item,i) in productList" :key="i">
 						<view class="center-one">
 							<view class="center-one-img">
-								<image src="../../annex/static/left.png" mode=""></image>
+								<image :src="item.image" mode=""></image>
 							</view>
 							<view class="center-one-txt">
 								<view class="one-txta">
-									良品铺子肉松饼1000g/箱 面...
+									{{item.store_name}}
 								</view>
 								<view class="one-txtb">
 									<view class="">
-										委托价:¥<span>34.90</span>
+										委托价:¥<span>{{item.price}}</span>
 									</view>
 									<view class="">
-										数量:100个
-									</view>
-								</view>
-							</view>
-						</view>
-
-					</view>
-					<view class="content_center-one">
-						<view class="center-one">
-							<view class="center-one-img">
-								<image src="../../annex/static/left.png" mode=""></image>
-							</view>
-							<view class="center-one-txt">
-								<view class="one-txta">
-									良品铺子肉松饼1000g/箱 面...
-								</view>
-								<view class="one-txtb">
-									<view class="">
-										委托价:¥<span>34.90</span>
-									</view>
-									<view class="">
-										数量:100个
+										数量:{{item.number}}
 									</view>
 								</view>
 							</view>
@@ -81,7 +64,9 @@
 			</view>
 		</form>
 
-
+		<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
+			:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
+			:showMonth="info.showMonth" @close="close" />
 
 
 		<!-- 提到的宝贝弹窗 -->
@@ -91,17 +76,15 @@
 
 
 
-
 	</view>
 </template>
 
 <script>
-	import associated from '@/components/associated.vue';
+	import associated from '@/components/realselist/realselist.vue';
 	import eselect from '@/components/e-select/e-select.vue';
-
+	// import {} from '@/api/sale.js'
 	export default {
 		components: {
-
 			associated,
 			eselect
 		},
@@ -109,7 +92,6 @@
 			return {
 				value1: 1,
 				value2: "",
-
 				options1: [{
 					text: "Shenzhen1",
 					value: 1
@@ -123,9 +105,17 @@
 					text: "Shenzhen3",
 					value: 3
 				}],
-
+				date: 1,
 				productList: [],
-
+				info: {
+					startDate: '',
+					endDate: '',
+					lunar: false,
+					range: true,
+					insert: false,
+					selected: [],
+					showMonth: false
+				},
 			};
 		},
 		computed: {
@@ -140,6 +130,40 @@
 
 		methods: {
 
+			// 日历确定
+			confirm(e) {
+				
+				let self = this
+				if (e.range.after && e.range.before) {
+					let star = new Date(e.range.after).getTime()
+					let stop = new Date(e.range.before).getTime()
+					let arr = stop - star
+					this.date = Math.floor(arr / (24 * 3600 * 1000));
+					// console.log(days)
+					if(this.date<0){
+						this.date=this.date*-1
+					}
+				}
+			},
+			calendar() {
+				this.$refs.calendar.open()
+			},
+			//关闭商品弹窗
+			close() {
+				this.$refs.associated.close()
+			},
+			//打开商品弹窗
+			addProduct() {
+				this.$refs.associated.open()
+			},
+			//获取商品信息
+			getProduct(data) {
+				console.log(data)
+			},
+			//提交
+			formSubmit(e) {
+				console.log(e)
+			}
 		}
 	}
 </script>
@@ -157,7 +181,7 @@
 
 		.content_center-one {
 			display: flex;
-			padding: 0 28rpx;
+
 
 			.center-one {
 				margin-top: 32rpx;
@@ -391,6 +415,7 @@
 		font-weight: 500;
 		color: #FFFFFF;
 	}
+
 	.release_btn {
 		margin-top: 100rpx;
 	}
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index df12537..bf4a44a 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -1,6 +1,17 @@
 <template>
 	<view class="content">
 		<view class="content_top">
+			<view class="content_top-one">
+				<image src="@/static/images/dong.gif" mode="aspectFill"></image>
+			</view>
+			<view class="content_top-two">
+				<view class="top-two-one">
+					待评价
+				</view>
+				<view class="top-two-two">
+					2020-07-07 14:14:14
+				</view>
+			</view>
 		</view>
 		<view class="content_center">
 			<view class="content_center-one">
@@ -78,6 +89,14 @@
 						通滩镇镇街店铺
 					</view>
 				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						结算利息:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
 				<view class="center-two">
 					<view class="center-twoa">
 						状态:
@@ -99,7 +118,7 @@
 						拒绝原因:
 					</view>
 					<view class="center-twob">
-						通滩镇镇街店铺
+						通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺
 					</view>
 				</view>
 			</view>
@@ -133,16 +152,50 @@
 </template>
 
 <script>
+		import {} from '@/api/sale.js'
 </script>
 
 <style lang="scss">
-	.content{
+	.content {
 		position: relative;
 	}
+
 	.content_top {
 		height: 151rpx;
 		background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
-		
+		display: flex;
+		padding-top: 21rpx;
+
+		.content_top-one {
+			width: 107rpx;
+			height: 107rpx;
+			margin-left: 28rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.content_top-two {
+			margin-left: 25rpx;
+
+			.top-two-one {
+				font-size: 35rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+
+			.top-two-two {
+				font-size: 28rpx;
+				font-family: SF Pro Display-Light, SF Pro Display;
+				font-weight: 300;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+		}
 
 	}
 
@@ -217,6 +270,10 @@
 				}
 
 				.center-twob {
+					width: 360rpx;
+					text-align: right;
+					border: 1px solid;
+					word-wrap: break-word;
 					font-size: 32rpx;
 					font-family: PingFang SC;
 					font-weight: 400;
@@ -273,10 +330,8 @@
 		color: #FFFFFF;
 		position: absolute;
 		left: 50%;
-		margin-left:-347rpx;
+		margin-left: -347rpx;
 		position: fixed;
 		bottom: 100rpx;
 	}
-
-
 </style>
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index ce2d100..1f8eaf2 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -6,7 +6,7 @@
 			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
 		</view>
 		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
-		<view class="content-content" v-for="(item,i) in list" :key="i" >
+		<view class="content-content" v-for="(item,i) in list" :key="i">
 
 			<view class="content-one">
 				<view class="content-one-img">
@@ -35,7 +35,7 @@
 						处理
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail">
 						详情
 					</view>
 				</view>
@@ -90,7 +90,15 @@
 				</view>
 			</view>
 		</view>
+		<view class="adddelegation"  @click="addDelegation">
 
+			<view class="adddelegation-one">
+				<image src="@/static/images/delegation.png" mode=""></image>
+			</view>
+			<view class="adddelegation-two">
+				新增委托
+			</view>
+		</view>
 		<view v-if="orderList.length == 0 && this.where.page > 1">
 			<emptyPage title="暂无订单~"></emptyPage>
 		</view>
@@ -235,6 +243,7 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
+		import {} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
@@ -296,7 +305,7 @@
 		onLoad() {
 			this.tabTitle = this.tabs[0].name
 			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
-			console.log(this.tabs[0])
+			// console.log(this.tabs[0])
 
 		},
 		mounted() {
@@ -308,26 +317,36 @@
 				// 	url: '/pages/commissionedSales/delegation_details/index'
 				// })
 			},
+			
+			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
 			},
+			//新增委托
+			addDelegation(){
+				uni.navigateTo({
+					url:'/pages/commissionedSales/addDelegation/index'
+				})
+			},
 			//管理弹窗
 			close() {
-				console.log('1111111')
 				this.$refs.bindmobile.close()
 				this.$refs.bindmobile1.close()
 				this.$refs.bindmobile2.close()
 				this.$refs.bindmobile3.close()
 			},
+			//详情
+
+			detail() {
+				uni.navigateTo({
+					url: '/pages/commissionedSales/delegation_details/index'
+				})
+			},
 			// 待处理
 			soldEdit() {
 
 				this.$refs.bindmobile.open()
-
-
-
-
 			},
 			//已接受
 			accepted() {
@@ -359,10 +378,56 @@
 </script>
 
 <style lang="scss" scoped>
+	.content {
+		height: 100vh;
+		position: relative;
+		
+	}
+
 	.content_top {
 		background-color: #FFFFFF;
 	}
 
+	.adddelegation {
+		width: 694rpx;
+		height: 95rpx;
+
+
+		background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
+		box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
+		border-radius: 47rpx 47rpx 47rpx 47rpx;
+		opacity: 1;
+		display: flex;
+		position: fixed;
+		position: absolute;
+		bottom: 84rpx;
+		left: 50%;
+		margin-left: -347rpx;
+
+		.adddelegation-one {
+			width: 50rpx;
+			margin-right: 30rpx;
+			height: 50rpx;
+			margin-left: 242rpx;
+
+			margin-top: 21rpx;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+		}
+
+		.adddelegation-two {
+			font-size: 32rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 25rpx;
+		}
+
+
+	}
 
 	.content_top {
 
@@ -558,12 +623,11 @@
 				}
 
 				span {
-					width: 0px;
+					width: 1px;
 					height: 30rpx;
 					opacity: 1;
-
-					margin-top: 10rpx;
-					border: 2rpx solid #CCCCCC;
+					margin-top: 8rpx;
+					background-color: #cccccc;
 
 				}
 
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index dbc2ac8..2498ce9 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -22,14 +22,10 @@
 				</view>
 			</view>
 
-
-
 			<view class="content-two_one" v-if="item.type==1">
-
 				<view class="content-two-edita" @click="soldEdit">
 					待处理
 				</view>
-
 				<view class="contentgn">
 					<view class="contentgn_a">
 						处理
@@ -235,6 +231,7 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
+		import {} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
@@ -362,13 +359,9 @@
 	.content_top {
 		background-color: #FFFFFF;
 	}
-
-
 	.content_top {
-
 		width: 100%;
 	}
-
 	.content-content {
 
 		margin-top: 21rpx;
@@ -579,10 +572,8 @@
 
 
 	}
-
 	.entrust {
 
-
 		.entrust_close {
 			width: 44rpx;
 			height: 44rpx;
@@ -818,7 +809,5 @@
 			}
 
 		}
-
-
 	}
 </style>
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index e96c03d..0200a53 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -127,7 +127,8 @@
 								</image>
 								<text class="text">交易大厅</text>
 							</view>
-							<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
+							<view class="examine"
+								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
 								</image>
 								<text class="text">委托销售</text>
@@ -150,7 +151,8 @@
 					<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
 				</view>
 			</view>
-			<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
+
+			<view class="business com" v-if="userInfoData.mer_info.type_id!=null&&userInfoData.mer_info.type_id === 11">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">里海云仓</view>
@@ -220,6 +222,9 @@
 					</view>
 				</view>
 			</view>
+
+
+
 		</block>
 		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
@@ -228,11 +233,16 @@
         </view>
       </template>
     </m-tabbar> -->
+		<view class=""  v-if='jurisdiction==false&&isShow==false'>
+			<emptyPage title="暂无信息"></emptyPage>
+		</view>
+
 	</view>
 </template>
 
 <script>
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import emptyPage from '@/components/emptyPage.vue';
 	import zbpSwiper from '@/components/zbpSwiper'
 	import {
 		mapState,
@@ -259,7 +269,8 @@
 	export default {
 		components: {
 			mTabbar,
-			zbpSwiper
+			zbpSwiper,
+			emptyPage
 		},
 		data() {
 			return {
@@ -313,7 +324,7 @@
 						this.isShow = true
 						this.mer_id = res.data.service.mer_id
 					}
-					
+
 					if (!res.data.mer_info) {
 						that.$set(this, 'jurisdiction', false);
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b11bf32..77bc464 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,6 +10,7 @@
 			<view class="">
 
 			</view>
+			
 			<view class="goods">
 				<block v-for="(item,index) in cateGoods" :key="index">
 					<view class="goods_item" @click="gogogo(item)">
diff --git a/pages/nongKe/supply_chain/purchase_control.vue b/pages/nongKe/supply_chain/purchase_control.vue
index 10b28cb..78c7c63 100644
--- a/pages/nongKe/supply_chain/purchase_control.vue
+++ b/pages/nongKe/supply_chain/purchase_control.vue
@@ -253,8 +253,8 @@
                 <view class="bnt cancelBnt" v-if="item.order_type===1" @click="location(item.order_id)">
                   <text class="iconfont icon-weizhi"></text>查看位置
                 </view>
-                <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
-                  @click.stop='applyInvoice(item.order_id)'>申请开票</view>
+               <!-- <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>
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index e835ad6..ac5a559 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -133,13 +133,15 @@
 				</view>
 				<block v-if="cartInfo.length>0">
 
-					<orderGoods :orderData='orderInfo' :evaluate='orderInfo.status'
+					<orderGoods :orderData='orderInfo' :evaluate='orderInfo.order_status'
 						:activityType='orderInfo.activity_type' :orderId="order_id" :cartInfo="cartInfo" :jump="true">
 
 					</orderGoods>
+
 					<block
 						v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
 						v-for="(item,index) in orderInfo.takeOrderList" :key="index">
+
 						<orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type'
 							:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
 					</block>
@@ -277,7 +279,7 @@
 			<view class="content-clip"></view>
 			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
 				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
-				<view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view>
+				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
 				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
 					class=" acea-row row-right row-middle">
 					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
@@ -303,8 +305,9 @@
 					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
 					</navigator>
-					<!-- <view class='bnt b-color' @tap='confirmOrder(orderInfo)'>取件码</view> -->
-					<view class='bnt b-color' @tap='confirmOrder(orderInfo)'>已收货</view>
+					<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==98">确认收货
+					</view>
+					<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-else>取件码</view>
 				</block>
 				<block v-if="orderInfo.status == 2">
 					<view class="bnt cancel" @click="allRefund"
@@ -821,6 +824,7 @@
 				});
 				getOrderDetail(that.order_id).then(res => {
 					uni.hideLoading();
+
 					that.$set(that, 'orderInfo', res.data);
 					that.orderInfo.take = res.data.take;
 					that.$set(that, 'cartInfo', res.data.orderProduct);
@@ -915,33 +919,38 @@
 
 			},
 			queding() {
-				// uni.showModal({
-				// 	title: '取件码',
-				// 	content: item.logistics_code,
-				// 	success: function(res) {
-				// 		if (res.confirm) {
-				// 			// console.log('用户点击确定');
-				// 		} else if (res.cancel) {
-				// 			// console.log('用户点击取消');
-				// 		}
-				// 	}
-				// })
-				let that = this;
-				orderTake(that.order_id).then(res => {
-					this.receivingshow = false
-					return that.$util.Tips({
-						title: '成功收货',
-						icon: 'success'
-					}, function() {
+				if (orderInfo.activity_type == 98) {
+					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
+						});
+					})
+				} else {
+					uni.showModal({
+						title: '取件码',
+						content: item.logistics_code,
+						success: function(res) {
+							if (res.confirm) {
+								// console.log('用户点击确定');
+							} else if (res.cancel) {
+								// console.log('用户点击取消');
+							}
+						}
+					})
+				}
+
 
-						that.getOrderInfo();
-					});
-				}).catch(err => {
-					this.receivingshow = false
-					return that.$util.Tips({
-						title: err
-					});
-				})
 			},
 			/**
 			 *
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index c47d86e..93a03bc 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -125,7 +125,9 @@
 							</view>
 
 						</view>
+					
 					</view>
+				
 				</view>
 				<div class="goodCall" @click="goGoodCall(item)">
 					<span class="iconfont icon-kefu"></span><span style="font-size: 28rpx;">联系客服</span>
@@ -358,8 +360,8 @@
 				yue_pay_status: 0
 			},
 			mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor', ])),
-		onLoad: function() {
-			
+		onLoad: function(options) {
+			console.log('11111111')
 			this.credit_buy = options.credit_buy
 			console.log(options.product_type)
 			if (options.product_type) {
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 71d610f..b69b5b2 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -224,7 +224,7 @@
 				if (this.product_type == 98) {
 					if(val==1){
 						uni.navigateTo({
-							url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}`
+							url: `/pages/users/order_list/indexCopy?status=2&product_type=${this.product_type}`
 						})
 						}else{
 							uni.navigateTo({
@@ -235,7 +235,7 @@
 				} else {
 					if(val==1){
 						uni.navigateTo({
-							url: '/pages/users/order_list/index?status=1&product_type=0'
+							url: '/pages/users/order_list/index?status=2&product_type=0'
 						})
 						}else{
 							uni.navigateTo({
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
index fc947d5..2e85d34 100644
--- a/pages/plant_release/index.vue
+++ b/pages/plant_release/index.vue
@@ -725,8 +725,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      z-index: 999;
-
+    
       .iconfont {
         color: #ffffff;
         font-size: 12rpx ;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 9b1edd8..a354855 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -1,817 +1,842 @@
 <template>
-  <view>
-    <view class="order-index" ref="container">
-      <view class="header">
-        <div class="header_count">
-          <swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" indicator-active-color="#E93323"
-            previous-margin="0" next-margin="0" :current="swiperCur" @change="swiperChange">
-            <block>
-              <swiper-item :class="{ active: 0 == swiperCur }">
-                <view class="slide-navigator">
-                  <view class="item" hover-class='none' @click="jumpAddGoods">
-                    <image mode='widthFix' class="image" src="../static/images/product_add.png">
-                    </image>
-                    <text class="text">添加商品</text>
-                  </view>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_sales.png">
-                    </image>
-                    <text class="text">在售商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_out.png">
-                    </image>
-                    <text class="text">售罄商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_recycle.png">
-                    </image>
-                    <text class="text">回收站</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_cate.png">
-                    </image>
-                    <text class="text">店铺分类</text>
-                  </navigator>
-                </view>
-              </swiper-item>
-              <swiper-item :class="{ active: 1 == swiperCur }">
-                <view class="slide-navigator">
-                  <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_freight.png">
-                    </image>
-                    <text class="text">运费模板</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
-                    <text class="text">规格模板</text>
-                  </navigator>
-                  <navigator class="item"
-                    :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
-                    <text class="text">商品导入</text>
-                  </navigator>
-                </view>
-              </swiper-item>
-            </block>
-          </swiper>
-        </div>
-      </view>
-      <view class="wrapper">
-        <view class='product_list acea-row row-between-wrapper'>
-          <block v-for="(item,index) in productList" :key="index">
-            <view class='item'>
-              <view class='image'>
-                <image :src='item.image'></image>
-                <text v-if="item.spec_type == 1" class="spec">多规格</text>
-              </view>
-              <view class='text'>
-                <view class='name'>
-                  <text v-if="item.is_gift_bag" class="font-org">礼包</text>
-                  <text class="text_name acea-row line1">{{item.store_name}}</text>
+	<view>
+		<view class="order-index" ref="container">
+			<view class="header">
+				<div class="header_count">
+					<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4"
+						indicator-active-color="#E93323" previous-margin="0" next-margin="0" :current="swiperCur"
+						@change="swiperChange">
+						<block>
+							<swiper-item :class="{ active: 0 == swiperCur }">
+								<view class="slide-navigator">
+									<view class="item" hover-class='none' @click="jumpAddGoods">
+										<image mode='widthFix' class="image" src="../static/images/product_add.png">
+										</image>
+										<text class="text">添加商品</text>
+									</view>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_sales.png">
+										</image>
+										<text class="text">在售商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_out.png">
+										</image>
+										<text class="text">售罄商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_recycle.png">
+										</image>
+										<text class="text">回收站</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_cate.png">
+										</image>
+										<text class="text">店铺分类</text>
+									</navigator>
+								</view>
+							</swiper-item>
+							<swiper-item :class="{ active: 1 == swiperCur }">
+								<view class="slide-navigator">
+									<navigator class="item"
+										:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_freight.png">
+										</image>
+										<text class="text">运费模板</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image"
+											src="../static/images/product_specification.png"></image>
+										<text class="text">规格模板</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
+										<text class="text">商品导入</text>
+									</navigator>
+								</view>
+							</swiper-item>
+						</block>
+					</swiper>
+				</div>
+			</view>
+			<view class="wrapper">
+				<view class='product_list acea-row row-between-wrapper'>
+					<block v-for="(item,index) in productList" :key="index">
+						<view class='item'>
+							<view class='image'>
+								<image :src='item.image'></image>
+								<text v-if="item.spec_type == 1" class="spec">多规格</text>
+							</view>
+							<view class='text'>
+								<view class='name'>
+									<text v-if="item.is_gift_bag" class="font-org">礼包</text>
+									<text class="text_name acea-row line1">{{item.store_name}}</text>
 
-                </view>
-                <view class="sales">
-                  <text class="num">库存: {{item.stock}}</text>
-                  <text class="num">销量: {{item.sales}}</text>
-                </view>
-                <view class='money-wrap'>
-                  <text class='price font-color'>￥{{item.price}}</text>
-                  <text class='ot_price'>￥{{item.ot_price}}</text>
-                </view>
-              </view>
-              <view style="position: absolute; top: 10px; right: 10px;">
-                <!-- 插件无需手动引入，直接使用即可 -->
-                <!-- 里面···可以改为任意东西，图片也可以 -->
-                <!-- 参数$event不可修改，否则取不到点击事件详情 -->
-                <rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event, item.attrValue)">
-                  . . .
-                </rudon-rowMenuDotDotDot>
-              </view>
-            </view>
-            <view class="operation acea-row row-between-wrapper">
-              <view class="acea-row row-middle">
-                <view v-if="item.is_show == 1 && item.status == 1" class="bnt" @tap.stop="handleShelves(item,0)">下架
-                </view>
-                <view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
-                </view>
-                <view @click="editGoods(item)" class="bnt">编辑</view>
-                <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
-                </view>
-                <view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">
-                  {{item.is_good ? '取消推荐' : '店铺推荐'}}
-                </view>
-              </view>
+								</view>
+								<view class="sales">
+									<text class="num">库存: {{item.stock}}</text>
+									<text class="num">销量: {{item.sales}}</text>
+								</view>
+								<view class='money-wrap'>
+									<text class='price font-color'>￥{{item.price}}</text>
+									<text class='ot_price'>￥{{item.ot_price}}</text>
+								</view>
+							</view>
+							<view style="position: absolute; top: 10px; right: 10px;">
+								<!-- 插件无需手动引入，直接使用即可 -->
+								<!-- 里面···可以改为任意东西，图片也可以 -->
+								<!-- 参数$event不可修改，否则取不到点击事件详情 -->
+								<rudon-rowMenuDotDotDot :localdata="options"
+									@change="menuAction($event, item.attrValue)">
+									. . .
+								</rudon-rowMenuDotDotDot>
+							</view>
+						</view>
+						<view class="operation acea-row row-between-wrapper">
+							<view class="acea-row row-middle">
+								<view v-if="item.is_show == 1 && item.status == 1" class="bnt"
+									@tap.stop="handleShelves(item,0)">下架
+								</view>
+								<view v-if="item.is_show == 0 && item.status == 1" class="bnt"
+									@tap.stop="handleShelves(item),1">上架
+								</view>
+								<view @click="editGoods(item)" class="bnt">编辑</view>
+								<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
+								</view>
+								<view class="bnt bnt_recommend" v-if="item.is_show == 1"
+									@tap.stop="handleRecommend(item)">
+									{{item.is_good ? '取消推荐' : '店铺推荐'}}
+								</view>
+							</view>
 
-            </view>
-          </block>
-        </view>
-      </view>
-      <Loading :loaded="loaded" :loading="loading"></Loading>
-    </view>
-    <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
-      <image src="@/static/images/xianxia.png" mode="widthFix"></image>
-      <view class="popen">
-        <h4 v-if="this.on_line==1">线下入库</h4>
-        <h4 v-else>线上入库</h4>
-        <view class="guige">
-          <scroll-view scroll-y="true" class="scroll_y">
-            <view>
-              <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
-                <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
-                  @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
-                </u-radio>
-              </u-radio-group>
-            </view>
-          </scroll-view>
-        </view>
-        <view class="shuru" v-if="this.on_line == 1">
-          数量: <input type="number" v-model="data.number" placeholder="请输入">
-        </view>
-        <view class="btn">
-          <button class="btn_l" @click="close()">取消</button>
-          <button class="btn_r" @click="creat()">提交</button>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<Loading :loaded="loaded" :loading="loading"></Loading>
+		</view>
+		<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image src="@/static/images/xianxia.png" mode="widthFix"></image>
+			<view class="popen">
+				<h4 v-if="this.on_line==1">线下入库</h4>
+				<h4 v-else>线上入库</h4>
+				<view class="guige">
+					<scroll-view scroll-y="true" class="scroll_y">
+						<view>
+							<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+								<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
+									@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique"
+									v-if="item.sku">
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="shuru" v-if="this.on_line == 1">
+					数量: <input type="number" v-model="data.number" placeholder="请输入">
+				</view>
+				<view class="btn">
+					<button class="btn_l" @click="close()">取消</button>
+					<button class="btn_r" @click="creat()">提交</button>
+				</view>
+			</view>
+		</u-popup>
+		<u-loadmore :status="status" v-if="productList.length>0" />
+
+	</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 {
-    productLstApi,
-    productDeleteApi,
-    productOffApi,
-    productRecommendApi,
-    postImport
-  } from "@/api/product";
-  import Loading from '@/components/Loading/index.vue';
-  import {
-    navigateTo,
-    navigateBack,
-    serialize,
-    setStorage,
-    getStorage,
-    removeStorage,
-    Toast,
-    Modal,
-  } from '../../../libs/uniApi.js';
-  export default {
-    name: 'productList',
-    components: {
-      Loading,
-    },
-    data() {
-      return {
-        current: "",
-        where: {
-          page: 1,
-          limit: 20
-        },
-        loaded: false,
-        loading: false,
-        mer_id: '',
-        productList: [],
-        swiperCur: 0,
-        circular: true,
-        attrValue: [],
-        options: [{
-            value: '0',
-            text: '线上入库'
-          },
-          {
-            value: '1',
-            text: '线下入库'
-          },
-          {
-            value: '2',
-            text: '预览'
-          }
-        ],
-        //线下
-        show: false,
-        //单选示例
-        checkboxValue1: [],
-        // 基本案列数据
-        checkboxList1: [],
-        data: {
-          product_id: '',
-          unique: "",
-          number: 1
-        },
-        on_line: ''
-      }
-    },
-    onLoad(options) {
-      this.mer_id = options.mer_id;
-      this.getList(this.mer_id);
-    },
-    onPullDownRefresh() {
-      // this.where.page = 1
-      this.loading = false
-      this.loaded = false
-      this.getList(this.mer_id);
-      uni.stopPullDownRefresh()
-    },
-    onHide() {
-      this.show = false
-    },
-    methods: {
-      menuAction(action, rowId) {
-        // 忽略初始化时的传入的空操作
-        if (action === '') {
-          return
-        }
-        this.on_line = action
-        this.checkboxList1 = rowId
-        console.log(this.on_line);
-        if (this.checkboxList1.length == 1 && action == 0) {
-          // this.show = true
-          navigateTo(1, '/pages/users/online_warehousing/index', {
-            mer_id: this.mer_id,
-            product_id: this.data.product_id,
-            unique: this.data.unique,
-          });
-        } else if (this.checkboxList1.length == 1 && action == 1) {
-          this.show = true
-          this.data.product_id = this.checkboxList1[0].product_id
-          this.data.unique = this.checkboxList1[0].unique
-          console.log(this.data);
-        } else {
-          this.show = true
-        }
-        if (action == 2) {
-          uni.navigateTo({
-            url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
-          })
-        }
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		productLstApi,
+		productDeleteApi,
+		productOffApi,
+		productRecommendApi,
+		postImport
+	} from "@/api/product";
+	import Loading from '@/components/Loading/index.vue';
+	import {
+		navigateTo,
+		navigateBack,
+		serialize,
+		setStorage,
+		getStorage,
+		removeStorage,
+		Toast,
+		Modal,
+	} from '../../../libs/uniApi.js';
+	export default {
+		name: 'productList',
+		components: {
+			Loading,
+		},
+		data() {
+			return {
+				status: 'loadmore',
+				current: "",
+				where: {
+					page: 1,
+					limit: 20
+				},
+				loaded: false,
+				loading: false,
+				mer_id: '',
+				productList: [],
+				swiperCur: 0,
+				circular: true,
+				attrValue: [],
+				options: [{
+						value: '0',
+						text: '线上入库'
+					},
+					{
+						value: '1',
+						text: '线下入库'
+					},
+					{
+						value: '2',
+						text: '预览'
+					}
+				],
+				//线下
+				show: false,
+				//单选示例
+				checkboxValue1: '',
+				// 基本案列数据
+				checkboxList1: [],
+				data: {
+					product_id: '',
+					unique: "",
+					number: 1
+				},
+				on_line: ''
+			}
+		},
+		onLoad(options) {
+			this.mer_id = options.mer_id;
+			this.getList(this.mer_id);
+		},
+		onPullDownRefresh() {
+			this.where.page = 1
+			this.productList=[]
+			this.loading = false
+			this.loaded = false
+			this.getList(this.mer_id);
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// console.log(this.status, '222222222')
+			if (this.status == 'nomore') return;
+			this.status = 'loading';
+			this.where.page = ++this.where.page;
+			this.getList(this.mer_id);
+		},
+		onHide() {
+			this.show = false
+		},
+		methods: {
+			menuAction(action, rowId) {
+				// 忽略初始化时的传入的空操作
+				if (action === '') {
+					return
+				}
+				this.on_line = action
+				this.checkboxList1 = rowId
+				console.log(this.on_line);
+				if (this.checkboxList1.length == 1 && action == 0) {
+					// this.show = true
+					navigateTo(1, '/pages/users/online_warehousing/index', {
+						mer_id: this.mer_id,
+						product_id: this.data.product_id,
+						unique: this.data.unique,
+					});
+				} else if (this.checkboxList1.length == 1 && action == 1) {
+					this.show = true
+					this.data.product_id = this.checkboxList1[0].product_id
+					this.data.unique = this.checkboxList1[0].unique
+					console.log(this.data);
+				} else {
+					this.show = true
+				}
+				if (action == 2) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
+					})
+				}
 
-      },
-      close() {
-        this.show = false
-      },
-      //导入
-      creat() {
-        if (this.on_line == 1) {
-          if (this.data.number < 1) {
-            this.show = false
-            this.$util.Tips({
-              title: '入库数量不得小于一件'
-            })
-          } else {
-            postImport(this.mer_id, this.data).then(res => {
-              console.log(res);
-              this.show = false
-              this.$util.Tips({
-                title: res.message
-              })
-		    this.getList(this.mer_id);
-            }).catch(err => {
-              this.show = false
-              this.$util.Tips({
-                title: '请选择规格后再次进行入库'
-              })
-            })
-          }
-        }
-        if (this.on_line == 0) {
-          console.log('12');
-          if (!this.data.product_id) {
-            this.show = false
-            this.$util.Tips({
-              title: '请选择规格'
-            })
-          } else {
-            navigateTo(1, '/pages/users/online_warehousing/index', {
-              mer_id: this.mer_id,
-              product_id: this.data.product_id,
-              unique: this.data.unique,
+			},
+			close() {
+				this.show = false
+			},
+			//导入
+			creat() {
 
-            });
-          }
+				if (this.on_line == 1) {
+					if (this.data.number < 1) {
+						this.show = false
+						this.$util.Tips({
+							title: '入库数量不得小于一件'
+						})
+					} else {
+						postImport(this.mer_id, this.data).then(res => {
+							console.log(res);
+							this.show = false
+							this.$util.Tips({
+								title: res.message
+							})
+							this.productList = []
+							this.getList(this.mer_id);
+						}).catch(err => {
+							this.show = false
+							this.$util.Tips({
+								title: '请选择规格后再次进行入库'
+							})
+						})
+					}
+				}
+				if (this.on_line == 0) {
+					console.log('12');
+					if (!this.data.product_id) {
+						this.show = false
+						this.$util.Tips({
+							title: '请选择规格'
+						})
+					} else {
+						navigateTo(1, '/pages/users/online_warehousing/index', {
+							mer_id: this.mer_id,
+							product_id: this.data.product_id,
+							unique: this.data.unique,
 
-        }
+						});
+					}
 
-      },
-      //规格
-      checkboxChange(n) {
-        this.data.unique = n
-        console.log(n);
-      },
-      radioChange(n) {
-        this.data.product_id = n.product_id
-        console.log(this.data);
-      },
-      // 跳转添加商品界面
-      jumpAddGoods() {
-        const data = getStorage('addGoodsFormData');
-        if (data && data.product_id) {
-          let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
-            'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
-          ];
-          waitDeleteData.forEach(item => {
-            if (getStorage(item)) {
-              removeStorage(item);
-            }
-          })
-        }
-        navigateTo(1, '/pages/product/addGoods/index', {
-          mer_id: this.mer_id
-        });
-      },
-      // swiper
-      swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'touch') {
-          //根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
-          this.swiperCur = e.detail.current;
-        }
-      },
-      getList: function(mer_id) {
-        var that = this;
-        if (that.loading || that.loaded) return;
-        that.loading = true;
-        productLstApi(mer_id, that.where).then(
-          res => {
-            that.loading = false;
-            that.loaded = res.data.list.length < that.where.limit;
-            that.productList.push.apply(that.productList, res.data.list);
-            that.where.page = that.where.page + 1;
+				}
 
-          },
-          error => {
-            that.$util.Tips({
-              title: error.msg
-            })
-          }
-        );
-      },
-      editGoods(item) {
-        let waitDeleteData = [
-          'addGoodsFormData',
-          'singleSpecification',
-          'attrValue',
-          'modifyPriceData',
-          'addGoodsSecoundData',
-          'goodsDis',
-          'editGoodsDetils',
-          'canChange',
-          'canChangeSecound'
-        ];
-        waitDeleteData.forEach(item => {
-          if (getStorage(item)) {
-            removeStorage(item);
-          }
-        });
-        navigateTo(1, '/pages/product/addGoods/index', {
-          mer_id: item.mer_id,
-          product_id: item.product_id
-        });
-      },
-      handleRecycle(item, index) {
-        let that = this;
-        Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
-          productDeleteApi(that.mer_id, item.product_id)
-            .then(res => {
-              that.$util.Tips({
-                title: res.message,
-                icon: 'success'
-              }, () => {
-                that.productList.splice(index, 1);
-              });
-            })
-            .catch(rej => {
-              Toast(`${rej}, 加入回收站失败`);
-            });
-        });
-      },
-      //下架 0
-      handleShelves(item, status) {
-        let that = this;
-        if (status == 0) {
-          uni.showModal({
-            content: '确定要下架该商品么？',
-            success: function(res) {
-              if (res.confirm) {
-                that.onAndOff(item, 0)
-                uni.showToast({
-                  title: '下架成功',
-                  icon: 'none'
-                })
-              } else if (res.cancel) {
-                // console.log('用户点击取消');
-              }
-            }
-          });
-        } else {
-          that.onAndOff(item, 1)
-        }
-      },
-      //上下架
-      onAndOff(item, status) {
-        let that = this;
-        productOffApi(that.mer_id, item.product_id, {
-          status: status
-        }).then((res) => {
-          that.$util.Tips({
-            title: res.message,
-            icon: 'success'
-          }, () => {
-            that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        });
-      },
-      //设置推荐
-      handleRecommend(item) {
-        let that = this
-        let is_good = item.is_good ? 0 : 1
-        productRecommendApi(that.mer_id, item.product_id, {
-          is_good: is_good
-        }).then((res) => {
-          that.$util.Tips({
-            title: res.message,
-            icon: 'success'
-          }, () => {
-            that.$set(item, 'is_good', item.is_good == 0 ? 1 : 0);
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        });
-      },
-      more(index) {
-        this.current = index
-      },
-    },
-    onReachBottom() {
-      this.getList(this.mer_id)
-    }
-  }
+			},
+			//规格
+			checkboxChange(n) {
+				this.data.unique = n
+				console.log(n);
+			},
+			radioChange(n) {
+				this.data.product_id = n.product_id
+				// console.log(this.data);
+			},
+			// 跳转添加商品界面
+			jumpAddGoods() {
+				const data = getStorage('addGoodsFormData');
+				if (data && data.product_id) {
+					let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+						'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
+					];
+					waitDeleteData.forEach(item => {
+						if (getStorage(item)) {
+							removeStorage(item);
+						}
+					})
+				}
+				navigateTo(1, '/pages/product/addGoods/index', {
+					mer_id: this.mer_id
+				});
+			},
+			// swiper
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'touch') {
+					//根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
+					this.swiperCur = e.detail.current;
+				}
+			},
+			getList: function(mer_id) {
+
+				var that = this;
+				// if (that.loading || that.loaded) return;
+				that.loading = true;
+				productLstApi(mer_id, that.where).then(
+					res => {
+						that.loading = false;
+						that.loaded = res.data.list.length < that.where.limit;
+						that.productList.push(...res.data.list);
+						if (res.data.list.length < that.where.limit) that.status = 'nomore'
+
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+			editGoods(item) {
+				let waitDeleteData = [
+					'addGoodsFormData',
+					'singleSpecification',
+					'attrValue',
+					'modifyPriceData',
+					'addGoodsSecoundData',
+					'goodsDis',
+					'editGoodsDetils',
+					'canChange',
+					'canChangeSecound'
+				];
+				waitDeleteData.forEach(item => {
+					if (getStorage(item)) {
+						removeStorage(item);
+					}
+				});
+				navigateTo(1, '/pages/product/addGoods/index', {
+					mer_id: item.mer_id,
+					product_id: item.product_id
+				});
+			},
+			handleRecycle(item, index) {
+				let that = this;
+				Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
+					productDeleteApi(that.mer_id, item.product_id)
+						.then(res => {
+							that.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							}, () => {
+								that.productList.splice(index, 1);
+							});
+						})
+						.catch(rej => {
+							Toast(`${rej}, 加入回收站失败`);
+						});
+				});
+			},
+			//下架 0
+			handleShelves(item, status) {
+				let that = this;
+				if (status == 0) {
+					uni.showModal({
+						content: '确定要下架该商品么？',
+						success: function(res) {
+							if (res.confirm) {
+								that.onAndOff(item, 0)
+								uni.showToast({
+									title: '下架成功',
+									icon: 'none'
+								})
+							} else if (res.cancel) {
+								// console.log('用户点击取消');
+							}
+						}
+					});
+				} else {
+					that.onAndOff(item, 1)
+				}
+			},
+			//上下架
+			onAndOff(item, status) {
+				let that = this;
+				productOffApi(that.mer_id, item.product_id, {
+					status: status
+				}).then((res) => {
+					that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, () => {
+						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			//设置推荐
+			handleRecommend(item) {
+				let that = this
+				let is_good = item.is_good ? 0 : 1
+				productRecommendApi(that.mer_id, item.product_id, {
+					is_good: is_good
+				}).then((res) => {
+					that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, () => {
+						that.$set(item, 'is_good', item.is_good == 0 ? 1 : 0);
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			more(index) {
+				this.current = index
+			},
+		},
+	
+	}
 </script>
 
 <style scoped lang="scss">
-  page {
-    background-color: #F5F5F5;
-  }
+	page {
+		background-color: #F5F5F5;
+	}
 
-  .order-index {
-    background-image: url('data:image/png;base64,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');
-    background-repeat: no-repeat;
-    background-size: 100%;
-  }
+	.order-index {
+		background-image: url('data:image/png;base64,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');
+		background-repeat: no-repeat;
+		background-size: 100%;
+	}
 
-  .popupn {
-    position: fixed;
-    width: 100%;
-    text-align: center;
-    top: 0;
-    left: 0;
-    background: transparent;
-    height: 90rpx;
-    line-height: 90rpx;
-    z-index: 5;
+	.popupn {
+		position: fixed;
+		width: 100%;
+		text-align: center;
+		top: 0;
+		left: 0;
+		background: transparent;
+		height: 90rpx;
+		line-height: 90rpx;
+		z-index: 5;
 
-    .spin {
-      display: block;
-      transform: rotate(180deg);
-      font-size: 36rpx;
-    }
+		.spin {
+			display: block;
+			transform: rotate(180deg);
+			font-size: 36rpx;
+		}
 
-    .title {
-      max-width: 560rpx;
-      margin: 0 auto;
-      position: relative;
-      display: inline;
-      padding: 10rpx 30rpx 10rpx 50rpx;
-      background-color: rgba(0, 0, 0, .25);
-      border-radius: 30rpx;
-      color: #FFFFFF;
-    }
+		.title {
+			max-width: 560rpx;
+			margin: 0 auto;
+			position: relative;
+			display: inline;
+			padding: 10rpx 30rpx 10rpx 50rpx;
+			background-color: rgba(0, 0, 0, .25);
+			border-radius: 30rpx;
+			color: #FFFFFF;
+		}
 
-    .iconfont {
-      display: inline-block;
-      position: relative;
-      top: 4rpx;
-      right: 0;
-    }
+		.iconfont {
+			display: inline-block;
+			position: relative;
+			top: 4rpx;
+			right: 0;
+		}
 
-    .mer_logo {
-      width: 34rpx;
-      height: 34rpx;
-      position: relative;
-      top: 6rpx;
-      right: 10px;
-    }
+		.mer_logo {
+			width: 34rpx;
+			height: 34rpx;
+			position: relative;
+			top: 6rpx;
+			right: 10px;
+		}
 
-    .mer_name {
-      display: inline-block;
-      max-width: 650rpx;
-    }
+		.mer_name {
+			display: inline-block;
+			max-width: 650rpx;
+		}
 
-    .invoice-content {
-      background-color: #ffffff;
-    }
-  }
+		.invoice-content {
+			background-color: #ffffff;
+		}
+	}
 
-  /deep/.uni-swiper-slides {
-    inset: 0 !important;
-  }
+	/deep/.uni-swiper-slides {
+		inset: 0 !important;
+	}
 
-  uni-swiper,
-  swiper {
-    height: 200rpx;
-  }
+	uni-swiper,
+	swiper {
+		height: 200rpx;
+	}
 
-  .header {
-    padding-top: 40rpx;
-    margin: 0 20rpx;
+	.header {
+		padding-top: 40rpx;
+		margin: 0 20rpx;
 
-    .header_count {
-      width: 710rpx;
-      padding: 30rpx 30rpx 0;
-      background: #ffffff;
-      border-radius: 10rpx;
-      position: relative;
-    }
+		.header_count {
+			width: 710rpx;
+			padding: 30rpx 30rpx 0;
+			background: #ffffff;
+			border-radius: 10rpx;
+			position: relative;
+		}
 
-    .item {
-      display: inline-block;
-      width: 130rpx;
-      text-align: center;
+		.item {
+			display: inline-block;
+			width: 130rpx;
+			text-align: center;
 
-      .image {
-        width: 84rpx;
-        height: 84rpx;
-      }
+			.image {
+				width: 84rpx;
+				height: 84rpx;
+			}
 
-      .text {
-        display: block;
-        text-align: center;
-        color: #666666;
-        font-size: 24rpx;
-        margin-top: 18rpx;
-      }
-    }
-  }
+			.text {
+				display: block;
+				text-align: center;
+				color: #666666;
+				font-size: 24rpx;
+				margin-top: 18rpx;
+			}
+		}
+	}
 
-  /deep/.uni-swiper-slides {
-    width: 650rpx;
-  }
+	/deep/.uni-swiper-slides {
+		width: 650rpx;
+	}
 
-  /deep/.uni-swiper-dot {
-    width: 15rpx;
-    height: 5rpx;
-  }
+	/deep/.uni-swiper-dot {
+		width: 15rpx;
+		height: 5rpx;
+	}
 
-  /deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
-    margin-right: 0;
-  }
+	/deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
+		margin-right: 0;
+	}
 
-  .product_list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0 20rpx;
+	.product_list {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 20rpx;
 
-    .item {
-      position: relative;
-      display: flex;
-      align-items: center;
-      width: 100%;
-      padding: 30rpx 20rpx;
-      border-radius: 0;
-      margin-bottom: 0;
-      background: #ffffff;
-      margin-top: 30rpx;
-      border-radius: 10rpx 10rpx 0 0;
+		.item {
+			position: relative;
+			display: flex;
+			align-items: center;
+			width: 100%;
+			padding: 30rpx 20rpx;
+			border-radius: 0;
+			margin-bottom: 0;
+			background: #ffffff;
+			margin-top: 30rpx;
+			border-radius: 10rpx 10rpx 0 0;
 
-      .image,
-      image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 16rpx;
-        position: relative;
+			.image,
+			image {
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 16rpx;
+				position: relative;
 
-        .spec {
-          color: #ffffff;
-          background: rgba(0, 0, 0, 0.5);
-          border-radius: 16rpx 0 16rpx 0;
-          text-align: center;
-          font-size: 18rpx;
-          display: inline-block;
-          width: 84rpx;
-          line-height: 30rpx;
-          position: absolute;
-          bottom: 0;
-          right: 0;
-        }
+				.spec {
+					color: #ffffff;
+					background: rgba(0, 0, 0, 0.5);
+					border-radius: 16rpx 0 16rpx 0;
+					text-align: center;
+					font-size: 18rpx;
+					display: inline-block;
+					width: 84rpx;
+					line-height: 30rpx;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
 
-        uni-image {
-          width: 150rpx;
-          height: 150rpx;
-          border-radius: 16rpx;
-        }
-      }
+				uni-image {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 16rpx;
+				}
+			}
 
-      .text {
-        position: relative;
-        flex: 1;
-        min-width: 0;
-        padding: 10rpx 10rpx 20rpx 30rpx;
+			.text {
+				position: relative;
+				flex: 1;
+				min-width: 0;
+				padding: 10rpx 10rpx 20rpx 30rpx;
 
-        .name {
-          color: #282828;
-          font-size: 30rpx;
-          font-family: "PingFang SC";
-          display: flex;
-          align-items: center;
-        }
+				.name {
+					color: #282828;
+					font-size: 30rpx;
+					font-family: "PingFang SC";
+					display: flex;
+					align-items: center;
+				}
 
-        .text_name {
-          display: inline-block;
-          max-width: 400rpx;
-        }
+				.text_name {
+					display: inline-block;
+					max-width: 400rpx;
+				}
 
-        .font-org {
-          background-color: #FC8327;
+				.font-org {
+					background-color: #FC8327;
 
-          display: inline-block;
-          color: #fff;
-          font-size: 16rpx;
-          text-align: center;
-          border-radius: 5rpx;
-          padding: 0 4rpx;
-          line-height: 28rpx;
-          margin-right: 8rpx;
-        }
+					display: inline-block;
+					color: #fff;
+					font-size: 16rpx;
+					text-align: center;
+					border-radius: 5rpx;
+					padding: 0 4rpx;
+					line-height: 28rpx;
+					margin-right: 8rpx;
+				}
 
-        .money-wrap {
-          margin-top: 20rpx;
+				.money-wrap {
+					margin-top: 20rpx;
 
-          .price {
-            font-size: 30rpx;
-            display: inline-block;
-            margin-right: 15rpx;
-          }
+					.price {
+						font-size: 30rpx;
+						display: inline-block;
+						margin-right: 15rpx;
+					}
 
-          .ot_price {
-            color: #bebebe;
-            font-size: 26rpx;
-            text-decoration: line-through;
-          }
-        }
+					.ot_price {
+						color: #bebebe;
+						font-size: 26rpx;
+						text-decoration: line-through;
+					}
+				}
 
-        .sales {
-          margin-top: 20rpx;
-          color: #868686;
-          font-size: 22rpx;
+				.sales {
+					margin-top: 20rpx;
+					color: #868686;
+					font-size: 22rpx;
 
-          .num {
-            display: inline-block;
-            margin-right: 20rpx;
-          }
-        }
-      }
-    }
+					.num {
+						display: inline-block;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
 
-    .operation {
-      padding: 20upx 10px;
-      background: #ffffff;
-      width: 100%;
-      border-radius: 0 0 10rpx 10rpx;
+		.operation {
+			padding: 20upx 10px;
+			background: #ffffff;
+			width: 100%;
+			border-radius: 0 0 10rpx 10rpx;
 
-      .bnt {
-        font-size: 26rpx;
-        color: #999999;
-        width: 120rpx;
-        height: 58rpx;
-        border-radius: 30rpx;
-        border: 1px solid #999999;
-        text-align: center;
-        line-height: 58rpx;
+			.bnt {
+				font-size: 26rpx;
+				color: #999999;
+				width: 120rpx;
+				height: 58rpx;
+				border-radius: 30rpx;
+				border: 1px solid #999999;
+				text-align: center;
+				line-height: 58rpx;
 
-        ~.bnt {
-          margin-left: 18rpx;
-        }
+				~.bnt {
+					margin-left: 18rpx;
+				}
 
-        &.bnt_recommend {
-          width: 160rpx;
-          color: #ffffff;
-          background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
-          border-color: transparent;
-        }
-      }
-    }
+				&.bnt_recommend {
+					width: 160rpx;
+					color: #ffffff;
+					background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
+					border-color: transparent;
+				}
+			}
+		}
 
-    .acea-row.row-between-wrapper {
-      justify-content: flex-end;
-    }
-  }
+		.acea-row.row-between-wrapper {
+			justify-content: flex-end;
+		}
+	}
 
-  .genduo {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border: 1px solid #999999;
-    border-radius: 10px;
-    width: 30px;
-    height: 10px;
+	.genduo {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #999999;
+		border-radius: 10px;
+		width: 30px;
+		height: 10px;
 
-    .gen_sel {
-      font-size: 12px
-    }
-  }
+		.gen_sel {
+			font-size: 12px
+		}
+	}
 
-  .popen {
-    position: absolute;
-    top: 110px;
-    width: 100%;
-    margin: auto;
-    padding: 10px;
-    z-index: 0;
+	.popen {
+		position: absolute;
+		top: 110px;
+		width: 100%;
+		margin: auto;
+		padding: 10px;
+		z-index: 0;
 
-    h4 {
-      font-weight: 400;
-      font-size: 20px;
-      padding: 5px;
-      text-align: center;
-    }
+		h4 {
+			font-weight: 400;
+			font-size: 20px;
+			padding: 5px;
+			text-align: center;
+		}
 
-    .guige {
-      margin: 10px 0 10px 20px;
+		.guige {
+			margin: 10px 0 10px 20px;
 
-      .scroll_y {
-        max-height: 150px;
-      }
-    }
+			.scroll_y {
+				max-height: 150px;
+			}
+		}
 
-    .guiges {
-      height: 100px;
-      margin: 10px 0 10px 20px;
-    }
+		.guiges {
+			height: 100px;
+			margin: 10px 0 10px 20px;
+		}
 
-    .shuru {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      padding: 5px;
-      margin-left: 20px;
+		.shuru {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			padding: 5px;
+			margin-left: 20px;
 
-      input {
-        background: #F5F5F5;
-        border-radius: 8px 8px 8px 8px;
-        border: 1px solid #999999;
-        padding-left: 3px;
-        margin-left: 3px;
-      }
+			input {
+				background: #F5F5F5;
+				border-radius: 8px 8px 8px 8px;
+				border: 1px solid #999999;
+				padding-left: 3px;
+				margin-left: 3px;
+			}
 
-    }
+		}
 
-    .btn {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin: 10px;
+		.btn {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 10px;
 
-      .btn_l {
-        padding: 5px;
-        width: 100px;
-        border-radius: 4px;
-      }
+			.btn_l {
+				padding: 5px;
+				width: 100px;
+				border-radius: 4px;
+			}
 
-      .btn_r {
-        width: 100px;
-        padding: 5px;
-        border-radius: 4px;
-        background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
-        border-radius: 27px 27px 27px 27px;
-        color: white;
-      }
-    }
-  }
+			.btn_r {
+				width: 100px;
+				padding: 5px;
+				border-radius: 4px;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+				color: white;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue
index eb3e655..fc90054 100644
--- a/pages/releaseManagement/index.vue
+++ b/pages/releaseManagement/index.vue
@@ -5,15 +5,41 @@
 			<!--选项卡滑动切换-->
 			<cxNavTitle :tabs="tabs" :activeItem="activeItem" :show="false" @tabClick="tabClick"></cxNavTitle>
 		</view>
-		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
+		<!-- 审核通过 打折有拒绝、同意功能 ，调货不需要功能 -->
 		<view class="content-content">
 			<view class="" v-for="(item,i) in orderList" :key='i'
 				style="	border-radius: 14rpx 14rpx 14rpx 14rpx;margin-bottom:  23rpx;background-color: #FFFFFF; padding: 28rpx 46rpx;">
-				<view :class="tabTitle=='tabTwo'?'content-onea':'content-one'">
+
+				<view   @click="detail(item)"
+					:class="tabTitle=='tabTwo'?'content-onea':'content-one'&&(tabTitle=='tabFive'&&item.resale_type==1)?'content-onea':'content-one'">
 					<view class="content-one-img">
-						<image :src="item.image" mode="aspectFit"></image>
+
+						<image :src="item.image.indexOf(',')>-1?item.image.split(',')[0]:item.image" mode="aspectFit">
+						</image>
 					</view>
-					<view class="content-one-txt">
+					<view class="content-one-txt" v-if="tabTitle=='tabFive'">
+						<view class="one-txt-a">
+							{{item.title}}
+						</view>
+						<view class="one-txt-b" style="margin-top: 5px;">
+							<view class="txt-b-a">
+								￥ {{item.discount_price}}
+							</view>
+							<view class="txt-b-b"
+								style="font-size: 28rpx;font-family: SF Pro Display-Regular, SF Pro Display;font-weight: 400;color: #999999;">
+								结算价:￥{{item.discount_price}}
+							</view>
+						</view>
+
+
+						<view class="txt-b-b" style="margin-top: 5px;" v-if="item.resale_type==1">
+							类型:调货
+						</view>
+						<view class="txt-b-b" style="margin-top: 5px;" v-else>
+							类型:打折
+						</view>
+					</view>
+					<view class="content-one-txt" v-else>
 						<view class="one-txt-a">
 							{{item.title}}
 						</view>
@@ -28,6 +54,9 @@
 								类型:打折
 							</view>
 						</view>
+
+
+
 					</view>
 				</view>
 				<view class="content-two_one" v-if='tabTitle=="tabOne"'>
@@ -63,13 +92,25 @@
 					</view>
 
 				</view>
-				<view class="content-two-five" v-if='tabTitle=="tabFive"'>
-					<view class="content-two-delete" @click="passDelete(item)">
-						拒绝
-					</view>
+				<view class="content-two-five" v-if='tabTitle=="tabFive"&&item.resale_type==2'>
+					<view class="" v-if="item.mer_status==0">
+						<view class="content-two-delete" @click="passDelete(item)">
+							拒绝
+						</view>
 
-					<view class="content-two-agree" @click="passagree(item)">
-						同意
+						<view class="content-two-agree" @click="passagree(item)">
+							同意
+						</view>
+					</view>
+					<view class="" v-else>
+						<view :class="item.mer_status==1?'content-two-deletea':'content-two-delete'"
+							@click="passDelete(item)" v-if="item.mer_status==1">
+							拒绝
+						</view>
+
+						<view class="content-two-agree" @click="passagree(item)" v-else>
+							同意
+						</view>
 					</view>
 				</view>
 
@@ -89,9 +130,7 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
-	import {
-		from
-	} from 'form-data';
+
 	import {
 		getResaleid,
 		getResalecheck,
@@ -145,8 +184,10 @@
 		onLoad(num) {
 			this.tabTitle = this.tabs[0].name
 			if (num.key == '2') {
-				this.activeItem = 'tabThree'
+				this.activeItem = 'tabThree',
+					this.where.status = 3
 			}
+			this.orderList = []
 			this.list()
 		},
 		methods: {
@@ -189,6 +230,7 @@
 						title: res.message,
 						icon: 'success'
 					})
+					this.orderList = []
 					this.list()
 					this.tabTitle = 'tabThree'
 				})
@@ -209,12 +251,12 @@
 			},
 			// 审核未通过 删除
 			auditDelete(item) {
-
 				getResaledelete(item.community_id).then(res => {
 					this.$util.Tips({
 						title: res.message,
 						icon: 'success'
 					})
+					this.orderList = []
 					this.list()
 					this.tabTitle = 'tabFour'
 				})
@@ -243,10 +285,18 @@
 						title: res.message,
 						icon: 'success'
 					})
+					this.orderList = []
 					this.list()
 					this.tabTitle = 'tabFive'
 				})
 			},
+			//详情
+			detail(item) {
+
+				uni.navigateTo({
+					url: '/pages/releaseManagement/details/index?key=' + item.community_id
+				})
+			},
 			//审核通过 同意
 			passagree(item) {
 				getResalecheck(item.community_id, {
@@ -256,6 +306,7 @@
 						title: res.message,
 						icon: 'success'
 					})
+					this.orderList = []
 					this.list()
 					this.tabTitle = 'tabFive'
 				})
@@ -269,30 +320,22 @@
 		background-color: #FFFFFF;
 	}
 
-
 	.content_top {
 
 		width: 100%;
 	}
 
 	.content-content {
-
 		margin-top: 21rpx;
-
 		margin-left: 28rpx;
 		margin-right: 28rpx;
-
 		padding-top: 28rpx;
-
-
 		opacity: 1;
 		position: relative;
 
 		.content-onea {
 			display: flex;
 			padding-bottom: 23rpx;
-
-
 			background-color: #FFFFFF;
 
 			.content-one-img {
@@ -300,8 +343,6 @@
 				height: 148rpx;
 				margin-right: 28rpx;
 
-
-
 				image {
 					width: 100%;
 					height: 100%;
@@ -510,6 +551,22 @@
 				bottom: 23rpx;
 			}
 
+			.content-two-deletea {
+				width: 168rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				border: 2rpx solid #999999;
+				position: absolute;
+				right: 28rpx;
+				bottom: 23rpx;
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+			}
+
 			.content-two-delete {
 				width: 168rpx;
 				height: 60rpx;
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
index f67bb82..6de1baa 100644
--- a/pages/trading_hall/adddiscounts/index.vue
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -365,8 +365,8 @@
 						}
 
 						this.getProduct(res.data.resale)
-						if(res.data.video_link){
-							this.tabActive=2
+						if (res.data.video_link) {
+							this.tabActive = 2
 						}
 					}
 				})
@@ -645,6 +645,9 @@
 				if (!value.content) return that.$util.Tips({
 					title: '请添加商品描述'
 				});
+				if (!value.product_info[0].deliver_method ) return that.$util.Tips({
+					title: '请选择配送方式'
+				});
 				if (that.tabActive == 2 && !value.video_link) {
 					return that.$util.Tips({
 						title: '请添加话题视频'
@@ -671,10 +674,10 @@
 							is_type: 3,
 							product_info: []
 						}
-						uni.navigateTo({
+
+						uni.redirectTo({
 							url: '/pages/releaseManagement/index?key=' + 2
 						})
-
 					} else {
 						that.$util.Tips({
 							title: res.messge,
@@ -702,7 +705,7 @@
 							is_type: 3,
 							product_info: []
 						}
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/releaseManagement/index?key=' + 2
 						})
 
diff --git a/pages/trading_hall/product_details/index.vue b/pages/trading_hall/product_details/index.vue
index 3ca4533..ff5b22c 100644
--- a/pages/trading_hall/product_details/index.vue
+++ b/pages/trading_hall/product_details/index.vue
@@ -27,9 +27,9 @@
 				<view class="top-two_content">
 					<textarea :value="listobj.content" placeholder="" style="height: auto;" />
 				</view>
-				<view class="top-two_img" v-for="(item,index) in listobj.image">
+				<view class="top-two_img">
 
-					<view class="">
+					<view class="" v-for="(item,index) in listobj.image">
 						<image :src="item" mode=""></image>
 					</view>
 
@@ -250,19 +250,23 @@
 
 			.top-two_img {
 				display: flex;
-				justify-content: space-between;
 
 				view {
+
 					width: 217rpx;
 					height: 217rpx;
 					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					margin-right: 15rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 14rpx 14rpx 14rpx 14rpx;
+
+					}
 				}
 
-				image {
-					width: 217rpx;
-					height: 217rpx;
-					border-radius: 14rpx 14rpx 14rpx 14rpx;
-				}
+
 			}
 		}
 	}
@@ -355,6 +359,7 @@
 
 		.content_bootm_one {
 			height: 112rpx;
+				line-height: 112rpx;
 			padding-right: 28rpx;
 			background: #FFFFFF;
 			display: flex;
diff --git a/pages/trading_hall/transfer_goods/index.vue b/pages/trading_hall/transfer_goods/index.vue
index 2640224..19034b5 100644
--- a/pages/trading_hall/transfer_goods/index.vue
+++ b/pages/trading_hall/transfer_goods/index.vue
@@ -321,7 +321,7 @@
 			// uni.hideTabBar()
 			this.id = options.id;
 			this.type = options.gtype
- 
+
 			this.tabActive = options.type || 1;
 			if (this.community_app_switch.length == 1) {
 				this.tabActive = this.community_app_switch[0]
@@ -365,8 +365,8 @@
 						}
 
 						this.getProduct(res.data.resale)
-						if(res.data.video_link){
-							this.tabActive=2
+						if (res.data.video_link) {
+							this.tabActive = 2
 						}
 					}
 				})
@@ -603,15 +603,16 @@
 			},
 			/*获取选中的宝贝*/
 			getProduct(data) {
-			
-				
+                 if(this.type== 'edit'){
+					 this.formData.product_info=[]
+				 }
+            
 				this.productList = []
 				this.price = 0;
+				console.log(data)
 				if (data.length > 0) {
-
 					this.productList = data;
 					for (let i in data) {
-
 						this.price = Number(this.price) + (Number(data[i].number) * Number(data[i].price))
 						this.formData.product_info.push({
 							product_attr_unique: data[i].product_attr_unique,
@@ -638,7 +639,6 @@
 				let that = this,
 
 					value = that.formData;
-
 				if (value.image.length == 0) return that.$util.Tips({
 					title: '请添加图文图片'
 				});
@@ -648,6 +648,11 @@
 				if (!value.content) return that.$util.Tips({
 					title: '请添加商品描述'
 				});
+				// console.log( this.delivery_way.length>0 )
+				if (!value.product_info[0].deliver_method && this.delivery_way.length==0 ) return that.$util.Tips({
+					title: '请选择配送方式'
+				});
+			
 				if (that.tabActive == 2 && !value.video_link) {
 					return that.$util.Tips({
 						title: '请添加话题视频'
@@ -658,6 +663,7 @@
 					mask: true
 				})
 
+
 				that.type == 'edit' ? getresaleEdit(that.id, value).then(res => {
 					if (res.status == '200') {
 						uni.hideLoading()
@@ -674,7 +680,7 @@
 							is_type: 3,
 							product_info: []
 						}
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/releaseManagement/index?key=' + 2
 						})
 
@@ -705,7 +711,7 @@
 							is_type: 3,
 							product_info: []
 						}
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/releaseManagement/index?key=' + 2
 						})
 
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c63c9d2..e4e9787 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -287,19 +287,19 @@
           {
             icon: 'icon-daifahuo1',
             title: '待发货',
-            url: '/pages/users/order_list/index?status=1',
+            url: '/pages/users/order_list/index?status=2',
             num: 0
           },
           {
             icon: 'icon-daishouhuo1',
             title: '待收货',
-            url: '/pages/users/order_list/index?status=2',
+            url: '/pages/users/order_list/index?status=3',
             num: 0
           },
           {
             icon: 'icon-daipingjia1',
             title: '待评价',
-            url: '/pages/users/order_list/index?status=3',
+            url: '/pages/users/order_list/index?status=4',
             num: 0
           },
           {
@@ -420,7 +420,10 @@
       // 菜单显示
       filterMenus: function(item) {
         let that = this;
-        if (item.url == '/pages/users/user_money/index') item.isShow = that.balance_func_status == 1
+        if (item.url == '/pages/users/user_money/index') {
+			// item.isShow = that.balance_func_status == 1
+			item.isShow = true
+		}
         else if (item.url == '/pages/users/user_spread_user/index') {
           if (that.extension_status == 0) {
             item.isShow = false
@@ -436,6 +439,8 @@
         else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1
         else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1
         else item.isShow = true
+		
+	
       },
       showMenu(menu) {
         return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
@@ -556,6 +561,7 @@
             that.filterMenus(item)
             that.personalMenu.push(item)
           })
+		 
           that.imgUrls = res.data.banner
         });
       },
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 38d480c..1bf3ca6 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -121,6 +121,7 @@
 						<view class="boxs">
 							<view class='item acea-row row-between-wrapper'>
 								<view>配送方式</view>
+								
 								<view
 									v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
 									class='discount' @tap="openShowBox(item,index)">
@@ -1151,7 +1152,7 @@
 				let that = this;
 				let active = e;
 				that.active = active;
-				console.log(this.active);
+ 				// console.log(this.active);
 				that.animated = true;
 				that.payType = that.cartArr[active].value;
 				if (that.payType == 'weixin') {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 989d922..9cae0f2 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -250,8 +250,8 @@
 									</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>
+								<!-- 	<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>
@@ -259,7 +259,7 @@
 										<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)'>取件码</view>
+										<view  class='bnt b-color'  @tap='confirmOrder(item,index)'>取件码</view>
 									</block>
 									<block v-if="item.status == 2">
 										<navigator v-if="community_status == 1 && !item.community_id"
@@ -488,7 +488,9 @@
 				 * 生命周期函数--监听页面加载
 				 */
 				onLoad: function(options) {
+						
 					if (options.status) this.orderStatus = options.status;
+				
 				},
 				/**
 				 * 获取订单统计数据
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 9362f79..677cdfa 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -251,8 +251,8 @@
 									</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>
+									<!-- <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>
@@ -260,7 +260,10 @@
 										<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)'>确认收货</view>
+											<view class='bnt b-color'  @tap='confirmOrder(item,index)'v-if='item.activity_type=98'>
+												确认收货
+											</view>
+										<view class='bnt b-color' v-else  @tap='confirmOrder(item,index)'>取件码</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">
@@ -562,6 +565,8 @@
 				 * 去订单详情
 				 */
 				goOrderDetails: function(order_id) {
+			
+					
 					let self = this
 					if (!order_id) return that.$util.Tips({
 						title: '缺少订单号无法查看订单详情'
@@ -570,6 +575,7 @@
 					uni.showLoading({
 						title: '正在加载',
 					})
+					console.log(self.orderStatus)
 					openOrderSubscribe().then(() => {
 						uni.hideLoading();
 						if (self.orderStatus == 0) {
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
index d802e68..febd088 100644
--- a/pages/users/order_list/order.vue
+++ b/pages/users/order_list/order.vue
@@ -247,8 +247,8 @@
 								</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>
+								<!-- <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 v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
index dbfe411..dec36c1 100644
--- a/pages/users/trading_hall/index.vue
+++ b/pages/users/trading_hall/index.vue
@@ -74,9 +74,9 @@
 
 
 		<view class="empty_wrapper" v-if="emptyShow">
-			<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+			<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
 		</view>
-		<u-loadmore :status="status" v-if="datatlist.length>0"/>
+		<u-loadmore :status="status" v-if="datatlist.length>=where.limit" />
 
 	</view>
 </template>
@@ -134,14 +134,17 @@
 		onReachBottom() {
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
+			this.emptyShow = false
 			this.where.page = ++this.where.page;
 			this.getlist(this.num)
+
 		},
 		methods: {
-			
+
 
 			//选择 打折  调货 
 			btntap(index) {
+				this.datatlist = []
 				this.num = index
 				this.getlist()
 			},
@@ -167,17 +170,24 @@
 			handleSearch() {
 				if (this.num == 0) {
 					this.where.resale_type = ''
+					this.emptyShow = false
+					this.datatlist = []
 				} else if (this.num == 1) {
 					this.where.resale_type = 1
+					this.emptyShow = false
+					this.datatlist = []
 				} else {
 					this.where.resale_type = 2
+					this.emptyShow = false
+					this.datatlist = []
 				}
 
 				getCommunityList(this.where).then(res => {
 					if (res.status == 200) {
-						this.datatlist.push(...res.data.list)
 						if (res.data.list.length < this.where.limit) this.status = 'nomore'
-						if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+						if (this.where.page == 1 && res.data.list.length == 0) this.emptyShow = true
+						this.datatlist.push(...res.data.list)
+
 					}
 
 				})
@@ -187,19 +197,25 @@
 			getlist(index) {
 				if (this.num == 0) {
 					this.where.resale_type = ''
-					this.datatlist=[]
+					this.emptyShow = false
 				} else if (this.num == 1) {
 					this.where.resale_type = 1
-						this.datatlist=[]
+					this.emptyShow = false
 				} else {
 					this.where.resale_type = 2
-				    this.datatlist=[]
+					this.emptyShow = false
 				}
 				getCommunityList(this.where).then(res => {
 					if (res.status == 200) {
+
+						if (res.data.list.length < this.where.limit) {
+							this.status = 'nomore'
+						}
+						if (this.where.page == 1 && res.data.list.length <= 0) {
+							this.emptyShow = true
+
+						}
 						this.datatlist.push(...res.data.list)
-						if (res.data.list.length < this.where.limit) this.status = 'nomore'
-						if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
 					}
 
 				})
@@ -220,10 +236,14 @@
 				this.visible = false
 			},
 			menuAction(action, rowId) {
-				// console.log(action);
+
 				// 忽略初始化时的传入的空操作
-				this.num = action
-				this.getlist(action)
+
+				if (action) {
+					this.num = action
+					this.getlist(action)
+				}
+
 				if (action === '') {
 					this.recomname = this.options[0].text
 				} else {
diff --git a/static/images/delegation.png b/static/images/delegation.png
new file mode 100644
index 0000000..5e3ac4f
Binary files /dev/null and b/static/images/delegation.png differ
diff --git a/static/images/dong.gif b/static/images/dong.gif
new file mode 100644
index 0000000..3c5e939
Binary files /dev/null and b/static/images/dong.gif differ