fe / yoho-miniapp-eshop · Commits

Go to a project

Authored by 李奇
Commit 1b61179dc9dc843339130c2c106a9b9211604258 1 parent 8f17a2ec

业务线修改

Inline Side-by-side
Showing 5 changed files with 126 additions and 40 deletions
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 bindclickreport="report" 4 bindclickreport="report"
5 wx:if="{{item.module_type == 'CarouselImage'}}" 5 wx:if="{{item.module_type == 'CarouselImage'}}"
6 images="{{item.data}}" 6 images="{{item.data}}"
  7 + properties="{{item.properties}}"
7 padding-class="{{'padding-bottom-20'}}" 8 padding-class="{{'padding-bottom-20'}}"
8 floor-id="{{item.template_id}}" 9 floor-id="{{item.template_id}}"
9 floor-name="{{item.template_name}}" 10 floor-name="{{item.template_name}}"
@@ -13,6 +14,7 @@ @@ -13,6 +14,7 @@
13 bindclickreport="report" 14 bindclickreport="report"
14 wx:if="{{item.module_type == 'SingleImage'}}" 15 wx:if="{{item.module_type == 'SingleImage'}}"
15 images="{{item.data}}" 16 images="{{item.data}}"
  17 + properties="{{item.properties}}"
16 padding-class="{{'padding-bottom-20'}}" 18 padding-class="{{'padding-bottom-20'}}"
17 floor-id="{{item.template_id}}" 19 floor-id="{{item.template_id}}"
18 floor-name="{{item.template_name}}" 20 floor-name="{{item.template_name}}"
@@ -22,6 +24,7 @@ @@ -22,6 +24,7 @@
22 bindclickreport="report" 24 bindclickreport="report"
23 wx:if="{{item.module_type == 'DoubleImage'}}" 25 wx:if="{{item.module_type == 'DoubleImage'}}"
24 images="{{item.data}}" 26 images="{{item.data}}"
  27 + properties="{{item.properties}}"
25 padding-class="{{'padding-bottom-20'}}" 28 padding-class="{{'padding-bottom-20'}}"
26 floor-id="{{item.template_id}}" 29 floor-id="{{item.template_id}}"
27 floor-name="{{item.template_name}}" 30 floor-name="{{item.template_name}}"
@@ -31,6 +34,7 @@ @@ -31,6 +34,7 @@
31 bindclickreport="report" 34 bindclickreport="report"
32 wx:if="{{item.module_type == 'FourImage'}}" 35 wx:if="{{item.module_type == 'FourImage'}}"
33 images="{{item.data}}" 36 images="{{item.data}}"
  37 + properties="{{item.properties}}"
34 padding-class="{{'padding-bottom-20'}}" 38 padding-class="{{'padding-bottom-20'}}"
35 floor-id="{{item.template_id}}" 39 floor-id="{{item.template_id}}"
36 floor-name="{{item.template_name}}" 40 floor-name="{{item.template_name}}"
  1 +.resource-shop-single-image {
  2 + font-size: 0;
  3 +}
  4 +
1 .resource-shop-single-image .image { 5 .resource-shop-single-image .image {
2 width: 750rpx; 6 width: 750rpx;
3 } 7 }
1 -<wxs src="../../../../wxs/helper.wxs" module="helper" />  
2 <view class="resource-shop-triple-image {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}"> 1 <view class="resource-shop-triple-image {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}">
3 - <anchor  
4 - wx:for="{{images}}"  
5 - wx:key="index"  
6 - class="anchor-item"  
7 - bindclickreport="report"  
8 - url="{{item.url}}"  
9 - floor-id="{{floorId}}"  
10 - floor-name="{{floorName}}"  
11 - floor-url="{{item.url}}"  
12 - floor-index="{{floorIndex}}"  
13 - floor-item-index="{{index + 1}}">  
14 - <view wx:if="{{properties.displayType == 1}}">  
15 - <image class="image-item" src="{{item.pic}}" mode="widthFix"></image>  
16 - </view>  
17 - <view wx:if="{{properties.displayType == 2}}">  
18 - <image class="image-item" src="{{item.pic}}" mode="widthFix"></image>  
19 - </view>  
20 - <view wx:if="{{properties.displayType == 3}}">  
21 - <image class="image-item" src="{{item.pic}}" mode="widthFix"></image>  
22 - </view>  
23 - <view wx:if="{{properties.displayType == 4}}"> 2 + <view class="style-type-1 style-type-2" wx:if="{{properties.displayType == 1 || properties.displayType == 2}}">
  3 + <anchor
  4 + wx:for="{{images}}"
  5 + wx:key="index"
  6 + class="anchor-item"
  7 + bindclickreport="report"
  8 + url="{{item.url}}"
  9 + floor-id="{{floorId}}"
  10 + floor-name="{{floorName}}"
  11 + floor-url="{{item.url}}"
  12 + floor-index="{{floorIndex}}"
  13 + floor-item-index="{{index + 1}}">
