diff --git a/components/cart_collect_temp/cart_collect_temp.js b/components/cart_collect_temp/cart_collect_temp.js index a1558a6..2855ac0 100644 --- a/components/cart_collect_temp/cart_collect_temp.js +++ b/components/cart_collect_temp/cart_collect_temp.js @@ -25,6 +25,10 @@ Component({ pick:{ type: Number, value: 1 + }, + appoint_pick_keyid:{ + type: String, + value: '' } }, diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index cbbc34a..da516be 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -1919,7 +1919,7 @@ Page({ storeId: os.stoid } if (sales_rules == 2) { - sto_req.storageNos = item.pickup_no + sto_req.storageNos = pick.pickup_no } else { sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid) } diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml index 15db11f..fb96af6 100644 --- a/packageA/pages/prom_list/prom_list.wxml +++ b/packageA/pages/prom_list/prom_list.wxml @@ -92,7 +92,7 @@ - + {{def_pick_store.pickup_name}} 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} diff --git a/packageA/pages/prom_list/prom_list.wxss b/packageA/pages/prom_list/prom_list.wxss index 30ba685..c887975 100644 --- a/packageA/pages/prom_list/prom_list.wxss +++ b/packageA/pages/prom_list/prom_list.wxss @@ -173,6 +173,8 @@ } .shop_name{ margin-right: 10rpx; + width: 350rpx; + flex-shrink: 0; } .address{ width: 99%; @@ -188,6 +190,8 @@ color: #999; height: 38rpx; line-height: 38rpx; + position: relative; + top: 5rpx; } .sto_v .title,.sto_v .stitle{ border-top: 1rpx solid #dedede;border-bottom: 1rpx solid #dedede; height: 78rpx; line-height: 78rpx;} .sto_v .title .tubiao,.sto_v .stitle .tubiao{width: 32rpx; height: 32rpx; margin-top: 23rpx;} @@ -235,6 +239,7 @@ } .address_name{ margin-right: 10rpx; + width: 360rpx; } .address-val{ diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 80f61ba..199a212 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -140,7 +140,8 @@ Page({ cart_commission:0, //订单所有搭配购的 - all_collocation_list:[] + all_collocation_list:[], + appoint_pick_keyid:'' }, onLoad: function (t) { diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index e5bf56f..dd0baa4 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -110,7 +110,7 @@ @@ -377,7 +377,9 @@ - +