1

pages/order_addcart/order_addcart.vue

@@ -311,7 +311,7 @@
 				this.getCartNum();
 				this.goodsHidden = true;
 				this.footerswitch = true;
-				this.isAllSelect = true; //全不选
+				this.isAllSelect = false; //全不选
 				this.selectValue = []; //选中的数据
 				this.isShowAuth = false;
 				uni.setStorage({
@@ -996,11 +996,12 @@
 	}
 	.shoppingCart .list {
 		margin: 171rpx 0 20rpx;
+		 padding-bottom: 150rpx;
 	}
 	.shoppingCart .list .item {
 		background-color: #fff;
-		padding-bottom: 150rpx;
-		// margin-bottom: 15rpx;
+		// padding-bottom: 150rpx;
+		margin-bottom: 15rpx;
 		.store-title {
 			display: flex;
 			align-items: center;

pages/users/order_list/search.vue

@@ -110,7 +110,11 @@
 										<view class="store-name">{{item.merchant.mer_name}}</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
-									<view v-if="item.status == 0" class='t-color'>待发货</view>
+									<view v-if="item.status == 0" class='t-color'>
+										<text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+										<text v-else>待发货</text>
+									</view>
+									<!-- <view v-if="item.status == 0" class='t-color'>待发货</view> -->
 									<view v-if="item.status == 1" class='t-color'>待收货</view>
 									<view v-if="item.status == 2" class='t-color'>待评价</view>
 									<view v-if="item.status == 3" class='t-color'>已完成</view>

pages/users/refund/confirm.vue

@@ -6,8 +6,7 @@
 			</view>
 			<view class="info">
 				<view class="name line1"><text v-if="order_status == 2" class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}</view>
-				<view class="price"><text>￥
-				{{ order_status == 3 ? item.cart_info.productAssistAttr.assist_price : order_status == 4 ? item.cart_info.activeSku.active_price : item.cart_info.productAttr.price}}</text> <text>×{{item.refund_num}}</text></view>
+				<view class="price"><text>￥{{ order_status == 3 ? item.cart_info.productAssistAttr.assist_price : order_status == 4 ? item.cart_info.activeSku.active_price : item.cart_info.productAttr.price}}</text> <text>×{{item.refund_num}}</text></view>
 			</view>
 		</view>
 		<view class="form-box">