组合购内容、样式调整

后端研发-苏泰源
1 parent c2769c74
Showing 3 changed files with 11 additions and 7 deletions
packageB/pages/zuhegou/index/index.json
packageB/pages/zuhegou/index/index.wxml
packageB/pages/zuhegou/index/index.wxss
 {
   "usingComponents": {
-		"catch": "/packageB//components/catch/catch",
+		"catch": "/packageB/components/catch/catch",
 		"nodata": "/components/nodata/nodata",
 		"painter": "/packageB/components/painter/painter",
 	    "warn": "/components/long_warn/long_warn"
@@ -16,7 +16,7 @@
     </view>
-    <view class="c_w mt20 fs32">门店:
+    <view class="c_w mt20 fs28">门店:
        <block  wx:if="{{def_pick_store}}">
            <text wx:if="{{all_price>0}}">{{def_pick_store.pickup_name}}</text>
            <text wx:else  bindtap="choose_store">{{def_pick_store.pickup_name}}</text>
@@ -77,16 +77,16 @@
     <view class="bar-container">
         <block wx:if="{{all_num>=act.zhbuyqty}}">
             <view wx:if="{{need_to_buy}}" class="t-c bg-fcfb c-fa8b2b fs28 pd20">
-                再买{{need_to_buy}}件，下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】
+                再买{{need_to_buy}}件，下单立享【{{act.zhprice}}元选择{{act.zhbuyqty}}件】
             </view>
-            <view wx:else class="t-c bg-fcfb c-fa8b2b fs28 pd20">下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】</view>
+            <view wx:else class="t-c bg-fcfb c-fa8b2b fs28 pd20">下单立享【{{act.zhprice}}元选择{{act.zhbuyqty}}件】</view>
         </block>
         <block wx:else>
                 <view wx:if="{{all_num>0}}" class="t-c bg-fcfb c-fa8b2b fs28 pd20">
-                    再买{{act.zhbuyqty-all_num>need_to_buy?act.zhbuyqty-all_num:need_to_buy}}件，下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】
+                    再买{{act.zhbuyqty-all_num>need_to_buy?act.zhbuyqty-all_num:need_to_buy}}件，下单立享【{{act.zhprice}}元选择{{act.zhbuyqty}}件】
                 </view>
                 <view wx:else class="t-c bg-fcfb c-fa8b2b fs28 pd20">
-                    买{{act.zhbuyqty}}件，下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】
+                    买{{act.zhbuyqty}}件，下单立享【{{act.zhprice}}元选择{{act.zhbuyqty}}件】
                 </view>
         </block>
         <view class="flex jc_sb ai_c pd20">
@@ -118,7 +118,7 @@
             <view class="pdt40">
                 <view class="pdb20">活动内容</view>
                 <view class="">
-                    <view class="pdb10">{{act.remark}}</view>
+                    <view class="pdb10">{{filters.show_default(act.remark, '无')}}</view>
                 </view>
             </view>
         </block>
@@ -35,6 +35,10 @@ page {
 	font-size: 24rpx;
 }
+.icon-zhuanfa {
+	line-height: 1;
+}
+
 .list-container {
 	padding-top: 30rpx;
 }