jufubao-base 1.0.177-beta1 → 1.0.177-beta4

package/package.json

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

package/src/components/JfbBaseCardDelay/Attr.js

@@ -242,6 +242,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '0元支付成功路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'successPath',
+        groupKey:'advanced',
+        placeholder: '请选择0元支付成功路径',
+        value: data['successPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -16,26 +16,35 @@
     <view class="jfb-base-card-delay__body">
       <view>
         <view class="wrap">
-          <input placeholder="输入券号" v-model="card_number" type="text" />
+          <input
+            placeholder="输入券号"
+            v-model.trim="card_number"
+            type="text"
+          />
         </view>
-        <view v-if="packageList && packageList.length > 0" class="package">
-          <view
-            v-for="(item, index) in packageList"
-            :key="index"
-            @click="activeIndex = index"
-            :style="{
-              background: activeIndex === index ? backgroundColor : '#fff',
-              color: activeIndex === index ? mainColor : '#333',
-              marginRight: (index + 1) % 3 == 0 ? '0' : '36rpx',
-            }"
-            class="package-item"
-          >
-            <view>{{ item.package_name }}</view>
-            <view>
-              <text>{{ item.pay_amount }}</text
-              >元宝</view
+        <view v-if="packageList !== null">
+          <view v-if="packageList.length > 0" class="package">
+            <view
+              v-for="(item, index) in packageList"
+              :key="index"
+              @click="activeIndex = index"
+              :style="{
+                background: activeIndex === index ? backgroundColor : '#fff',
+                color: activeIndex === index ? mainColor : '#333',
+                marginRight: (index + 1) % 3 == 0 ? '0' : '36rpx',
+              }"
+              class="package-item"
             >
+              <view>{{ item.package_name }}</view>
+              <view>
+                <text>{{ item.pay_amount }}</text
+                >元宝</view
+              >
+            </view>
           </view>
+          <xd-no-data height="20vh" v-else :iconType="empty">
+            当前票券无套餐
+          </xd-no-data>
         </view>
         <view class="wrap" style="margin-top: 28rpx" v-if="notice">
           <view
@@ -76,11 +85,8 @@
           class="jfb-base-card-delay__body-footer"
           :style="prod_bottom"
         >
-          <xd-button
-            width="560rpx"
-            type="primary"
-            @click="handleBuy"
-            >{{pay_amount}}元延期</xd-button
+          <xd-button width="560rpx" type="primary" @click="handleBuy"
+            >{{ pay_amount }}元延期</xd-button
           >
         </view>
       </view>
@@ -98,6 +104,7 @@ import componentsMixins from "@/mixins/componentsMixins";
 import XdContentXss from "@/components/XdContentXss/XdContentXss";
 import extsMixins from "@/mixins/extsMixins";
 import colorCardMixins from "@/mixins/colorCardMixins";
