jufubao-base 1.0.56-beta8 → 1.0.56-beta9

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -29,7 +29,7 @@
             }"
           >
             <xd-font-icon
-              style="margin-bottom: 15rpx"
+              :style="{marginBottom: '15rpx'}"
               size="80"
               icon="iconsaoma"
             ></xd-font-icon>
@@ -45,7 +45,7 @@
             }"
           >
             <xd-font-icon
-              style="margin-bottom: 15rpx"
+							:style="{marginBottom: '15rpx'}"
               size="80"
               icon="iconyuechi"
             ></xd-font-icon>
@@ -67,7 +67,7 @@
           </view>
         </template>
       </view>
-      <view class="jfb-base-card__body-line"></view>
+      <view class="jfb-base-card__body-line" v-if="!notice"></view>
       <view
         class="jfb-base-card__body-notice"
         :style="{ background: noticeBackgroundColor }"
@@ -119,10 +119,9 @@
       </view>
       <view
         class="jfb-base-card__body-tips"
-        :style="{ color: mainColor }"
+        :style="{ color: warningColor }"
         v-if="tabIndex === 2"
-        >*目前仅支持电影票兑换券进行转换</view
-      >
+			>* 目前仅支持电影票兑换券进行转换</view>
       <view
         v-if="tabIndex === 2 || tabIndex === 1"
         class="jfb-base-card__body-card"
@@ -621,13 +620,13 @@ export default {
 
     &-line {
       width: 120%;
-      height: unit(4, rpx);
+      height: 1px;
       background: #eee;
       margin: unit(60, rpx) unit(-35, rpx) 0 unit(-35, rpx);
     }
 
     &-notice {
-      margin: 0 unit(-35, rpx) 0 unit(-35, rpx);
+      margin: unit(46, rpx) unit(-35, rpx) 0 unit(-35, rpx);
       padding: unit(22, rpx) unit(35, rpx);
       line-height: unit(70, rpx);
     }

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -69,6 +69,7 @@
           </view>
         </template>
       </view>
+      <view class="jfb-base-card-entry__body-line" v-if="!notice"></view>
       <view
         class="jfb-base-card-entry__body-notice"
         :style="{ background: noticeBackgroundColor }"
@@ -96,9 +97,7 @@
           color: dangerColor,
           fontSize: 26 + 'rpx',
         }"
-      >
-        该组件未配置数据，因此改模块在正式环境将不显示</view
-      >
+      >该组件未配置数据，因此改模块在正式环境将不显示</view>
       <view class="jfb-base-card-entry__body-tab">
         <view
           @click="tabIndex = 1"
@@ -400,6 +399,7 @@ export default {
       //this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
     },
