jufubao-base 1.0.200-beta1 → 1.0.201

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -186,7 +186,7 @@ export default {
       });
     },
 
-    getResult() {
+    getResult(is_auto='N') {
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -196,6 +196,16 @@ export default {
       })
         .then((res) => {
           if (res.status_type === "success") {
+            if(is_auto==='Y') {
+              this.order_num = null;
+              this.handleCardBindClose();
+              this.$xdHideLoading();
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+              return
+            }
             this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
@@ -214,6 +224,15 @@ export default {
             return;
           }
           if (res.status_type === "error") {
+            if(is_auto==='Y') {
+              this.handleCardBindClose();
+              this.$xdHideLoading();
+              if (this.timer) {
+                this.timeNum = 0;
+                clearTimeout(this.timer);
+              }
+              return
+            }
             this.$xdHideLoading();
             this.$xdAlert({
               content: res.message,
@@ -269,7 +288,6 @@ export default {
             this.list[this.currentIndex].app_activity_button
           );
           this.activity_id = this.list[this.currentIndex].activity_id;
-          this.isAll = 
           this.handlePop();
         })
         .catch((err) => {
@@ -301,13 +319,17 @@ export default {
             this.handleCardBindClose();
           }
         } else {
-          if(res.can_take === "Y"){
-          if (this.isPreview) {
-            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
-            }else this.isShow = true;
-          }else{
-            this.handleCardBindClose();
+          if(res.receive_type==='auto') {
+            this.getAllCoupont('Y')
+          } else {
+            if(res.can_take === "Y"){
+            if (this.isPreview) {
+              console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
+              this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+              }else this.isShow = true;
+            }else{
+              this.handleCardBindClose();
+            }
           }
         }
       })
@@ -321,11 +343,11 @@ export default {
       }
     },
 
-    getAllCoupont(info) {
-      this.p_getAllDialogList();
+    getAllCoupont(is_auto='N') {
+      this.p_getAllDialogList(is_auto);
     },
 
-    p_getAllDialogList() {
+    p_getAllDialogList(is_auto='N') {
       //getAllCoupon
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
@@ -333,10 +355,16 @@ export default {
         data: {
           distribution_method: this.distribution_method,
           activity_id: this.activity_id,
+          is_auto: is_auto,
           ...this.dispatchData
         }
       }).then(res => {
         if (res.code === 400) {
+          if(is_auto==='Y') {
+            this.$xdHideLoading();
+            this.handleCardBindClose()
+            return
+          }
           this.$xdHideLoading();
           this.$xdAlert({
             content: res.message,
@@ -351,7 +379,7 @@ export default {
         }
         this.order_num = res.tmp_order_number;
         setTimeout(()=>{
-          this.getResult();
+          this.getResult(is_auto);
         },1000)
       }).catch((err) => {
         console.log(err, "err");

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -24,7 +24,7 @@
       >
         <!--大图-->
         <view
-          v-if="isCarousel === 1"
+          v-if="isCarousel === 1&&bigList.length > 0"
           :style="{
             margin: msMarginComputed,
             width: bigWidth + 'rpx',
@@ -40,7 +40,7 @@
                 borderRadius: radius + 'rpx',
               }"
               :src="bigList[0].image_url"
-              mode="aspectFill"
+              mode="scaleToFill"
             ></image>
         </view>
         </view>
@@ -75,7 +75,7 @@
                 <image
                   :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: bigHeight + 'rpx',}"
                   :src="item['image_url']"
-                  mode="aspectFill"></image>
+                  mode="scaleToFill"></image>
               </swiper-item>
             </swiper>
             <!--#endif-->
@@ -91,7 +91,7 @@
               @animationfinish="handleBigAnimationfinish"
             >
               <template slot-scope="{ item, index }">
-                <image :style="{borderRadius: radius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
+                <image :style="{borderRadius: radius + 'rpx',}" :src="item['image_url']" mode="scaleToFill"></image>
               </template>
             </xd-swiper>
             <!--#endif-->
@@ -114,7 +114,7 @@
             }"
           >
             <view
-              v-if="topIsCarousel === 1"
+              v-if="topIsCarousel === 1 && topList.lenght > 0"
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',
@@ -128,7 +128,7 @@
                     borderRadius: topRadius + 'rpx',
                   }"
                   :src="topList[0].image_url"
-                  mode="aspectFill"
+                  mode="scaleToFill"
                 ></image></view
             ></view>
             <view
@@ -161,7 +161,7 @@
                     <image
                       :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
                       :src="item['image_url']"
-                      mode="aspectFill"></image>
+                      mode="scaleToFill"></image>
                   </swiper-item>
                 </swiper>
                 <!--#endif-->
@@ -177,7 +177,7 @@
                   @animationfinish="handleTopAnimationfinish"
                 >
                   <template slot-scope="{ item, index }">
-                    <image :style="{borderRadius: topRadius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
+                    <image :style="{borderRadius: topRadius + 'rpx',}" :src="item['image_url']" mode="scaleToFill"></image>
                   </template>
                 </xd-swiper>
                 <!--#endif-->
@@ -192,7 +192,7 @@
             }"
           >
             <view
-              v-if="bottomIsCarousel === 1"
+              v-if="bottomIsCarousel === 1 &&  bottomList.lenght > 0"
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',
@@ -206,7 +206,7 @@
                     borderRadius: bottomRadius + 'rpx',
                   }"
                   :src="bottomList[0].image_url"
-                  mode="aspectFill"
+                  mode="scaleToFill"
                 ></image> </view
             ></view>
             <view
@@ -239,7 +239,7 @@
                     <image
                       :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
                       :src="item['image_url']"
-                      mode="aspectFill"></image>
+                      mode="scaleToFill"></image>
                   </swiper-item>
                 </swiper>
                 <!--#endif-->
@@ -260,7 +260,7 @@
                         borderRadius: bottomRadius + 'rpx',
                       }"
                       :src="item['image_url']"
-                      mode="aspectFill"
+                      mode="scaleToFill"
                     ></image>
                   </template>
                 </xd-swiper>
@@ -881,7 +881,6 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: flex-start;
-      border:1px solid red;
       overflow: hidden;
     }
   }

package/src/components/JfbBasePosterBigSmall/getWidthHeight.js

@@ -1,10 +1,16 @@
-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);
+
+function checkValue(value, dValue = 0){
+  if(value === undefined || value === '' || value === null) return dValue;
+  return Number(value || 0);
+}
+
+export default (height, mS= {}, msMargin={}, $vm) =>{
+  let marginRL = checkValue(mS.left, 0) +  checkValue(mS.right, 0);
+  let marginTB = checkValue(mS.top, 0) +  checkValue(mS.bottom, 0);
   let bigWidth = (750 - (marginRL + Number(msMargin)))/2;
   let bigHeight = height - marginTB;
   // 获取容器高度，减去margin的值，再除以2，获取小图高度
   let smallHeight = (height - (marginTB + Number(msMargin)))/2;
   return { bigWidth, bigHeight, smallHeight };
 }
-export default getWidthHeight;
+