diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 8dccc95..e7d04c9 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/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;
diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue
index 5824c44..761cce7 100644
--- a/pages/users/order_list/search.vue
+++ b/pages/users/order_list/search.vue
@@ -110,7 +110,11 @@
{{item.merchant.mer_name}}
- 待发货
+
+ {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}
+ 待发货
+
+
待收货
待评价
已完成
diff --git a/pages/users/refund/confirm.vue b/pages/users/refund/confirm.vue
index 8784a70..50cd02b 100644
--- a/pages/users/refund/confirm.vue
+++ b/pages/users/refund/confirm.vue
@@ -6,8 +6,7 @@
预售{{item.cart_info.product.store_name}}
- ¥
- {{ order_status == 3 ? item.cart_info.productAssistAttr.assist_price : order_status == 4 ? item.cart_info.activeSku.active_price : item.cart_info.productAttr.price}} ×{{item.refund_num}}
+ ¥{{ order_status == 3 ? item.cart_info.productAssistAttr.assist_price : order_status == 4 ? item.cart_info.activeSku.active_price : item.cart_info.productAttr.price}} ×{{item.refund_num}}