diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 09369c9..55a19c8 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -39,7 +39,6 @@
 						暂存
 					</view>
 				</scroll-view>
-
 			</view>
 		</view>
 
@@ -107,27 +106,37 @@
 				<view class="item">
 					<view class="order-num acea-row row-middle">
 						暂存单号：{{ item.order_sn  }}
-						 <text class="time">暂存时间：{{ item.c_time }}</text>
+						<text class="time">暂存时间：{{ item.c_time }}</text>
 						<text class="fk_status" v-if="item.order_status == 0">未支付</text>
 						<text class="fk_status" v-if="item.order_status == 1">
 							<view>待核销</view>
-							<view  style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
+							<view style="color: #FFE4BF;"
+								v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">
+								退款中</view>
 						</text>
 						<text class="fk_status" v-if="item.order_status == 2">
-							<view>待发货</view>	
-							<view style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
+							<view>待发货</view>
+							<view style="color: #FFE4BF;"
+								v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">
+								退款中</view>
 						</text>
 						<text class="fk_status" v-if="item.order_status == 3">
 							<view>待收货</view>
-							<view style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
+							<view style="color: #FFE4BF;"
+								v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">
+								退款中</view>
 						</text>
 						<text class="fk_status" v-if="item.order_status == 4">
 							<view>待评价</view>
-							<view style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
+							<view style="color: #FFE4BF;"
+								v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">
+								退款中</view>
 						</text>
 						<text class="fk_status" v-if="item.order_status == 5">
 							<view>交易完成</view>
-							<view style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
+							<view style="color: #FFE4BF;"
+								v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">
+								退款中</view>
 						</text>
 						<text class="fk_status" v-if="item.refund_mark == 1">
 							<view>退款成功</view>
@@ -157,14 +166,14 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="public-total" v-if="item.refund_mark == 1">
 						共{{ item.total_num }}件商品，
 						已退款
 						<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费
 						¥{{ item.pay_postage}})
 					</view>
-					
+
 					<view class="public-total" v-else>
 						共{{ item.total_num }}件商品，
 						<span v-if="item.order_status < 1">应</span>
@@ -181,7 +190,8 @@
 							<view class="bnt bnt_color" v-if="item.order_status == 1" @click="toDetail(item)">去核销</view>
 							<view class="bnt bnt_color" v-if="item.order_status == 2" @click="toPostagequ(item)">去发货
 							</view>
-							<navigator class="bnt bnt_color" v-if="!!item.refund_order_id && item.refund_status != -1 && item.refund_status!=3"
+							<navigator class="bnt bnt_color"
+								v-if="!!item.refund_order_id && item.refund_status != -1 && item.refund_status!=3"
 								:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">
 								立即退款
 							</navigator>
@@ -950,7 +960,7 @@
 		position: absolute;
 		right: 20rpx;
 		top: 50%;
