jufubao-base 1.0.199 → 1.0.200-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.199",
+  "version": "1.0.200-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -19,10 +19,10 @@
         class="jfb-base-poster-big-small__body-wrap"
         :style="{
           margin: margin,
-          flexDirection: position === 1 ? 'row' : 'row-reverse',
         }"
         v-if="isShowAd"
       >
+        <!--大图-->
         <view
           v-if="isCarousel === 1"
           :style="{
@@ -98,6 +98,8 @@
           </xd-swiper-dot>
           <view v-if="isPreview" class="carousel-mask"></view>
         </view>
+        <!--大图-->
+        <!--小图-->
         <view
           :style="{
             width: bigWidth + 'rpx',
@@ -268,6 +270,7 @@
             </view>
           </view>
         </view>
+        <!--小图-->
       </view>
     </view>
   </view>
@@ -297,12 +300,7 @@ export default {
     return {
       params:{},
       height: 0, //组件高度
-      mS: {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0,
-      }, //间距
+      mS: {}, //间距
       isPreview: false, //是否预览
       test: {
         content_id: "KpBbUKdj4aBejwe7Fh1ki",
@@ -364,9 +362,7 @@ export default {
   },
   computed: {
     margin() {
-      return `${this.mS.top || 0}rpx ${this.mS.right || 0}rpx ${
-        this.mS.bottom || 0
-      }rpx ${this.mS.left || 0}rpx`;
+      return this.getMarginAndPadding(this.mS, 0);
     },
     msMarginComputed() {
       if (this.position === 1) {
@@ -793,10 +789,11 @@ export default {
       // 获取大小图之间间距，如果没有则设置默认值
       this.msMargin = getContainerPropsValue(container, "content.msMargin", 10);
       // 获取安全区域宽度，减去margin的值，再除以2，获取大图宽度
-      this.bigWidth = getWidthHeight(this.height,this.mS,this.msMargin).bigWidth;
-      this.bigHeight = getWidthHeight(this.height,this.mS,this.msMargin).bigHeight;
+      this.bigWidth = getWidthHeight(this.height,this.mS,this.msMargin , this).bigWidth;
+      this.bigHeight = getWidthHeight(this.height,this.mS,this.msMargin, this).bigHeight;
       // 获取容器高度，减去margin的值，再除以2，获取小图高度
-      this.smallHeight = getWidthHeight(this.height,this.mS,this.msMargin).smallHeight;
+      this.smallHeight = getWidthHeight(this.height, this.mS, this.msMargin, this).smallHeight;
+
       // 获取大图数据
       this.isCarousel = getContainerPropsValue(
         container,
@@ -882,6 +879,10 @@ export default {
   &__body {
     &-wrap {
       display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      border:1px solid red;
+      overflow: hidden;
     }
   }
 }

package/src/components/JfbBasePosterBigSmall/getWidthHeight.js

@@ -1,12 +1,10 @@
-function getWidthHeight(height, mS= {}, msMargin={}) {
-  let bigWidth =
-    uni.getSystemInfoSync().safeArea.width -
-    (mS.left + mS.right + Number(msMargin)) / 2;
-  let bigHeight = height - (mS.top + mS.bottom);
+function getWidthHeight(height, mS= {}, msMargin={}, $vm) {
+  let marginRL = $vm.checkValue(mS.left, 0) +  $vm.checkValue(mS.right, 0);
+  let marginTB = $vm.checkValue(mS.top, 0) +  $vm.checkValue(mS.bottom, 0);
+  let bigWidth = (750 - (marginRL + Number(msMargin)))/2;
+  let bigHeight = height - marginTB;
   // 获取容器高度，减去margin的值，再除以2，获取小图高度
-  let smallHeight =
-    (height - (mS.top + mS.bottom + Number(msMargin))) /
-    2;
+  let smallHeight = (height - (marginTB + Number(msMargin)))/2;
   return { bigWidth, bigHeight, smallHeight };
 }
 export default getWidthHeight;