diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 247dbf6..26694ba 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3478,6 +3478,7 @@ Page({
if (res.data.data.pageData && res.data.data.pageData.length > 0) {
+ var def_pick_store = th.data.def_pick_store;
var plist = res.data.data.pageData;
if(th.data.sales_rules==3) {
var lock_num = 0;
@@ -3494,7 +3495,7 @@ Page({
if (th.data.fir_def_store &&
(g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || (th.data.def_pick_store && th.data.def_pick_store.distr_type == g_distr_type))) {
th.data.fir_def_store.Qty;
- if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
+ if (def_pick_store && def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
th.setData({def_pick_store: th.data.fir_def_store})
is_find_def_store = 1;
}
@@ -3506,7 +3507,7 @@ Page({
}else {
- var def_pick_store = th.data.def_pick_store;
+
//以原来的数组为外循环,保证距离的顺序
for (var kk in o_plist) {
for (var ii in plist) {
@@ -3523,7 +3524,7 @@ Page({
//--如果找到默认门店,同时也应该判断配送方式对不对--
if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) {
th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num;
- if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
+ if (def_pick_store && def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
th.setData({def_pick_store: th.data.fir_def_store})
is_find_def_store = 1;
}
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index ea9dea2..bf39a1a 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -600,9 +600,12 @@ Page({
async jumpToCart4(t) {
if(this.data.paying) return false;
- this.setData({paying:1});
-
+ //this.setData({paying:1});
var o_index = t.currentTarget.dataset.idx;
+ var txt="paying["+o_index+"]";
+ this.setData({[txt]:1});
+
+
var e = this.data.orderList[o_index];
var th = this;
var order = e;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 8dccf51..6d42e4b 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -273,7 +273,7 @@