-	    transform: translateY(-50%);
+		transform: translateY(-50%);
 	}
 
 	.pos-order-list .list .item .order-status {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8c98a54..931791b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,16 +52,11 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="content-open" v-if='!isshow' @click="open">
-      <image src="@/static/images/zk.png" mode="aspectFit"></image>
-    </view> -->
 
 		<div v-if='isshow' style="margin-top: 80rpx;">
-			<!-- // type=price&time=today&merId=1 -->
 			<view class="tools-one"
 				style="font-size: 33rpx;font-family: PingFang SC-Medium, PingFang SC;font-weight: 500;color: #333333; margin-left: 30rpx;margin-bottom: 30rpx;">
 				订单数据统计
-
 			</view>
 			<ordertime ref='test' type='price' timetype='today' :merid='userInfoData.service.mer_id'></ordertime>
 		</div>
@@ -75,7 +70,6 @@
 					<view class="content-order-one">
 						{{item.name}}
 					</view>
-
 				</view>
 			</view>
 
@@ -120,7 +114,6 @@
 				</view>
 			</view>
 
-
 			<view class="content-list">
 				<view style="width: 100%;background-color: #fff;">
 					<view class="tools-one">
@@ -899,6 +892,7 @@
 				if (index == 3) url = "/pages/activeCode/subsidy";
 				if (index == 1) url = "/pages/admin/orderList/index?merId=" + this.userInfoData.service.mer_id +
 					"&types=88";
+				if (index == 5) url = "/pages/admin/orderList/index?merId=" + this.userInfoData.service.mer_id + '&types=';
 
 				uni.navigateTo({
 					url: url
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 6e30d12..7856f14 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -86,7 +86,7 @@
 														<view class='name line1'>
 															<!-- <text
 																class="event_name event_bg">预售</text> -->
-                                <text>{{goods.cart_info.product.store_name}}</text>
+															<text>{{goods.cart_info.product.store_name}}</text>
 															<view class="event_ship event_color">发货时间：
 																<!--全款预售-->
 																<text
@@ -161,7 +161,7 @@
 											<view class="store-name">{{item.merchant.mer_name}}</view>
 											<text class="iconfont icon-xiangyou"></text>
 										</view>
-										
+
 										<view v-if="item.order_status ==7" class='t-color'>
 											<text
 												v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
@@ -170,10 +170,12 @@
 										<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
 										<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
 										<view v-if="item.order_status == 3" class='t-color'>待收货</view>
-										<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价</view>
+										<view v-if="item.order_status == 4 && item.pay_type !== 8" class='t-color'>待评价
+										</view>
 										<view v-if="item.order_status == 5" class='t-color'>已完成</view>
 										<view v-if="item.order_status == 6" class='t-color'>已退款</view>
-										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算</view>
+										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
+										</view>
 
 									</view>
 									<view v-if="item.activity_type === 2">
@@ -189,7 +191,7 @@
 													<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
 														<!-- <text
 															class="event_name event_bg">预售</text> -->
-                              <text>{{goods.cart_info.product.store_name}}</text>
+														<text>{{goods.cart_info.product.store_name}}</text>
 														<view v-if="item.status == 0" class="event_ship event_color">发货时间：
 															<!--全款预售-->
 															<text
@@ -252,8 +254,8 @@
 									</view>
 								</view>
 								<view class='bottom acea-row row-right row-middle'>
-									<view v-if="!item.receipt && item.status != -1 && (item.status != 0)" class='bnt cancelBnt'
-										@click.stop='applyInvoice(item.order_id)'>申请开票</view>
+									<view v-if="!item.receipt && item.status != -1 && (item.status != 0)"
+										class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
 									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
 										<view class='bnt b-color' @click='goOrderDetails(item.order_id, item)'>查看详情</view>
 									</block>
@@ -261,7 +263,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">
 										<!-- 
@@ -345,7 +347,9 @@
 		import {
 			HTTP_REQUEST_URL
 		} from '@/config/app';
-    import { Toast } from '../../../libs/uniApi';
+		import {
+			Toast
+		} from '../../../libs/uniApi';
 		export default {
 			components: {
 				payment,
@@ -492,9 +496,9 @@
 				 * 生命周期函数--监听页面加载
 				 */
 				onLoad: function(options) {
-						
+
 					if (options.status) this.orderStatus = options.status;
-				
+
 				},
 				/**
 				 * 获取订单统计数据
@@ -504,7 +508,7 @@
 					let that = this;
 					orderData({
 						product_type: 0,
-            source: 103
+						source: 103
 					}).then(res => {
 						that.$set(that, 'orderData', res.data);
 					})
@@ -571,7 +575,7 @@
 				goOrderDetails: function(order_id, item) {
 
 					let self = this
-            
+
 					if (!order_id) return that.$util.Tips({
 						title: '缺少订单号无法查看订单详情'
 					});
@@ -581,7 +585,7 @@
 					})
 					openOrderSubscribe().then(() => {
 						uni.hideLoading();
-						if (self.orderStatus == 0 || (item&&item.order_status==1)) {
+						if (self.orderStatus == 0 || (item && item.order_status == 1)) {
 							uni.navigateTo({
 								url: '/pages/order_details/stay?order_id=' + order_id
 							})
@@ -599,7 +603,7 @@
 					})
 					// #endif
 					// #ifndef MP
-					if (self.orderStatus == 0||(item&&item.order_status==1)) {
+					if (self.orderStatus == 0 || (item && item.order_status == 1)) {
 						uni.navigateTo({
 							url: '/pages/order_details/stay?order_id=' + item.group_order_id
 						})
@@ -631,7 +635,7 @@
 							url: '/pages/order_details/stay?order_id=' + item.order_id
 						})
 					} else {
-            if(!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
+						if (!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
 						uni.navigateTo({
 							url: `/pages/users/goods_comment_con/index?uni=${item.orderProduct[0].order_product_id}&order_id=${item.order_id}`
 						})
@@ -643,7 +647,7 @@
 							url: '/pages/order_details/stay?order_id=' + item.order_id
 						})
 					} else {
-            if(!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
+						if (!item.orderProduct[0]?.order_product_id) return Toast('无法评价该商品')
 						uni.navigateTo({
 							url: `/pages/users/goods_comment_con/index?uni=${item.orderProduct[0].order_product_id}&order_id=${item.order_id}`
 						})
@@ -678,7 +682,7 @@
 								page: that.page,
 								limit: that.limit,
 								product_type: 0,
-                source: 103
+								source: 103
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -706,7 +710,7 @@
 								page: that.page,
 								limit: that.limit,
 								product_type: 0,
-                source: 103
+								source: 103
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
@@ -735,7 +739,7 @@
 						status: 10,
 						page: 1,
 						limit: 1,
-            source: 103
+						source: 103
 					}).then(res => {
 						let list = res.data.list || [];
 						that.presellOrderCount = res.data.count;