diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 05052d6..b151b14 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -327,7 +327,7 @@
},
mounted: function() {
let that = this;
- this.$store.dispatch('USERINFO', true)
+ this.$store.dispatch('getUser', true)
that.getCartInfo();
if (that.$yroute.query.pinkid !== undefined)
that.pinkId = that.$yroute.query.pinkid;
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 94ec59f..970cd91 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -118,7 +118,7 @@
@@ -441,8 +441,10 @@ export default {
},
//全选
allChecked: function(e) {
+ console.log(e)
let that = this;
- let selectAllStatus = e.mp.detail.value[0] ? true : false;
+ let selectAllStatus = e.mp.detail.value[0]=='allSelect' ? true : false;
+ console.log(selectAllStatus)
// let selectAllStatus = that.isAllSelect;
let checkedIds = [];
// for (let i = 0; i < array.length; i++) {
@@ -460,6 +462,7 @@ export default {
};
that.cartList = [];
that.cartList = cartList;
+ console.log(this.cartList)
this.$set(this, 'cartList', this.cartList);
this.$set(this, 'isAllSelect', selectAllStatus);
this.checkedIds = checkedIds;
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index ffed25d..0fb71d0 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -146,15 +146,12 @@
-->
- By@意象
+ By@Yshop
Copyright © 2020
-
- 漯河市大有前途网络科技有限公司
-