|
@@ -17,7 +17,7 @@ function _queryFromServiceAsync(fn) { |
|
@@ -17,7 +17,7 @@ function _queryFromServiceAsync(fn) { |
17
|
|
17
|
|
18
|
args[0] = args[0] || {};
|
18
|
args[0] = args[0] || {};
|
19
|
Object.assign(args[0], {
|
19
|
Object.assign(args[0], {
|
20
|
- appType: app.getAppType()
|
20
|
+ app_type: app.getAppType()
|
21
|
});
|
21
|
});
|
22
|
|
22
|
|
23
|
return fn(...args);
|
23
|
return fn(...args);
|
|
@@ -53,7 +53,6 @@ Page({ |
|
@@ -53,7 +53,6 @@ Page({ |
53
|
},
|
53
|
},
|
54
|
onShow() {
|
54
|
onShow() {
|
55
|
this.getCartData();
|
55
|
this.getCartData();
|
56
|
-
|
|
|
57
|
},
|
56
|
},
|
58
|
onHide: function () {
|
57
|
onHide: function () {
|
59
|
if (this.data.isEditing) {
|
58
|
if (this.data.isEditing) {
|
|
@@ -96,7 +95,9 @@ Page({ |
|
@@ -96,7 +95,9 @@ Page({ |
96
|
} else {
|
95
|
} else {
|
97
|
return Promise.reject();
|
96
|
return Promise.reject();
|
98
|
}
|
97
|
}
|
99
|
- }).catch(() => {});
|
98
|
+ }).catch(() => {
|
|
|
99
|
+ this.setData({isEmptyCart: true});
|
|
|
100
|
+ });
|
100
|
},
|
101
|
},
|
101
|
editCartStatus(e) {
|
102
|
editCartStatus(e) {
|
102
|
let data = {isEditing: !this.data.isEditing};
|
103
|
let data = {isEditing: !this.data.isEditing};
|
|
@@ -170,7 +171,7 @@ Page({ |
|
@@ -170,7 +171,7 @@ Page({ |
170
|
chooseGoodsBundle(e) {
|
171
|
chooseGoodsBundle(e) {
|
171
|
let bundle = e.detail;
|
172
|
let bundle = e.detail;
|
172
|
|
173
|
|
173
|
- this.editCart(bundle.goods_list, selected);
|
174
|
+ this.editCart(bundle.goods_list, bundle.selected);
|
174
|
},
|
175
|
},
|
175
|
editGoodsNum(e) {
|
176
|
editGoodsNum(e) {
|
176
|
let goods = e.detail;
|
177
|
let goods = e.detail;
|