+import XdNoData from "@/components/XdNoData/XdNoData";
 const Color = require("color");
 
 export default {
@@ -106,6 +113,7 @@ export default {
     XdFontIcon,
     XdContentXss,
     XdButton,
+    XdNoData,
   },
   mixins: [
     componentsMixins,
@@ -118,11 +126,12 @@ export default {
       notice: "",
       card_number: "",
       backgroundColor: "",
-      packageList: [],
+      packageList: null,
       activeIndex: 0,
       package_id: null,
       payPath: "",
-      pay_amount: 0
+      pay_amount: 0,
+      successPath: "",
     };
   },
   computed: {
@@ -135,12 +144,17 @@ export default {
       if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
       if (this.$configProject["isPreview"]) this.init(value);
     },
-    activeIndex(n,o) {
-      if(n!==o) {
+    activeIndex(n, o) {
+      if (n !== o) {
         this.package_id = this.packageList[n].id;
         this.pay_amount = this.packageList[n].pay_amount;
       }
-    }
+    },
+    card_number(n, o) {
+      if (n === "") {
+        this.packageList = null;
+      }
+    },
   },
   created() {
     this.backgroundColor = Color(this.mainColor).alpha(0.2).toString();
@@ -151,10 +165,9 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.getContent();
-      this.getList();
     },
     getContent() {
-      jfbRootExec("getListGiftNewsContentEntry", {
+      jfbRootExec("getCardDelayContent", {
         vm: this,
         data: {
           page_id: this.pageAttr["page_id"], //页面ID
@@ -193,6 +206,8 @@ export default {
             this.packageList = res.list;
             this.package_id = this.packageList[0].id;
             this.pay_amount = this.packageList[0].pay_amount;
+          } else {
+            this.packageList = [];
           }
         })
         .catch((error) => {
@@ -210,9 +225,15 @@ export default {
       })
         .then((res) => {
           this.$xdHideLoading();
-          this.$xdUniHelper.navigateTo({
-            url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=delay`,
-          });
+          if (res.is_need_pay === "Y") {
+            this.$xdUniHelper.navigateTo({
+              url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=delay`,
+            });
+          } else {
+            this.$xdUniHelper.navigateTo({
+              url: `${this.successPath}?order_id=${res.order_id}&type=delay`,
+            });
+          }
         })
         .catch((err) => {
           this.$xdHideLoading();
@@ -227,6 +248,9 @@ export default {
       this.payPath = getContainerPropsValue(container, "content.payPath", {
         value: "",
       }).value;
+      this.successPath = getContainerPropsValue(container, "content.successPath", {
+        value: "",
+      }).value;
     },
   },
 };
@@ -242,6 +266,7 @@ export default {
       border-radius: 20rpx;
       border: 1rpx solid #eeeeee;
       padding: 36rpx;
+      background: #fff;
       input {
         height: 30rpx;
         border-radius: 16rpx;
@@ -258,7 +283,6 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      background: #fff;
     }
     .package {
       display: flex;

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -76,7 +76,7 @@
             width="100%"
             @click="handleGive()"
             size="small"
-            type="primary">转赠</xd-button>
+            type="primary">赠送</xd-button>
         </view>
         <view v-if="info.is_exchange==='Y'">
           <xd-button

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -67,7 +67,7 @@
                 </view>
                 <view>
                   <view>{{ item.card_number }}</view>
-                  <view>有效期至:--</view>
+                  <view>有效期至:{{item['is_show_baseinfo'] === 'Y'? item['end_time'] :'--'}}</view>
                 </view>
               </view>
               <view class="jfb-base-card-disabled__body-card-item-right-bottom">
@@ -75,7 +75,7 @@
                   <view
                     style="color: #b8b7be"
                     class="jfb-base-card-disabled__body-card-item-right-bottom-info-residue"
-                  >剩余{{ item.unit }}数：--{{ item.unit }}</view>
+                  >剩余{{ item.unit }}数：{{item['is_show_baseinfo'] === 'Y'? `${item['card_point']} ${item.unit}`:'--'}}</view>
                 </view>
                 <view
                   @click.stop="handleUnBindCard(item)"

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit"
-      >删除</view
-      >
+      <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-disabled-entry__body">
@@ -46,16 +44,19 @@
                 </div>
                 <view class="card-list__date">
                   <text>有效期：</text>
-                  <text>--</text>
+                  <text>{{item['is_show_baseinfo'] === 'Y'? item['end_time'] :'--'}}</text>
                 </view>
                 <view class="card-list__yue">
                   <text>余额：</text>
-                  <text>--</text>
+                  <text>{{item['is_show_baseinfo'] === 'Y'? `${item['card_point']} ${item.unit}`:'--'}}</text>
                 </view>
-                <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2 ">
+                <view
+                  class="card-list__other"
+                  v-if="item.other_card_point && item.card_point_type === 2 "
+                >
                   <view>
                     <text>购买其他物品可抵：</text>
-                    <text>--</text>
+                    <text>{{item['is_show_baseinfo'] === 'Y' ? item['other_card_point'] :'--'}}</text>
                   </view>
                 </view>
                 <template>
@@ -200,7 +201,6 @@ export default {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
         .then((res) => {
-          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -134,7 +134,7 @@
       <view
         class="jfb-base-card-entry__body-tips"
         :style="{ color: warningColor }"
-        v-if="subTabIndex === 2"
+        v-if="subTabIndex === 2&&tabIndex === 1"
       >* 目前仅支持电影票兑换券进行转换</view>
       <view class="card-content">
         <view v-if="loadingCardList" class="jfb-base-card-entry__body-card skeleton-card">
@@ -294,6 +294,7 @@
               :couponLeftBgColor="couponLeftBgColor"
               :item="item"
               @useCoupon="handleBindLogin(item,item['entries'][0])"
+              @toDetail="toDetail(item)"
             ></xd-coupon-item>
           </view>
           <view v-else>
@@ -587,7 +588,7 @@ export default {
       this.bindUrl = getContainerPropsValue(container,"content.bind_url",{value: ""}).value;
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
-      this.get_url = getContainerPropsValue(container,"content.get_url",{value: ""}).value;
+      this.give_url = getContainerPropsValue(container,"content.give_url",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       this.isShowCode = getContainerPropsValue(container, "content.isShowCode", "Y");
       this.isShowCoupon = getContainerPropsValue(container, "content.isShowCoupon", "N");
@@ -817,7 +818,7 @@ export default {
     toDetail(item, out=true) {
       if(this.subTabIndex===3) {
         this.$xdUniHelper.navigateTo({
-          url: `${this.get_url}?card_number=${item["card_number"]}`,
+          url: `${this.give_url}?card_number=${item["card_number"]}`,
         }, false);
       } else {
         this.$xdUniHelper.navigateTo({
@@ -925,6 +926,8 @@ export default {
           } else {
             type = 'is_transfering'
           }
+          console.log(this.ajaxCardList, type, 'this.ajaxCardList, type');
+          
           this.handleCardInit(this.ajaxCardList, type);
           this.cardPageNum = 1;
           this.$xdHideLoading();

package/src/components/JfbBaseCardGive/Attr.js

@@ -13,7 +13,7 @@ export default {
         valueKey: 'get_url',
         groupKey:'advanced',
         placeholder: '请选择领取地址',
-        value: null,
+        value: data['get_url']||null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -212,6 +212,10 @@ export default {
       })
         .then((res) => {
           this.info = res;
+          this.info.card_point = this.$xdUniHelper.divisionFloatNumber(
+            this.info.card_point,
+            100
+          );
           this.greeting = res.transfer_record.greeting;
           this.info["theme"] = this.getCardThemes(this.info["card_type_name"]);
           if (
@@ -364,6 +368,7 @@ export default {
           border-radius: 8rpx;
           padding: 8rpx 20rpx;
           display: inline-block;
+          margin-bottom: 30rpx;
         }
       }
     }

package/src/components/JfbBaseCardReceive/Api.js

@@ -20,7 +20,7 @@ module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Card
     mapFnName: 'receiveCard',
-    title: '获取领取详情',
+    title: '领取',
     path: '/card/v1/card-transfer/receive',
     isRule: false,
     data: {

package/src/components/JfbBaseCardReceive/Attr.js

@@ -13,7 +13,7 @@ export default {
         valueKey: 'use_url',
         groupKey: 'advanced',
         placeholder: '请选择使用地址',
-        value: null,
+        value: data['use_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseCardReceive/JfbBaseCardReceive.vue

@@ -89,9 +89,16 @@
           </view>
         </view>
       </view>
-      <view v-if="info.transfer_record.status !== 'Y'" style="height: 110rpx"></view>
-      <view v-if="info.transfer_record.status !== 'Y'" class="jfb-base-card-receive__body-footer" :style="prod_bottom">
-        <xd-button  width="670rpx" type="primary" @click="handleReceive"
+      <view
+        v-if="info.transfer_record.status !== 'Y'"
+        style="height: 110rpx"
+      ></view>
+      <view
+        v-if="info.transfer_record.status !== 'Y'"
+        class="jfb-base-card-receive__body-footer"
+        :style="prod_bottom"
+      >
+        <xd-button width="670rpx" type="primary" @click="handleReceive"
           >立即领取</xd-button
         >
       </view>
@@ -104,7 +111,7 @@
         <view class="dialog">
           <view class="dialog-title">领取失败</view>
           <view class="dialog-content">{{ errMsg }}</view>
-          <xd-button @click="dialogShow = false" width="360rpx" type="primary"
+          <xd-button @click="handleClose" width="360rpx" type="primary"
             >确定</xd-button
           >
         </view>
@@ -183,7 +190,6 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      debugger
       this.transfer_auth_code = options.transfer_auth_code;
       this.getDetail();
     },
@@ -197,6 +203,10 @@ export default {
       })
         .then((res) => {
           this.info = res;
+          this.info.card_point = this.$xdUniHelper.divisionFloatNumber(
+            this.info.card_point,
+            100
+          );
           this.info["theme"] = this.getCardThemes(this.info["card_type_name"]);
           if (
             this.info &&
@@ -234,6 +244,11 @@ export default {
           console.log(err, "err");
         });
     },
+    handleClose() {
+      this.dialogShow = false;
+      this.getDetail();
+    },
+
     toUse() {
       this.$xdUniHelper.navigateTo({
         url: `${this.use_url}`,
@@ -303,6 +318,7 @@ export default {
           border-radius: 8rpx;
           padding: 8rpx 20rpx;
           display: inline-block;
+          margin-bottom: 30rpx;
         }
       }
     }

package/src/components/JfbBaseCardReceive/Mock.js

@@ -2,12 +2,6 @@
 
 module.exports = {
   
-  getCardByIdFilmSquate:{},
-  
-  updateCardFilmPaiqiDate:{},
-  
-  removeCardFilmAddress:{},
-  
-  addCardFilmcart:{},
+  getReceiveDetailCard:{"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":[{"id":94,"business_code":"market","entry_name":"商城","image_url":"\/uploads\/20240903\/a36f36087bfd8f8c389a279cd08c066b.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-02.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"appType\":\"h5\",\"site_id\":\"1efce09784b33c4a\",\"site_url\":\"https:\\\/\\\/sandbox-website-02.jufubao.cn\\\/apply\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"\"}","custom_redirect_data":"\"\"","redirect_type":"INN","group_id":"default"},{"id":92,"business_code":"cake","entry_name":"蛋糕","image_url":"\/uploads\/20240820\/85a60857ccd5176d4e40d8fe95ebd0dc.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-02.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"appType\":\"h5\",\"site_id\":\"1efce09784b33c4a\",\"site_url\":\"https:\\\/\\\/sandbox-website-02.jufubao.cn\\\/apply\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"\"}","custom_redirect_data":"\"\"","redirect_type":"INN","group_id":"default"},{"id":93,"business_code":"movie","entry_name":"电影","image_url":"\/uploads\/20240820\/e1600b21059da005f446ce32388ee712.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-02.jufubao.cn\",\"path\":\"\\\/main\\\/movie\\\/index\",\"appType\":\"h5\",\"site_id\":\"1efce09784b33c4a\",\"site_url\":\"https:\\\/\\\/sandbox-website-02.jufubao.cn\\\/apply\\\/main\\\/movie\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/movie\\\/index\",\"fixed_business_code\":\"\"}","custom_redirect_data":"\"\"","redirect_type":"INN","group_id":"default"}],"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":"1a93ea5b639d9f60"},
   
 }

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -59,7 +59,7 @@ export default {
         valueKey: 'receive_get_url',
         groupKey:'advanced',
         placeholder: '请选择领取跳转地址',
-        value: null,
+        value: data['receive_get_url']||null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -22,9 +22,9 @@
       <view class="content" :style="contentBgStyle">
         <view class="content-info">{{ greeting }}</view>
       </view>
-      <xd-button class="btn" @click="handleToReceive" :style="btnBgStyle"
-        >立即领取</xd-button
-      >
+      <view class="btn" @click="handleToReceive" :style="btnBgStyle">{{
+        status === "T" ? "链接已失效" : "立即领取"
+      }}</view>
     </view>
   </view>
 </template>
@@ -51,7 +51,8 @@ export default {
       greeting: "我的时代看哈稍等哈手机卡好卡哈哈哈哈哈哈",
       receive_get_url: "",
       btnColor: "",
-      transfer_auth_code: null
+      transfer_auth_code: null,
+      status: "N",
     };
   },
   computed: {
@@ -62,6 +63,7 @@ export default {
         backgroundSize: "100% 100%",
         width: "326rpx",
         height: "90rpx",
+        lineHeight: "80rpx",
         color: this.btnColor,
         border: "none",
       });
@@ -88,18 +90,20 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.transfer_auth_code = options.transfer_auth_code
+      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
-      }).catch(err=>{
-        console.log(err,'err');
-        
       })
+        .then((res) => {
+          this.greeting = res.transfer_record.greeting;
+          this.status = res.transfer_record.status;
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
     /**
      * @description 监听事件变化

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/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,
   },
 ];

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -16,8 +16,15 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
-      <view v-if="loadingList" :style="{ padding: outMargin }" class="skeleton-wrap">
-        <view v-for="i in 3" :key="i" class="jfb-base-recharge-order__body-order"
+      <view
+        v-if="loadingList"
+        :style="{ padding: outMargin }"
+        class="skeleton-wrap"
+      >
+        <view
+          v-for="i in 3"
+          :key="i"
+          class="jfb-base-recharge-order__body-order"
           :style="{
             background: backgroundColor,
             border: borderBox,
@@ -42,7 +49,10 @@
         </view>
       </view>
       <template v-else>
-        <view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
+        <view
+          v-if="orderList && orderList.length > 0"
+          :style="{ padding: outMargin }"
+        >
           <view
             v-for="(item, index) in orderList"
             :key="index"
@@ -57,7 +67,7 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              {{item.source==='recharge'?'充值订单':'延期订单'}}
+              {{ type === "recharge" ? "充值订单" : "延期订单" }}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
               <view
@@ -72,13 +82,21 @@
               <view>交易日期：{{ item.created_time }} </view>
             </view>
             <view
-              style="margin-top: 32rpx; display: flex; justify-content: space-between"
+              style="
+                margin-top: 32rpx;
+                display: flex;
+                justify-content: space-between;
+              "
             >
-            <view style="display: flex; align-items: center;font-size: 24rpx;"
-                >合计：<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
+              <view style="display: flex; align-items: center; font-size: 24rpx"
+                >合计：<xd-unit
+                  :fontSize="24"
+                  iconSize="0.24"
+                  :price="item.total_amount"
+                ></xd-unit
               ></view>
               <xd-button
-              v-if="item.pay_status !== '3000'"
+                v-if="item.pay_status !== '3000'"
                 width="200rpx"
                 style="margin: 0"
                 size="mini"
@@ -92,7 +110,6 @@
           </view>
         </view>
       </template>
-
     </view>
   </view>
 </template>
@@ -147,12 +164,13 @@ export default {
         right: 0,
         bottom: 0,
       },
+      type: "recharge",
     };
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
   },
   computed: {
@@ -161,7 +179,7 @@ export default {
       str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
       str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
       str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-      return str
+      return str;
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -179,6 +197,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -241,7 +260,8 @@ export default {
       }).value;
     },
     getList() {
-      jfbRootExec("getRechargeOrderList", {
+      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -264,7 +284,7 @@ export default {
             }
             return item;
           });
-          this.hasNext = res.next_page_token !== '';
+          this.hasNext = res.next_page_token !== "";
           this.next_page_token = res.next_page_token;
         })
         .catch((err) => {
@@ -273,12 +293,12 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${item.source}`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}`,
+        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
       });
     },
 
@@ -290,9 +310,8 @@ export default {
     },
 
     onJfbBack(options) {
-      this.$xdUniHelper.navigateBack()
+      this.$xdUniHelper.navigateBack();
     },
-
   },
 };
 </script>
@@ -306,7 +325,7 @@ export default {
     &-order {
       padding: unit(32, rpx);
       &:last-child {
-        margin-bottom: 0!important;
+        margin-bottom: 0 !important;
       }
 
       &-header {
@@ -316,7 +335,7 @@ export default {
         padding-bottom: unit(24, rpx);
 
         & > view {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(200rpx, 32rpx);
           }
         }
@@ -324,12 +343,12 @@ export default {
 
       &-middle {
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(400rpx, 32rpx);
           }
         }
         & > view:last-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(100rpx, 32rpx);
           }
         }
@@ -337,19 +356,19 @@ export default {
 
       &-bottom {
         border-bottom: unit(2, rpx) solid #f2f2f2;
-        padding-bottom: unit(32,rpx);
+        padding-bottom: unit(32, rpx);
 
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(400rpx, 32rpx);
           }
         }
       }
       &-bbb {
-        padding: unit(32,rpx) 0 0;
+        padding: unit(32, rpx) 0 0;
 
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(100%, 32rpx);
           }
         }

package/src/components/JfbBaseRechargeOrderDetail/Api.js

@@ -22,4 +22,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getDelayOrderDetail',
+    title: '获取卡延期订单详情',
+    path: '/card/v1/card-recharge/get-order',
+    isRule: false,
+    params: {
+      order_id: ['订单id', 'Number', true],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue

@@ -17,14 +17,14 @@
     <!-- #endif -->
     <view v-if="info !== null" class="jfb-base-recharge-order-detail__body">
       <view
-        v-if="info.source === 'delay'"
+        v-if="type === 'delay'"
         class="jfb-base-recharge-order-detail__body-delay jfb-base-recharge-order-detail__body-card"
       >
         <image
           src="https://img.js.design/assets/img/66bad59319ceba995cccf478.png#fbe012b12eff21137811ee558189f911"
         ></image>
         <view class="jfb-base-recharge-order-detail__body-delay-info">
-          <view>{{info.package_name}}</view>
+          <view>{{ info.package_name }}</view>
           <view>
             <xd-unit
               :price="info.total_amount"
@@ -36,7 +36,7 @@
       </view>
       <view
         class="jfb-base-recharge-order-detail__body-point jfb-base-recharge-order-detail__body-card"
-        v-if="info.source === 'recharge'"
+        v-if="type === 'recharge'"
       >
         <view>充值点数</view>
         <xd-unit
@@ -46,7 +46,7 @@
         ></xd-unit>
       </view>
       <view
-        v-if="info.source === 'recharge'"
+        v-if="type === 'recharge'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
         <view class="jfb-base-recharge-order-detail__body-order-header">
@@ -65,7 +65,7 @@
         </view>
       </view>
       <view
-        v-if="info.source === 'delay'"
+        v-if="type === 'delay'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
         <view class="jfb-base-recharge-order-detail__body-order-header">
@@ -87,7 +87,7 @@
         </view>
       </view>
       <view
-        v-if="info.source === 'recharge'"
+        v-if="type === 'recharge'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
         <view
@@ -106,8 +106,8 @@
           <view>充值状态：{{ info.pay_status_name }}</view>
         </view>
       </view>
-       <view
-        v-if="info.source === 'delay'"
+      <view
+        v-if="type === 'delay'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
         <view
@@ -146,6 +146,7 @@ export default {
     return {
       order_id: "",
       info: null,
+      type: "recharge", //延期：delay，充值：recharge
     };
   },
   watch: {
@@ -160,6 +161,7 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
+      this.type = options.type || "recharge";
       this.getDetial();
     },
     /**
@@ -171,7 +173,11 @@ export default {
       //this.height = getContainerPropsValue(container, 'content.height', 10);
     },
     getDetial() {
-      jfbRootExec("getRechargeOrderDetail", {
+      let fnName =
+        this.type === "recharge"
+          ? "getRechargeOrderDetail"
+          : "getDelayOrderDetail";
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           order_id: this.order_id,

package/src/components/JfbBaseRechargeSuccess/Api.js

@@ -22,4 +22,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getDelayOrderDetail',
+    title: '获取卡延期订单详情',
+    path: '/card/v1/card-delay/get-order',
+    isRule: false,
+    params: {
+      order_id: ['订单id', 'Number', true],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseRechargeSuccess/Attr.js

@@ -8,7 +8,7 @@ export default {
   content: (data) => {
     return [
       {
-        label: '充值成功去订单详情地址:',
+        label: '卡券操作成功去订单详情地址:',
         ele: 'xd-select-pages-path',
         valueKey: 'detailPath',
         groupKey:'advanced',

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -66,6 +66,7 @@ export default {
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
       time: 1, //时间幂指数
+      type: 'recharge', //延期：delay，充值：recharge
     };
   },
   watch: {
@@ -80,6 +81,7 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
+      this.type = options.type || 'recharge';
       this.getStatus();
     },
     /**
@@ -97,7 +99,8 @@ export default {
       }).value;
     },
     getStatus() {
-      jfbRootExec("getRechargeOrderDetail", {
+      let fnName = this.type === 'recharge' ? 'getRechargeOrderDetail' : 'getDelayOrderDetail';
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           order_id: this.order_id,
@@ -112,13 +115,13 @@ export default {
     },
     handleToPay() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}&type=${this.info.source}`,
+        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}`,
       });
     },
     handleToBtn(item) {
       if (item.type === "detail") {
         this.$xdUniHelper.navigateTo({
-          url: `${this.detailPath}?id=${this.order_id}`,
+          url: `${this.detailPath}?id=${this.order_id}&type=${this.type}`,
         });
       } else if (item.type === "pay") {
         this.handleToPay()