jufubao-base 1.0.181-beta2 → 1.0.181-beta4

package/package.json

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

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -46,7 +46,7 @@
             当前票券无套餐
           </xd-no-data>
         </view>
-        <view class="wrap" style="margin-top: 28rpx" v-if="notice&&packageList !== null">
+        <view class="wrap" style="margin-top: 28rpx" v-if="notice&&packageList !== null&&packageList.length > 0">
           <view
             style="
               text-align: center;

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -293,6 +293,7 @@
               :couponBtnTextStyle="couponBtnTextStyle"
               :couponLeftBgColor="couponLeftBgColor"
               :item="item"
+              :mainColor="mainColor"
               @useCoupon="handleBindLogin(item,item['entries'][0])"
               @toDetail="toDetail(item)"
             ></xd-coupon-item>

package/src/components/JfbBaseCardGive/Attr.js

@@ -22,6 +22,21 @@ export default {
           { required: true, message: '请选择领取地址', trigger: ['blur', 'change'] },
         ]
       },
+      {
+        label: '返回地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'back_url',
+        groupKey:'advanced',
+        placeholder: '请选择返回地址',
+        value: data['back_url']||null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        rules: [
+          { required: true, message: '请选择领取地址', trigger: ['blur', 'change'] },
+        ]
+      },
       {
         label: '分享图片:', //label
         ele: 'xd-upload', //package 名称

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -96,7 +96,12 @@
         <xd-button type="primary" @click="handleShare">再次分享</xd-button>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
-        <button :style="{background:mainColor}" class="share-btn" @click="handleShare" open-type="share">
+        <button
+          :style="{ background: mainColor }"
+          class="share-btn"
+          @click="handleShare"
+          open-type="share"
+        >
           再次分享
         </button>
         <!-- #endif -->
@@ -115,7 +120,12 @@
             >超过24H未领取，票券会自动退回您的账户中。</view
           >
           <!-- #ifdef MP-WEIXIN -->
-          <button :style="{background:mainColor}" class="share-btn" @click="handleShare" open-type="share">
+          <button
+            :style="{ background: mainColor }"
+            class="share-btn"
+            @click="handleShare"
+            open-type="share"
+          >
             通知微信好友
           </button>
           <!-- #endif -->
@@ -171,6 +181,7 @@ export default {
       greeting: "",
       dialogShow: false,
       get_url: null,
+      back_url: null,
       shareImage: "",
       isPreview: false,
       errMsg: "",
@@ -216,6 +227,10 @@ export default {
             this.info.card_point,
             100
           );
+          this.info.other_card_point = this.$xdUniHelper.divisionFloatNumber(
+            this.info.other_card_point,
+            100
+          );
           this.greeting = res.transfer_record.greeting;
           this.info["theme"] = this.getCardThemes(this.info["card_type_name"]);
           if (
@@ -243,6 +258,9 @@ export default {
       this.get_url = getContainerPropsValue(container, "content.get_url", {
         value: "",
       }).value;
+      this.back_url = getContainerPropsValue(container, "content.back_url", {
+        value: "",
+      }).value;
       this.shareImage = getContainerPropsValue(
         container,
         "content.shareImage",
@@ -326,10 +344,11 @@ export default {
 
       // #endif
     },
-    onJfbShow(options) {
-      console.log("onJfbShow8888");
-
-      // this.dialogShow = false;
+    onJfbBack(options) {
+      console.log("event.onJfbBack", options);
+      this.$xdUniHelper.navigateTo({
+        url: `${this.back_url}`,
+      });
     },
   },
 };

package/src/components/JfbBaseCardReceive/JfbBaseCardReceive.vue

@@ -164,7 +164,7 @@ export default {
       info: null,
       transfer_auth_code: null,
       dialogShow: false,
-      resultDialog: true,
+      resultDialog: false,
       isPreview: false,
       errMsg: "",
     };

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -7,6 +7,52 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '可领取背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'canReceiveBg', //form[valueKey]
+        value: data.canReceiveBg || null, //v-model
+        defaultValue: data.canReceiveBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 375, //单个图片显示宽度
+        oneHeight: 672, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '不可领取背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'cannotReceiveBg', //form[valueKey]
+        value: data.cannotReceiveBg || null, //v-model
+        defaultValue: data.cannotReceiveBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 375, //单个图片显示宽度
+        oneHeight: 672, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
       {
         label: '按钮背景图:', //label
         ele: 'xd-upload', //package 名称

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -15,14 +15,11 @@
       >
     </view>
     <!-- #endif -->
-    <view
-      :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
-      class="jfb-base-card-receive-cover__body"
-    >
-      <view class="content" :style="contentBgStyle">
+    <view :style="bgStyle" class="jfb-base-card-receive-cover__body">
+      <view v-if="status==='N'" class="content" :style="contentBgStyle">
         <view class="content-info">{{ greeting }}</view>
       </view>
-      <view class="btn" @click="handleToReceive" :style="btnBgStyle">{{
+      <view v-if="status==='N'" class="btn" @click="handleToReceive" :style="btnBgStyle">{{
         status === "T" ? "链接已失效" : "立即领取"
       }}</view>
     </view>
@@ -53,14 +50,24 @@ export default {
       btnColor: "",
       transfer_auth_code: null,
       status: "N",
+      cannotReceiveBg: "",
+      canReceiveBg: "",
     };
   },
   computed: {
+    bgStyle() {
+      let status = this.status;
+      return {
+        height: this.layoutInfo.bodyMinHeightRpx + "rpx",
+        backgroundImage: status==='N' ? `url(${this.canReceiveBg})` : `url(${this.cannotReceiveBg})`,
+        backgroundSize: "100% 100%",
+      };
+    },
     btnBgStyle() {
       return this.styleObjectToString({
         backgroundImage: "url(" + this.btnBg + ")",
         backgroundRepeat: "no-repeat",
-        backgroundSize: 'cover',
+        backgroundSize: "cover",
         width: "326rpx",
         height: "90rpx",
         display: "flex",
@@ -107,14 +114,6 @@ export default {
           console.log(err, "err");
         });
     },
-    /**
-     * @description 监听事件变化
-     * @param container {object} 业务组件对象自己
-     */
-    init(container) {
-      //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-      //this.height = getContainerPropsValue(container, 'content.height', 10);
-    },
     init(container) {
       this.btnBg = getContainerPropsValue(container, "content.btnBg", {
         path: "",
@@ -122,6 +121,20 @@ export default {
       this.contentBg = getContainerPropsValue(container, "content.contentBg", {
         path: "",
       }).path;
+      this.canReceiveBg = getContainerPropsValue(
+        container,
+        "content.canReceiveBg",
+        {
+          path: "",
+        }
+      ).path;
+      this.cannotReceiveBg = getContainerPropsValue(
+        container,
+        "content.cannotReceiveBg",
+        {
+          path: "",
+        }
+      ).path;
       this.receive_get_url = getContainerPropsValue(
         container,
         "content.receive_get_url",
@@ -136,7 +149,7 @@ export default {
       );
     },
     handleToReceive() {
-      if(this.status === "T") return;
+      if (this.status === "T") return;
       this.$xdUniHelper.navigateTo({
         url: `${this.receive_get_url}?transfer_auth_code=${this.transfer_auth_code}`,
       });

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -617,14 +617,21 @@
             </view>
           </view>
         </view>
-        <!-- todo -->
-        <view v-if="info.extras.travel_booking_info.travelers&&info.extras.travel_booking_info.travelers.length>0" :style="{
-              background: backgroundColor,
-              border: borderBox,
-              borderRadius: radius + 'rpx',
-              boxShadow: shadowBox,
-              marginBottom: padding + 'rpx',
-            }" class="jfb-base-order-detail__body-card jfb-base-order-detail__body-booking">
+        <!--旅游模块-->
+        <view
+          v-if="info.extras &&
+          info.extras.travel_booking_info &&
+          info.extras.travel_booking_info['travelers'] &&
+          info.extras.travel_booking_info['travelers'].length > 0"
+          :style="{
+            background: backgroundColor,
+            border: borderBox,
+            borderRadius: radius + 'rpx',
+            boxShadow: shadowBox,
+            marginBottom: padding + 'rpx',
+          }"
+          class="jfb-base-order-detail__body-card jfb-base-order-detail__body-booking"
+        >
           <view class="jfb-base-order-detail__body-delivery-bottom-title">预订信息</view>
           <view class="jfb-base-order-detail__body-line"></view>
           <view class="jfb-base-order-detail__body-booking-list">
@@ -638,6 +645,7 @@
             </view>
           </view>
         </view>
+        <!--旅游模块-->
         <view
           v-if="info.productDetail"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
@@ -918,9 +926,17 @@ export default {
         .then((res) => {
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
-          if(res.extras.travel_booking_info) {
-            res.extras.travel_booking_info = JSON.parse(res.extras.travel_booking_info)
+
+          //旅游模块
+          if(res.extras && res.extras.travel_booking_info) {
+            try{
+              res.extras.travel_booking_info = JSON.parse(res.extras.travel_booking_info)
+            }catch(e){
+              res.extras.travel_booking_info = {}
+            }
           }
+
+          //预览模块
           if (this.isPreview) {
             switch (this.viewStatus) {
               case "mall":