jufubao-base 1.0.200-beta1 → 1.0.200-beta3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue +12 -13
  3. package/src/components/JfbBasePosterBigSmall/getWidthHeight.js +10 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.200-beta1",
3
+ "version": "1.0.200-beta3",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue CHANGED
@@ -24,7 +24,7 @@
24
24
  >
25
25
  <!--大图-->
26
26
  <view
27
- v-if="isCarousel === 1"
27
+ v-if="isCarousel === 1&&bigList.length > 0"
28
28
  :style="{
29
29
  margin: msMarginComputed,
30
30
  width: bigWidth + 'rpx',
@@ -40,7 +40,7 @@
40
40
  borderRadius: radius + 'rpx',
41
41
  }"
42
42
  :src="bigList[0].image_url"
43
- mode="aspectFill"
43
+ mode="scaleToFill"
44
44
  ></image>
45
45
  </view>
46
46
  </view>
@@ -75,7 +75,7 @@
75
75
  <image
76
76
  :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: bigHeight + 'rpx',}"
77
77
  :src="item['image_url']"
78
- mode="aspectFill"></image>
78
+ mode="scaleToFill"></image>
79
79
  </swiper-item>
80
80
  </swiper>
81
81
  <!--#endif-->
@@ -91,7 +91,7 @@
91
91
  @animationfinish="handleBigAnimationfinish"
92
92
  >
93
93
  <template slot-scope="{ item, index }">
94
- <image :style="{borderRadius: radius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
94
+ <image :style="{borderRadius: radius + 'rpx',}" :src="item['image_url']" mode="scaleToFill"></image>
95
95
  </template>
96
96
  </xd-swiper>
97
97
  <!--#endif-->
@@ -114,7 +114,7 @@
114
114
  }"
115
115
  >
116
116
  <view
117
- v-if="topIsCarousel === 1"
117
+ v-if="topIsCarousel === 1 && topList.lenght > 0"
118
118
  :style="{
119
119
  width: bigWidth + 'rpx',
120
120
  height: smallHeight + 'rpx',
@@ -128,7 +128,7 @@
128
128
  borderRadius: topRadius + 'rpx',
129
129
  }"
130
130
  :src="topList[0].image_url"
131
- mode="aspectFill"
131
+ mode="scaleToFill"
132
132
  ></image></view
133
133
  ></view>
134
134
  <view
@@ -161,7 +161,7 @@
161
161
  <image
162
162
  :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
163
163
  :src="item['image_url']"
164
- mode="aspectFill"></image>
164
+ mode="scaleToFill"></image>
165
165
  </swiper-item>
166
166
  </swiper>
167
167
  <!--#endif-->
@@ -177,7 +177,7 @@
177
177
  @animationfinish="handleTopAnimationfinish"
178
178
  >
179
179
  <template slot-scope="{ item, index }">
180
- <image :style="{borderRadius: topRadius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
180
+ <image :style="{borderRadius: topRadius + 'rpx',}" :src="item['image_url']" mode="scaleToFill"></image>
181
181
  </template>
182
182
  </xd-swiper>
183
183
  <!--#endif-->
@@ -192,7 +192,7 @@
192
192
  }"
193
193
  >
194
194
  <view
195
- v-if="bottomIsCarousel === 1"
195
+ v-if="bottomIsCarousel === 1 && bottomList.lenght > 0"
196
196
  :style="{
197
197
  width: bigWidth + 'rpx',
198
198
  height: smallHeight + 'rpx',
@@ -206,7 +206,7 @@
206
206
  borderRadius: bottomRadius + 'rpx',
207
207
  }"
208
208
  :src="bottomList[0].image_url"
209
- mode="aspectFill"
209
+ mode="scaleToFill"
210
210
  ></image> </view
211
211
  ></view>
212
212
  <view
@@ -239,7 +239,7 @@
239
239
  <image
240
240
  :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
241
241
  :src="item['image_url']"
242
- mode="aspectFill"></image>
242
+ mode="scaleToFill"></image>
243
243
  </swiper-item>
244
244
  </swiper>
245
245
  <!--#endif-->
@@ -260,7 +260,7 @@
260
260
  borderRadius: bottomRadius + 'rpx',
261
261
  }"
262
262
  :src="item['image_url']"
263
- mode="aspectFill"
263
+ mode="scaleToFill"
264
264
  ></image>
265
265
  </template>
266
266
  </xd-swiper>
@@ -881,7 +881,6 @@ export default {
881
881
  display: flex;
882
882
  justify-content: space-between;
883
883
  align-items: flex-start;
884
- border:1px solid red;
885
884
  overflow: hidden;
886
885
  }
887
886
  }
package/src/components/JfbBasePosterBigSmall/getWidthHeight.js CHANGED
@@ -1,10 +1,16 @@
1
- function getWidthHeight(height, mS= {}, msMargin={}, $vm) {
2
- let marginRL = $vm.checkValue(mS.left, 0) + $vm.checkValue(mS.right, 0);
3
- let marginTB = $vm.checkValue(mS.top, 0) + $vm.checkValue(mS.bottom, 0);
1
+
2
+ function checkValue(value, dValue = 0){
3
+ if(value === undefined || value === '' || value === null) return dValue;
4
+ return Number(value || 0);
5
+ }
6
+
7
+ export default (height, mS= {}, msMargin={}, $vm) =>{
8
+ let marginRL = checkValue(mS.left, 0) + checkValue(mS.right, 0);
9
+ let marginTB = checkValue(mS.top, 0) + checkValue(mS.bottom, 0);
4
10
  let bigWidth = (750 - (marginRL + Number(msMargin)))/2;
5
11
  let bigHeight = height - marginTB;
6
12
  // 获取容器高度，减去margin的值，再除以2，获取小图高度
7
13
  let smallHeight = (height - (marginTB + Number(msMargin)))/2;
8
14
  return { bigWidth, bigHeight, smallHeight };
9
15
  }
10
- export default getWidthHeight;
16
+