+    
     handleToLink(path) {
       this.$xdUniHelper.navigateTo({
         url: path,
@@ -655,7 +655,7 @@ export default {
   box-sizing: border-box;
 
   &__body {
-    padding: unit(40, rpx) unit(26, rpx);
+    padding: unit(30, rpx) unit(26, rpx);
     color: #333;
 
     &-dialog {
@@ -691,6 +691,13 @@ export default {
         }
       }
     }
+  
+    &-line {
+      height: 1px;
+      background: #eee;
+      overflow: hidden;
+      margin: unit(30, rpx) unit(-35, rpx) 0 unit(-35, rpx);
+    }
 
     &-cut {
       display: flex;
@@ -714,7 +721,8 @@ export default {
     }
 
     &-notice {
-      margin: unit(40, rpx) unit(-35, rpx) 0 unit(-35, rpx);
+      margin: unit(30, rpx) unit(-35, rpx) 0 unit(-35, rpx);
+      
       padding: unit(22, rpx) unit(35, rpx);
       line-height: unit(70, rpx);
     }
@@ -723,8 +731,8 @@ export default {
       display: flex;
       align-items: center;
       font-size: unit(28, rpx);
-      margin-bottom: unit(40, rpx);
-      margin-top: unit(40, rpx);
+      margin-bottom: unit(30, rpx);
+      margin-top: unit(30, rpx);
 
       & > view {
         // width: unit(214, rpx);
@@ -739,7 +747,7 @@ export default {
 
     &-tips {
       font-size: unit(20, rpx);
-      margin-bottom: unit(40, rpx);
+      margin-bottom: unit(30, rpx);
     }
 
     &-disabled {
@@ -903,7 +911,7 @@ export default {
       justify-content: flex-start;
       align-items: center;
       flex-flow: nowrap;
-      margin-left: unit(-16, rpx);
+      margin-left: unit(-14, rpx);
       padding-top: unit(20, rpx);
       
       & > view {

package/src/components/JfbBaseCardEntry/Mock.js

@@ -2,108 +2,226 @@
 
 module.exports = {
   getListEntryCardBind: {
-    "is_show_invalid_card_entrance": "Y",
     "list": [{
-      "card_number": "101001000005195",
-      "card_point": 100000000,
-      "card_type_name": "聚福宝福卡测试蛋糕",
+      "card_number": "101001000008422",
+      "card_point": 100000,
+      "card_type": "27",
+      "card_type_name": "聚福宝福",
       "unit": "点",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2025-04-30",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["health"]
     }, {
-      "card_number": "101001000005193",
-      "card_point": 99963600,
-      "card_type_name": "聚福宝福卡测试蛋糕",
-      "unit": "次",
-      "end_time": "2024-10-31 23:59:59",
+      "card_number": "121000100000028",
+      "card_point": 10000,
+      "card_type": "44",
+      "card_type_name": "抵扣券测试",
+      "unit": "点",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["health"]
     }, {
-      "card_number": "101001000005184",
+      "card_number": "101001000005192",
       "card_point": 100000000,
-      "card_type_name": "聚福宝福卡测试蛋糕",
-      "unit": "",
-      "end_time": "2024-10-31 23:59:59",
-      "is_valid": "Y",
-      "main_product_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N"
-    }, {
-      "card_number": "101001000005185",
-      "card_point": 99631000,
-      "card_type_name": "聚福宝福卡测试蛋糕",
+      "card_type": "27",
+      "card_type_name": "聚福宝福",
       "unit": "点",
-      "end_time": "2024-10-31 23:59:59",
+      "end_time": "2024-10-31",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
     }, {
-      "card_number": "101001000006990",
-      "card_point": 1400,
-      "card_type_name": "聚福宝福卡测试蛋糕",
-      "unit": "",
-      "end_time": "2025-05-03 23:59:59",
+      "card_number": "101001000008421",
+      "card_point": 100000,
+      "card_type": "27",
+      "card_type_name": "聚福宝福",
+      "unit": "点",
+      "end_time": "2024-12-31",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["cake"]
     }, {
-      "card_number": "171004000000012",
-      "card_point": 0,
-      "card_type_name": "聚福宝测试C40",
+      "card_number": "171003500000385",
+      "card_point": 10000,
+      "card_type": "39",
+      "card_type_name": "一对一次卡（无限制）",
       "unit": "次",
-      "end_time": "2025-05-03 23:59:59",
+      "end_time": "2024-08-31",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "Y"
+      "is_exchange": "Y",
+      "card_point_type": 1,
+      "business_codes": ["movie", "market", "cake"]
     }, {
-      "card_number": "101001000006989",
-      "card_point": 3600,
-      "card_type_name": "聚福宝福卡测试蛋糕",
-      "unit": "",
-      "end_time": "2025-05-03 23:59:59",
+      "card_number": "101001000007175",
+      "card_point": 9998700,
+      "card_type": "27",
+      "card_type_name": "聚福宝福",
+      "unit": "点",
+      "end_time": "2023-10-31",
       "is_valid": "Y",
-      "main_product_name": "",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["movie", "market", "cake", "video", "play", "health"]
     }, {
-      "card_number": "171004000000011",
+      "card_number": "261001000002666",
       "card_point": 0,
-      "card_type_name": "聚福宝测试C40",
+      "card_type": "35",
+      "card_type_name": "大礼包测试",
       "unit": "次",
-      "end_time": "2025-05-03 23:59:59",
-      "is_valid": "Y",
-      "main_product_name": "",
+      "end_time": "2025-02-28",
+      "is_valid": "N",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "Y"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["gift"]
     }, {
-      "card_number": "101001000005479",
-      "card_point": 10000000,
-      "card_type_name": "聚福宝福卡测试蛋糕",
+      "card_number": "261001000002518",
+      "card_point": 100000,
+      "card_type": "31",
+      "card_type_name": "加盟商福卡",
       "unit": "点",
-      "end_time": "2024-02-03 23:59:59",
-      "is_valid": "Y",
-      "main_product_name": "",
+      "end_time": "2023-08-29",
+      "is_valid": "N",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
     }, {
-      "card_number": "101001000005478",
-      "card_point": 1000000,
-      "card_type_name": "聚福宝福卡测试蛋糕",
-      "unit": "点",
-      "end_time": "2024-02-23 23:59:59",
-      "is_valid": "Y",
-      "main_product_name": "",
+      "card_number": "261001000000344",
+      "card_point": 100,
+      "card_type": "35",
+      "card_type_name": "大礼包测试",
+      "unit": "次",
+      "end_time": "2023-07-21",
+      "is_valid": "N",
+      "main_business_code_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
-    }], "request_id": "dd73b058e5de1e90"
+      "is_exchange": "N",
+      "card_point_type": 1,
+      "business_codes": ["movie", "market", "cake", "book", "gift", "video", "play", "health", "small", "travel"]
+    }],
+    "is_show_invalid_card_entrance": "Y",
+    "is_can_unbind": "Y",
+    "site_entry_settings": [{
+      "id": 57,
+      "business_code": "movie",
+      "entry_name": "在线选座",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/74fcb8bf1bf617249eee5f1416533766.png",
+      "redirect_data": "{\"path\":\"https:\\\/\\\/website-01.jufubao.cn\\\/base\\\/system\\\/zhrk\\\/zkrk\"}",
+      "redirect_type": "URL"
+    }, {
+      "id": 10,
+      "business_code": "gift",
+      "entry_name": "礼包",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/f1c8a447209eb04d77c2095a13cdadf4.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/gift\\\/type\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/gift\\\/type\",\"frontPath\":\"\\\/apply\\\/main\\\/gift\\\/type\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 7,
+      "business_code": "movie",
+      "entry_name": "在线选座",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/61b3302ec80009964e0a4b7b2336e5cf.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/movie\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/movie\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/movie\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 9,
+      "business_code": "cake",
+      "entry_name": "蛋糕",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/e582dc796bdb703a10860bcbbbb378f3.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 18,
+      "business_code": "book",
+      "entry_name": "图书",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/9edcdc737c48cdbf9364e321e8199a93.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/book\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/book\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/book\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 8,
+      "business_code": "market",
+      "entry_name": "百货",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/920c4bd80f0a995e245aedbfaf1181d5.png",
+      "redirect_data": "{\"dir\":\"apply02\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply02\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply02\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 17,
+      "business_code": "video",
+      "entry_name": "网络视听",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/1ca9647b7ddd9937054792412d3c2367.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/video\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/video\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/video\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 35,
+      "business_code": "v-RcA8Mv-Gpd96_Y_mjIf",
+      "entry_name": "全福券",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/53191864826b864b8b6fd4f1eb397a93.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/system\\\/card\\\/card\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/system\\\/card\\\/card\",\"frontPath\":\"\\\/apply\\\/system\\\/card\\\/card\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 40,
+      "business_code": "93028be3",
+      "entry_name": "专区",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/84d23a8c7af7a63842eb696c00068b3d.png",
+      "redirect_data": "{\"dir\":\"apply05\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply05\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply05\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"-y8t4cmogeFvi8fmuxFSK\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 34,
+      "business_code": "food",
+      "entry_name": "餐饮",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/97728bf3ef2a6361c0a1771549d2d435.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/food\\\/rkym\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/food\\\/rkym\",\"frontPath\":\"\\\/apply\\\/main\\\/food\\\/rkym\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 55,
+      "business_code": "cake",
+      "entry_name": "蛋糕内部",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/2e549739768758dde7968ff7cb98c6d8.png",
+      "redirect_data": "{\"dir\":\"apply03\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply03\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply03\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"cake\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 54,
+      "business_code": "health",
+      "entry_name": "体检",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/e06b058a2104025ffecee960b3b9321d.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/health\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/health\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/health\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 30,
+      "business_code": "travel",
+      "entry_name": "旅游",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/09ceefe2d1776a399b567c7acdf2c9db.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/travel\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/travel\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/travel\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }, {
+      "id": 16,
+      "business_code": "play",
+      "entry_name": "演出",
+      "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/07e1d76f1850fbadc9a12d7ff2d7689c.png",
+      "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/play\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/play\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/play\\\/index\",\"fixed_business_code\":\"\"}",
+      "redirect_type": "INN"
+    }],
+    "request_id": "b5231dd2d0f71d95"
   },
   loginEntryCardBind: {
     "card_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhM2U4YjQ5OWEwNzUwN2EyIiwiaWF0IjoxNjc0OTYzODE3LjY2OTM1MywiZXhwIjoxNjc1MDIwNTc3LjY2OTM1MywiY2FyZF9udW1iZXIiOiIxMDEwMDEwMDAwMDUxOTUiLCJjYXJkX3R5cGVfbmFtZSI6IjZJR2E1NmFQNWE2ZDU2YVA1WTJoNXJXTDZLK1Y2SnVMNTdPViIsInByaWNlIjoxMDAsIm9ubGluZV9wcmljZSI6MTAwLCJ1c2Vfc2NlbmNlIjozLCJidXNpbmVzc19jb2RlcyI6IjAsMSwyLDMsNCJ9.LsoBJq4pC_gSc1jZRwDhD2rAfOf1DMCy29VHomGiqYE",