jufubao-base 1.0.180 → 1.0.181-beta2

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -8,49 +8,74 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80',
+        label: '按钮背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'btnBg', //form[valueKey]
+        value: data.btnBg || null, //v-model
+        defaultValue: data.btnBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 163, //单个图片显示宽度
+        oneHeight: 45, //单个图片显示高度
+        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'
-          },
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '选中路径:',
+        label: '内容背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'contentBg', //form[valueKey]
+        value: data.contentBg || null, //v-model
+        defaultValue: data.contentBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 300, //单个图片显示宽度
+        oneHeight: 200, //单个图片显示高度
+        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: '领取跳转地址:',
         ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        valueKey: 'receive_get_url',
+        groupKey:'advanced',
+        placeholder: '请选择领取跳转地址',
+        value: data['receive_get_url']||null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
-      },
-      data.bgcolor && {
-        label: '高度:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80',
+        inline: false,
         rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
+          { required: true, message: '请选择领取地址', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '按钮文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnColor',
+        value: data['btnColor'] || '',
+        groupKey: "content",
+        placeholder: '请输入按钮文字颜色',
+        classNmae: 'input80',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -2,110 +2,178 @@
   <view
     class="jfb-base-card-receive-cover"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-card-receive-cover__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-receive-cover__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view
+      :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
+      class="jfb-base-card-receive-cover__body"
+    >
+      <view class="content" :style="contentBgStyle">
+        <view class="content-info">{{ greeting }}</view>
+      </view>
+      <view class="btn" @click="handleToReceive" :style="btnBgStyle">{{
+        status === "T" ? "链接已失效" : "立即领取"
+      }}</view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseCardReceiveCover",
-    components: {
-      XdFontIcon
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbBaseCardReceiveCover",
+  components: {
+    XdFontIcon,
+    XdButton,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin],
+  data() {
+    return {
+      btnBg: "",
+      contentBg: "",
+      greeting: "",
+      receive_get_url: "",
+      btnColor: "",
+      transfer_auth_code: null,
+      status: "N",
+    };
+  },
+  computed: {
+    btnBgStyle() {
+      return this.styleObjectToString({
+        backgroundImage: "url(" + this.btnBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: 'cover',
+        width: "326rpx",
+        height: "90rpx",
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center",
+        color: this.btnColor,
+        border: "none",
+      });
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin
-    ],
-    data() {
-      return {
-
-        //todo
-      }
+    contentBgStyle() {
+      return this.styleObjectToString({
+        backgroundImage: "url(" + this.contentBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "100% 100%",
+        color: this.mainColor,
+      });
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    created() {
-      this.init(this.container);
+  },
+  created() {
+    this.init(this.container);
 
-      //todo
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      this.transfer_auth_code = options.transfer_auth_code;
+      jfbRootExec("getReceiveGreetingCard", {
+        vm: this,
+        data: {
+          transfer_auth_code: this.transfer_auth_code,
+        },
+      })
+        .then((res) => {
+          this.greeting = res.transfer_record.greeting;
+          this.status = res.transfer_record.status;
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
-
+    /**
+     * @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: "",
+      }).path;
+      this.contentBg = getContainerPropsValue(container, "content.contentBg", {
+        path: "",
+      }).path;
+      this.receive_get_url = getContainerPropsValue(
+        container,
+        "content.receive_get_url",
+        {
+          value: "",
+        }
+      ).value;
+      this.btnColor = getContainerPropsValue(
+        container,
+        "content.btnColor",
+        "#000"
+      );
+    },
+    handleToReceive() {
+      if(this.status === "T") return;
+      this.$xdUniHelper.navigateTo({
+        url: `${this.receive_get_url}?transfer_auth_code=${this.transfer_auth_code}`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbBaseCardReceiveCoverLess.less";
-
-  .jfb-base-card-receive-cover {
-    &__body{
+@import "./JfbBaseCardReceiveCoverLess.less";
 
+.jfb-base-card-receive-cover {
+  &__body {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    .content {
+      position: relative;
+      min-height: 400rpx;
+      min-width: 600rpx;
+      display: flex;
+      justify-content: center;
+      font-size: 40rpx;
+      font-weight: 500;
+      &-info {
+        padding-top: 70rpx;
+        width: 300rpx;
+        text-align: center;
+      }
+    }
+    .btn {
+      margin-top: 50rpx;
+      margin-bottom: 100rpx;
+      font-size: 36rpx;
+      text-align: center;
     }
   }
+}
 </style>

package/src/components/JfbBaseCardReceiveCover/Mock.js

@@ -1,13 +1,5 @@
 'use strict';
 
 module.exports = {
-  
-  getCardByIdFilmSquate:{},
-  
-  updateCardFilmPaiqiDate:{},
-  
-  removeCardFilmAddress:{},
-  
-  addCardFilmcart:{},
-  
+  getReceiveGreetingCard:{"card_number":"101001000008098","card_point":99028,"card_type_name":"多余额福卡","end_time":"2025-07-31","card_status":"Y","card_status_name":"开启","unit":"点","main_business_code_name":"蛋糕(勿改)、网络视听(勿改)、体检(勿改)","other_card_point":79222,"is_exchange":"N","exchange_card_type_name":"","exchange_card_point":0,"card_point_type":2,"is_can_unbind":"","business_codes":["movie","market","cake"],"site_entry_settings":[],"transfer_record":{"transfer_auth_code":"aa6ljeQETINBUAJ-9l486","status":"N","status_name":"待领取","transfer_time":"2024-09-09 11:32:11","user_id":5000223,"user_nickname":"金L爽","user_phone_number":"188****4566","greeting":"送给你了"},"request_id":"2646fc69fab35413"},
 }

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -157,7 +157,7 @@
       handleClick(item){
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
-            url : item.path.value
+            url : `${item.path.value}` 
           })
         }
       },

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -566,7 +566,7 @@
               ></xd-font-icon>
             </view>
             <view class="jfb-base-order-detail__body-show" v-else>
-              使用{{ info.pay_info.cards.length }}张票券 收起
+              <text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
                 @click="showPayCard = false"
@@ -582,7 +582,7 @@
               :key="index"
             >
               <view>票券：{{ item.card_type_name }}</view>
-              <view>
+              <view class="list-item">
                 <view>编号：{{ item.card_number }}</view>
                 <xd-unit
                   :fontSize="28"
@@ -590,6 +590,7 @@
                   :price="item.card_use_point"
                   :unit="item['card_unit']"
                 ></xd-unit>
+                <view v-if="item['card_discount_use_point'] > 0" class="discount">已优惠:{{item['card_discount_use_point']}}</view>
               </view>
             </view>
           </view>
@@ -616,6 +617,27 @@
             </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 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">
+            <view v-for="(item,index) in info.extras.travel_booking_info.travelers" :key="index" class="jfb-base-order-detail__body-booking-list-item">
+              <view :style="{color:mainColor,background:bgColor}" class="jfb-base-order-detail__body-booking-list-item-num">游客{{index+1}}</view>
+              <view class="jfb-base-order-detail__body-booking-list-item-info">
+                <view class="jfb-base-order-detail__body-booking-list-item-info-name">{{item.name}}</view>
+                <view v-if="item.id_card_no" class="jfb-base-order-detail__body-booking-list-item-info-item">身份证：{{item.id_card_no}}</view>
+                <view v-if="item.mobile" class="jfb-base-order-detail__body-booking-list-item-info-item">手机号：{{item.mobile}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
         <view
           v-if="info.productDetail"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
@@ -896,6 +918,9 @@ 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 (this.isPreview) {
             switch (this.viewStatus) {
               case "mall":
@@ -960,6 +985,12 @@ export default {
                 item.card_use_point,
                 100
               );
+              if(item['card_discount_use_point'] !== undefined && item['card_discount_use_point'] > 0) {
+                item.card_discount_use_point = this.$xdUniHelper.divisionFloatNumber(
+                  item.card_discount_use_point,
+                  100
+                );
+              }
               return item;
             });
           res.codes =
@@ -1659,6 +1690,37 @@ export default {
       }
     }
 
+    &-booking {
+      &-list {
+        &-item {
+          display: flex;
+          align-items: baseline;
+          margin-bottom: 40rpx;
+          &-num {
+            font-size: 24rpx;
+            margin-right: 24rpx;
+            width: 120rpx;
+            height: 50rpx;
+            text-align: center;
+            line-height: 50rpx;
+            border-radius: 16rpx;
+          }
+          &-info {
+            flex: 1;
+            &-name {
+              font-size: 32rpx;
+              margin-bottom: 20rpx;
+            }
+            &-item {
+              font-size: 24rpx;
+              color: #666;
+              margin-bottom: 16rpx;
+            }
+          }
+        }
+      }
+    }
+
     &-line {
       border-bottom: unit(2, rpx) solid #f2f2f2;
       margin-bottom: unit(40, rpx);
@@ -1704,5 +1766,22 @@ export default {
     border-radius: unit(12, rpx);
     padding: unit(14, rpx) unit(28, rpx);
   }
+
+  .list-item {
+    position: relative;
+
+    & > .discount {
+      position: absolute;
+      left:0;
+      right:0;
+      bottom:-20rpx;
+      height: 20rpx;
+      font-size: 20rpx;
+      line-height: 20rpx;
+      color: #aaa;
+      text-align: right;
+    }
+
+  }
 }
 </style>

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -17,6 +17,11 @@ module.exports = {
       "loading": false,
       "loading_timeout": -1
     },
+    "extras": {
+      "first_logistics_package_id": "",
+      "logistics_count": 0,
+      "travel_booking_info": "{\"travelers\":[{\"name\":\"\\u6d4b\\u8bd5\",\"mobile\":\"18888888889\",\"id_card_no\":\"130102198304285898\",\"id_card_type\":\"1\"}]}"
+    },
     "film_show": {
       "name": "聚福宝-万里归途",
       "thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E",

package/src/components/JfbBasePay/Attr.js

@@ -16,6 +16,18 @@ export default {
         placeholder: '请选择支付成功路径',
         value: data.pay_success_path || null,
         groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPag©esTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '票券支付成功跳转路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'rechargeSuccessPath', //form[valueKey]
+        placeholder: '请选择票券支付成功跳转路径',
+        value: data.rechargeSuccessPath || null,
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -222,12 +222,12 @@ export default {
     },
   },
   computed: {
-    prod_bottom() {
+    prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     getSuccessUrl(){
       let url = this.paySuccessPath;
-      if(this.type === 'recharge') {
+      if(this.type === 'recharge'||this.type==='delay') {
         url = this.rechargeSuccessPath || url;
       }
       return url
@@ -252,8 +252,8 @@ export default {
       this.p_getPayOrderDetail();
       this.p_getListUserPayChannel();
 
-      //充值不进行检查订单状态
-      if(this.type !== 'recharge') {
+      //充值延期不进行检查订单状态
+      if((this.type !== 'recharge'&&this.type!=='delay')) {
         this.p_getBaseOrderDetail();
       }
     },
@@ -361,7 +361,7 @@ export default {
     async doThirdPay() {
       if (this.$configProject.isPreview) return;
 
-      if(this.type !== 'recharge') {
+      if((this.type !== 'recharge'&&this.type!=='delay')) {
         await this.p_getBaseOrderDetail();
       }
       const {channel_provider_id, order_id, payInfo} = this;
@@ -416,9 +416,15 @@ export default {
               },
             })
               .then((res) => {
-                this.$xdUniHelper.redirectTo({
-                  url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
-                });
+                if(this.type) {
+                  this.$xdUniHelper.redirectTo({
+                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}&type=${this.type}`
+                  });
+                } else {
+                  this.$xdUniHelper.redirectTo({
+                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
+                  });
+                }
               })
               .catch(error=>{
                 this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -56,7 +56,6 @@
     mixins: [componentsMixins,extsMixins,JfbBasePosterTypeMixin],
     data() {
       return {
-        hideMask: true,
         params: {},
 				//Swiper 配置
         posterPosition: null,

package/src/components/JfbBaseRechargeOrder/Api.js

@@ -22,5 +22,16 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
+  }, {
+    mapFnName: 'getDelayOrderList',
+    title: '获取卡延期订单列表',
+    path: '/card/v1/card-delay/list-order',
+    isRule: false,
+    params: {
+      page_size: ['page_size', 'Number', true],
+      page_token: ['page_token', 'Number', true]
+    },
+    isConsole: true,
+    disabled: true,
   },
 ];