diff --git a/pages/user/index.vue b/pages/user/index.vue
index e448404..034fda6 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -664,6 +664,13 @@
 									openType = 1;
 								else
 									openType = 2;
+								// 没有同意协议 就是一般用户  不是商户
+								let user = this.$store.state.app.userInfo;
+								if (!user.mer_info || !user.mer_info.mer_settlement_agree_status || user
+									.mer_info.mer_settlement_agree_status != 1) {
+									openType = 1;
+								}
+
 								item.url = '/pages/users/order_list/index?status=2&openType=' + openType
 								break
 							case '待评价':
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 2ce0bbe..a240c14 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -31,7 +31,8 @@
 					</view>
 					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
 						<view>待收货</view>
-						<view class='num '>{{orderData.noDeliver || 0}}</view>
+						<view class='num' v-if="sale_type == 1">{{(Number(orderData.noDeliver)) || 0}} </view>
+						<view class='num' v-else>{{( Number(orderData.mer_noDeliver)) || 0}} </view>
 					</view>
 					<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
 						<view>待评价</view>