24 <image class="image-item" src="{{item.pic}}" mode="widthFix"></image> 14 <image class="image-item" src="{{item.pic}}" mode="widthFix"></image>
  15 + </anchor>
  16 + </view>
  17 + <view class="style-type-3" wx:if="{{properties.displayType == 3}}">
  18 + <view class="left-part">
  19 + <anchor
  20 + class="anchor-item"
  21 + bindclickreport="report"
  22 + url="{{item.url}}"
  23 + floor-id="{{floorId}}"
  24 + floor-name="{{floorName}}"
  25 + floor-url="{{item.url}}"
  26 + floor-index="{{floorIndex}}"
  27 + floor-item-index="1">
  28 + <image class="image-item" src="{{images[0].pic}}" mode="widthFix"></image>
  29 + </anchor>
  30 + <anchor
  31 + class="anchor-item"
  32 + bindclickreport="report"
  33 + url="{{item.url}}"
  34 + floor-id="{{floorId}}"
  35 + floor-name="{{floorName}}"
  36 + floor-url="{{item.url}}"
  37 + floor-index="{{floorIndex}}"
  38 + floor-item-index="2">
  39 + <image class="image-item" src="{{images[1].pic}}" mode="widthFix"></image>
  40 + </anchor>
  41 + </view>
  42 + <view class="right-part">
  43 + <anchor
  44 + class="anchor-item"
  45 + bindclickreport="report"
  46 + url="{{item.url}}"
  47 + floor-id="{{floorId}}"
  48 + floor-name="{{floorName}}"
  49 + floor-url="{{item.url}}"
  50 + floor-index="{{floorIndex}}"
  51 + floor-item-index="3">
  52 + <image class="image-item" src="{{images[2].pic}}" mode="widthFix"></image>
  53 + </anchor>
  54 + </view>
  55 + </view>
  56 + <view class="style-type-3 style-type-4" wx:if="{{properties.displayType == 4}}">
  57 + <view class="left-part">
  58 + <anchor
  59 + class="anchor-item"
  60 + bindclickreport="report"
  61 + url="{{item.url}}"
  62 + floor-id="{{floorId}}"
  63 + floor-name="{{floorName}}"
  64 + floor-url="{{item.url}}"
  65 + floor-index="{{floorIndex}}"
  66 + floor-item-index="1">
  67 + <image class="image-item" src="{{images[0].pic}}" mode="widthFix"></image>
  68 + </anchor>
  69 + </view>
  70 + <view class="right-part">
  71 + <anchor
  72 + class="anchor-item"
  73 + bindclickreport="report"
  74 + url="{{item.url}}"
  75 + floor-id="{{floorId}}"
  76 + floor-name="{{floorName}}"
  77 + floor-url="{{item.url}}"
  78 + floor-index="{{floorIndex}}"
  79 + floor-item-index="3">
  80 + <image class="image-item" src="{{images[1].pic}}" mode="widthFix"></image>
  81 + </anchor>
  82 + <anchor
  83 + class="anchor-item"
  84 + bindclickreport="report"
  85 + url="{{item.url}}"
  86 + floor-id="{{floorId}}"
  87 + floor-name="{{floorName}}"
  88 + floor-url="{{item.url}}"
  89 + floor-index="{{floorIndex}}"
  90 + floor-item-index="2">
  91 + <image class="image-item" src="{{images[2].pic}}" mode="widthFix"></image>
  92 + </anchor>
25 </view> 93 </view>
26 - </anchor> 94 + </view>
27 </view> 95 </view>
1 -.resource-shop-triple-image .anchor-item { 1 +.resource-shop-triple-image {
  2 + font-size: 0;
  3 +}
  4 +
  5 +.resource-shop-triple-image .style-type-1 .anchor-item {
2 display: inline-block; 6 display: inline-block;
3 - width: 25%;  
4 - font-size: 50rpx; 7 + width: 33.333%;
  8 + font-size: 0;
5 box-sizing: border-box; 9 box-sizing: border-box;
6 - border-left: 1px solid #e0e0e0;  
7 - border-top: 1px solid #e0e0e0;  
8 } 10 }
9 11
10 -.resource-shop-triple-image .image-item { 12 +.resource-shop-triple-image .style-type-1 .image-item {
11 width: 100%; 13 width: 100%;
12 font-size: 0; 14 font-size: 0;
13 } 15 }
14 16
15 -.resource-shop-triple-image .image-text {  
16 - display: inline-block;  
17 - max-width: 100%;  
18 - font-size: 24rpx;  
19 - text-align: center;  
20 - box-sizing: border-box;  
21 - padding: 5rpx 10rpx;  
22 - background-color: #fff;  
23 -}  
24 -  
25 .resource-shop-triple-image.margin-bottom-20 { 17 .resource-shop-triple-image.margin-bottom-20 {
26 margin-bottom: 20rpx; 18 margin-bottom: 20rpx;
27 } 19 }
@@ -39,3 +31,21 @@ @@ -39,3 +31,21 @@
39 padding-bottom: 30rpx; 31 padding-bottom: 30rpx;
40 background-color: #f2f2f2; 32 background-color: #f2f2f2;
41 } 33 }
  34 +
  35 +.style-type-3 {
  36 + font-size: 0;
  37 +}
  38 +
  39 +.style-type-3 .left-part,
  40 +.style-type-3 .right-part {
  41 + display: inline-block;
  42 + width: 50%;
  43 +}
  44 +
  45 +.style-type-3 .anchor-item {
  46 + width: 100%;
  47 +}
  48 +
  49 +.style-type-3 .anchor-item .image-item {
  50 + width: 100%;
  51 +}
@@ -10,7 +10,7 @@ export default { @@ -10,7 +10,7 @@ export default {
10 }, 10 },
11 "apiParams": { 11 "apiParams": {
12 "client_type": "miniapp", 12 "client_type": "miniapp",
13 - "business_line": "miniappReds", 13 + "business_line": "miniappBrand",
14 "private_key": "b43890b0a296ff3c7b8c260ca763980b", 14 "private_key": "b43890b0a296ff3c7b8c260ca763980b",
15 "app_version": "6.6.0" 15 "app_version": "6.6.0"
16 }, 16 },