搭配购优化

yvan.ni
1 parent 87358ad0
Showing 6 changed files with 17 additions and 5 deletions
components/cart_collect_temp/cart_collect_temp.js
packageA/pages/prom_list/prom_list.js
packageA/pages/prom_list/prom_list.wxml
packageA/pages/prom_list/prom_list.wxss
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
@@ -25,6 +25,10 @@ Component({
         pick:{
             type: Number,
             value: 1
+        },
+        appoint_pick_keyid:{
+            type: String,
+            value: ''
         }
     },
@@ -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)
 				}
@@ -92,7 +92,7 @@
                <view style="clear: both"></view>
                 <!-- 选择门店模块 -->
                 <view  class="flex-space-between address ai_end xc-width ">
-                    <view class="flex ai_end" wx:if="{{def_pick_store}}">
+                    <view class="flex" style="align-items: flex-start;" wx:if="{{def_pick_store}}">
                         <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
                         <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
                             距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
@@ -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{
@@ -140,7 +140,8 @@ Page({
         cart_commission:0,
         //订单所有搭配购的
-        all_collocation_list:[]
+        all_collocation_list:[],
+        appoint_pick_keyid:''
     },
     onLoad: function (t) {
@@ -110,7 +110,7 @@
 				<!-- 使用搭配 -->
 				<cart_collect_temp  bind:childFun="select_coll" sales_rules="{{sales_rules}}" pick="{{item.pickup_id}}"
-						is_cart="1" cart_index="{{index}}"
+						is_cart="1" cart_index="{{index}}" appoint_pick_keyid="{{appoint_pick_keyid}}"
 						all_collocation_list="{{item.collocationList}}"  />
 				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
@@ -377,7 +377,9 @@
 			</block>
 			<!-- 使用搭配 -->
-			<cart_collect_temp  bind:childFun="select_coll"  all_collocation_list="{{all_collocation_list}}"  sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
+			<cart_collect_temp  bind:childFun="select_coll"    all_collocation_list="{{all_collocation_list}}"
+								appoint_pick_keyid="{{appoint_pick_keyid}}"
+								sales_rules="{{sales_rules}}" pick="{{bn_pick}}" />
 			<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->