fe / yoho-miniapp-eshop · Commits

Go to a project

Authored by 李奇
Commit a080204df2b74316e633258e4eabced8f584812b 1 parent 5fddc010

店铺资源位楼层修改

Inline Side-by-side
Showing 11 changed files with 29 additions and 57 deletions
@@ -22,13 +22,9 @@ Component({ @@ -22,13 +22,9 @@ Component({
22 type: String, // start from 1 22 type: String, // start from 1
23 value: '' 23 value: ''
24 }, 24 },
25 - marginClass: {  
26 - type: String,  
27 - value: ''  
28 - },  
29 - paddingClass: {  
30 - type: String,  
31 - value: '' 25 + properties: {
  26 + type: Object,
  27 + value: {}
32 } 28 }
33 }, 29 },
34 data: { 30 data: {
1 <wxs src="../../../../wxs/helper.wxs" module="helper" /> 1 <wxs src="../../../../wxs/helper.wxs" module="helper" />
2 -<view class="resource-shop-carousel {{marginClass}} {{paddingClass}}"> 2 +<view class="resource-shop-carousel {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}">
3 <swiper class="swiper-wrapper" indicator-dots="{{indicatorDots}}" 3 <swiper class="swiper-wrapper" indicator-dots="{{indicatorDots}}"
4 autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" 4 autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"
5 circular="{{circular}}" bindchange="swiperChange"> 5 circular="{{circular}}" bindchange="swiperChange">
1 .resource-shop-carousel { 1 .resource-shop-carousel {
2 position: relative; 2 position: relative;
3 width: 100%; 3 width: 100%;
  4 + font-size: 0;
4 } 5 }
5 6
6 .resource-shop-carousel .swiper-wrapper { 7 .resource-shop-carousel .swiper-wrapper {
@@ -36,17 +37,3 @@ @@ -36,17 +37,3 @@
36 .resource-shop-carousel.margin-bottom-20 { 37 .resource-shop-carousel.margin-bottom-20 {
37 margin-bottom: 20rpx; 38 margin-bottom: 20rpx;
38 } 39 }
39 -  
40 -.resource-shop-carousel.margin-bottom-30 {  
41 - margin-bottom: 30rpx;  
42 -}  
43 -  
44 -.resource-shop-carousel.padding-bottom-20 {  
45 - padding-bottom: 20rpx;  
46 - background-color: #f2f2f2;  
47 -}  
48 -  
49 -.resource-shop-carousel.padding-bottom-30 {  
50 - padding-bottom: 30rpx;  
51 - background-color: #f2f2f2;  
52 -}  
@@ -4,13 +4,9 @@ Component({ @@ -4,13 +4,9 @@ Component({
4 type: Array, 4 type: Array,
5 value: [] 5 value: []
6 }, 6 },
7 - marginClass: {  
8 - type: String,  
9 - value: ''  
10 - },  
11 - paddingClass: {  
12 - type: String,  
13 - value: '' 7 + properties: {
  8 + type: Object,
  9 + value: {}
14 } 10 }
15 }, 11 },
16 methods: { 12 methods: {
1 -<wxs src="../../../../wxs/helper.wxs" module="helper" />  
2 -<view class="resource-shop-double-image {{paddingClass}}"> 1 +<view class="resource-shop-double-image {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}">
3 <anchor 2 <anchor
4 class="anchor-item" 3 class="anchor-item"
5 bindclickreport="report" 4 bindclickreport="report"
@@ -4,13 +4,9 @@ Component({ @@ -4,13 +4,9 @@ Component({
4 type: Array, 4 type: Array,
5 value: [] 5 value: []
6 }, 6 },
7 - marginClass: {  
8 - type: String,  
9 - value: ''  
10 - },  
11 - paddingClass: {  
12 - type: String,  
13 - value: '' 7 + properties: {
  8 + type: Object,
  9 + value: {}
14 } 10 }
15 }, 11 },
16 methods: { 12 methods: {
1 -<wxs src="../../../../wxs/helper.wxs" module="helper" />  
2 -<view class="resource-shop-four-image {{paddingClass}}"> 1 +<view class="resource-shop-four-image {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}">
3 <anchor 2 <anchor
4 wx:for="{{images}}" 3 wx:for="{{images}}"
5 wx:key="index" 4 wx:key="index"
  1 +.resource-shop-four-image {
  2 + font-size: 0;
  3 +}
  4 +
1 .resource-shop-four-image .anchor-item { 5 .resource-shop-four-image .anchor-item {
2 display: inline-block; 6 display: inline-block;
3 width: 25%; 7 width: 25%;
@@ -5,6 +9,7 @@ @@ -5,6 +9,7 @@
5 box-sizing: border-box; 9 box-sizing: border-box;
6 border-left: 1px solid #e0e0e0; 10 border-left: 1px solid #e0e0e0;
7 border-top: 1px solid #e0e0e0; 11 border-top: 1px solid #e0e0e0;
  12 + border-bottom: 1px solid #e0e0e0;
8 } 13 }
9 14
10 .resource-shop-four-image .image-item { 15 .resource-shop-four-image .image-item {
@@ -4,13 +4,9 @@ Component({ @@ -4,13 +4,9 @@ Component({
4 type: Array, 4 type: Array,
5 value: [] 5 value: []
6 }, 6 },
7 - marginClass: {  
8 - type: String,  
9 - value: ''  
10 - },  
11 - paddingClass: {  
12 - type: String,  
13 - value: '' 7 + properties: {
  8 + type: Object,
  9 + value: {}
14 } 10 }
15 }, 11 },
16 methods: { 12 methods: {
1 -<wxs src="../../../../wxs/helper.wxs" module="helper" />  
2 -<view class="resource-shop-single-image {{paddingClass}}"> 1 +<view class="resource-shop-single-image {{properties.isModuleMargin ? 'margin-bottom-20' : ''}}">
3 <anchor 2 <anchor
4 class="anchor-item" 3 class="anchor-item"
5 bindclickreport="report" 4 bindclickreport="report"
@@ -5,14 +5,13 @@ @@ -5,14 +5,13 @@
5 <view class="text"><image class="icon" src="../../static/images/search@2x.png"></image>搜索店铺内潮品</view> 5 <view class="text"><image class="icon" src="../../static/images/search@2x.png"></image>搜索店铺内潮品</view>
6 </view> 6 </view>
7 </view> 7 </view>
8 - <view class="shop-info">  
9 - <image class="info-bg" src="{{shopBanner}}"></image>  
10 - <view class="logo-mask"></view>  
11 - <image class="logo" src="{{helper.image(shopInfo.shop_logo, 100, 100)}}" wx:if="{{false}}"></image>  
12 - <text class="name" wx:if="{{false}}">{{shopInfo.shop_name}}</text>  
13 - <view class="fav" wx:if="{{false}}">粉丝：{{favCount}}</view>  
14 - </view>  
15 - <view class="separator"></view> 8 + <!--<view class="shop-info">-->
  9 + <!--<image class="info-bg" src="{{shopBanner}}"></image>-->
  10 + <!--<view class="logo-mask"></view>-->
  11 + <!--<image class="logo" src="{{helper.image(shopInfo.shop_logo, 100, 100)}}" wx:if="{{false}}"></image>-->
  12 + <!--<text class="name" wx:if="{{false}}">{{shopInfo.shop_name}}</text>-->
  13 + <!--<view class="fav" wx:if="{{false}}">粉丝：{{favCount}}</view>-->
  14 + <!--</view>-->
16 <resources 15 <resources
17 floors="{{decorFloors}}" 16 floors="{{decorFloors}}"
18 floor-index="1" 17 floor-index="1"