Sfoglia il codice sorgente

feat(pages) feat 样式

clp 3 anni fa
parent
commit
bc7468859a

+ 7 - 6
app.json

@@ -82,17 +82,18 @@
         "selectedIconPath": "images/welfareMall/home-active.png",
         "iconPath": "images/welfareMall/home.png"
       },
-      {
-        "text": "套餐",
-        "pagePath": "pages/groupmeallist/storeGoods/storeGoods",
-        "selectedIconPath": "images/groupmeallist/selectionCombo.png",
-        "iconPath": "images/groupmeallist/combo.png"
-      },
+  
       {
         "text": "我的",
         "pagePath": "pages/welfareMall/personal/personal",
         "selectedIconPath": "images/welfareMall/user-active.png",
         "iconPath": "images/welfareMall/user.png"
+      },
+      {
+        "text": "套餐",
+        "pagePath": "pages/groupmeallist/storeGoods/storeGoods",
+        "selectedIconPath": "images/groupmeallist/selectionCombo.png",
+        "iconPath": "images/groupmeallist/combo.png"
       }
     ]
   },

+ 20 - 19
pages/groupmeallist/storeGoods/storeGoods.wxml

@@ -25,7 +25,7 @@
                   <view class="PositionDiv_addAndicon flex-row">
                     <view style="font-weight: 700;font-size:32rpx">¥ {{goods.priceY}}</view>
                     <view class="PositionDiv_icon flex-row">
-                      <sapn wx:if="{{goods.chooseNum >0}}">{{goods.chooseNum}}</sapn>
+                      <sapn wx:if="{{goods.chooseNum >0}}" style="margin-right: 10rpx;font-size: 32rpx; ">{{goods.chooseNum}}</sapn>
                       <image style="width: 38rpx;height:38rpx;" src="/images/groupmeallist/PositionDiv_icon.png"></image>
                     </view>
                   </view>
@@ -71,15 +71,15 @@
             <!-- 循环购物车 -->
 
             <view wx:for="{{cartSkuMapData}}" wx:key="index" class="shop_car_foods">
-              <view class="flex-column">
+              <view class="flex-column" style="    border-bottom: 2rpx solid #e9e9e9;">
                 <view class="shop_car_foods_title flex-row-between">
                   <!-- 可能存在优惠标识 -->
                   <view class="shop_car_foods_title_left flex-row">
-                    <view style="max-width: 370rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-left: 28rpx;"> 清爽夏日套餐</view>
+                    <view style="max-width: 370rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-left: 28rpx;"> {{item.productName}}</view>
                     <view catchtap="changeCollapseOrDetail" class="Collapse_and_details" data-idx="{{index}}">{{cartSkuMapData[index].show == true ? '收起' : '详情'}}</view>
                   </view>
                   <view class="shop-cart-price-wrap">
-                    <view style="font-size: 32rpx;font-weight:700;margin-right: 14rpx;">¥ 58.8</view>
+                    <view style="font-size: 32rpx;font-weight:700;margin-right: 14rpx;">¥ {{item.totalPriceY}}</view>
                     <view class="flex-row" style="height: 45rpx;line-height: 45rpx;text-align: center;">
 
                       <view data-goodsid="{{item.goodsId}}" data-skuid="{{item.skuId}}" catchtap="handleSubToCart" data-combo="{{item.comboSkuList}}">
@@ -94,24 +94,25 @@
 
 
                   </view>
+             
                 </view>
-
                 <view wx:if="{{item.comboSkuList!= null}}" class="shop_car_foods_spec {{cartSkuMapData[index].show != true ?'hide':''}}">
-                  <!-- 规格 -->
-                  套餐:
-                  <block wx:for="{{item.comboSkuList}}" wx:for-item="combo" wx:key="comboIdx">
-                    <!-- {{combo.setsName}}: -->
-                    <view style="display: inline;" wx:for="{{combo.skuList}}" wx:for-item="skuItem" wx:key="skuItemIdx">
-                      {{skuItem.productName}}<block wx:if="{{skuItem.specList.length>0}}">(</block>
-                      <block style="display: inline;" wx:for="{{skuItem.specList}}" wx:for-item="spec" wx:key="specIdx">
-                        <text>{{spec.specValue}}</text>
-                      </block>
-                      <block wx:if="{{skuItem.specList.length>0}}">)</block>
-                      x{{skuItem.num}}
-                    </view>
+                    <!-- 规格 -->
+                    套餐:
+                    <block wx:for="{{item.comboSkuList}}" wx:for-item="combo" wx:key="comboIdx">
+                      <!-- {{combo.setsName}}: -->
+                      <view style="display: inline;" wx:for="{{combo.skuList}}" wx:for-item="skuItem" wx:key="skuItemIdx">
+                        {{skuItem.productName}}<block wx:if="{{skuItem.specList.length>0}}">(</block>
+                        <block style="display: inline;" wx:for="{{skuItem.specList}}" wx:for-item="spec" wx:key="specIdx">
+                          <text>{{spec.specValue}}</text>
+                        </block>
+                        <block wx:if="{{skuItem.specList.length>0}}">)</block>
+                        x{{skuItem.num}}
+                      </view>
+
+                    </block>
+                  </view>
 
-                  </block>
-                </view>
 
 
               </view>

+ 5 - 5
pages/groupmeallist/storeGoods/storeGoods.wxss

@@ -224,8 +224,8 @@ margin-top: 7rpx;
   }
 .shop_car_foods_title{
     width: 100%;
-    min-height: 100rpx;
-    border-bottom: 2rpx solid #e9e9e9;
+    min-height: 80rpx;
+
     font-size: 32rpx;
     font-weight: bold;
     line-height: 45rpx;
@@ -337,7 +337,7 @@ margin-top: 7rpx;
   display: none !important;
  }
 .shop_car_foods_spec {
-    width: 300px;
+    width: 250px;
     /* height: 32px; */
     font-size: 24rpx;
     line-height: 32rpx;
@@ -347,8 +347,8 @@ margin-top: 7rpx;
     justify-content: center;
     align-self: start;
     margin-left: 28rpx;
-    margin-top: 10rpx;
-    /* padding-bottom: 10rpx; */
+    /* margin-top: 10rpx; */
+    padding-bottom: 10rpx;
   }
   .commodity_attr_box_delAll {
     width: 540rpx;

+ 1 - 3
pages/groupmeallist/storeList/storeList.wxml

@@ -66,10 +66,8 @@
 
                             </view>
                             <view style="width: 0px;height: 190rpx;border-left: 1px solid #ececec;"></view>
-                            <view class="store_right flex-column_start_center">
+                            <view class="store_right flex-column_start_center" style="justify-content: center;">
                                 <view style="height: 27rpx;font-size: 20rpx;margin-top: 12rpx;font-weight: 400;text-align: left;color: #000000;">距离{{store.distance}}km</view>
-
-
                             </view>
                         </view>
 

+ 35 - 0
project.private.config.json

@@ -751,6 +751,41 @@
                     "name": "",
                     "pathName": "pages/welfareMall/historical/historical",
                     "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/index/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/storeList/storeList",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/storeList/storeList",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/storeGoods/storeGoods",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/groupmeallist/storeGoods/storeGoods",
+                    "query": "",
                     "scene": null,
                     "launchMode": "default"
                 }