jufubao-base 1.0.55-beta2 → 1.0.55-beta4

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -14,6 +14,17 @@ export default {
         {label: "布局2", value: "2"},
       ]
     },
+    {
+      label: '票券登陆文案:',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'login_name',
+      value: '',
+      placeholder: '请输入票券登陆文案',
+      className: 'input80',
+      inline: false,
+      notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
+    },
     {
       label: '失效卡列表地址:', //label
       ele: 'xd-select-pages-path', //package 名称

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -140,7 +140,7 @@
                 :color="mainColor"
                 icon="iconyouhuiquan1-011"
               ></xd-font-icon>
-              <view>{{ tabIndex === 1 ? "登录" : "转换" }}</view>
+              <view>{{ tabIndex === 1 ? login_name : "转换" }}</view>
             </view>
             <view class="jfb-base-card__body-card-item-right">
               <view class="jfb-base-card__body-card-item-right-top">
@@ -148,7 +148,7 @@
                   <xd-font-icon
                     icon="iconkaquan"
                     size="38"
-                    style="margin-right: 18rpx"
+                    :style="{marginRight: '18rpx'}"
                     :color="mainColor"
                   ></xd-font-icon>
                   <view>{{ item.card_type_name }}</view>
@@ -183,6 +183,7 @@
         </template>
         <template v-else>
           <xd-card-v2
+            :login-name="login_name"
             v-for="(item, index) in showList"
             :mainColor="mainColor"
             :key="index"
@@ -277,6 +278,7 @@ export default {
       inCallback: null, //内部跳转地址
 
       //页面跳转地址
+      login_name:'',//登陆文案
       changeUrl: "",
       bindUrl: "",
       detailUrl: "",
@@ -326,6 +328,7 @@ export default {
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
+      this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
     },
     handleToLink(path) {
       this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseCardV2/Attr.js

@@ -7,6 +7,30 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '票券登陆文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'login_name',
+        value: data['login_name'] || '',
+        placeholder: '请输入票券登陆文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时候，前台页面显示未"登录"'
+      },
+      {
+        label: '边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: data.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置边距设置',
+        inline: false,
+        notice: '边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
+      },
       {
         label: '卡券详情地址:', //label
         ele: 'xd-select-pages-path', //package 名称

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -14,7 +14,12 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-v2__body">
-      <view class="jfb-base-card__body-card">
+      <view
+        class="jfb-base-card__body-card"
+        :style="{
+          margin: marginUi,
+        }"
+      >
         <view
           v-for="(item, index) in cardList"
           :key="index"
@@ -27,7 +32,7 @@
               color="#8D5F18"
               icon="iconyouhuiquan1-011"
             ></xd-font-icon>
-            <view>登录</view>
+            <view>{{login_name}}</view>
           </view>
           <view class="jfb-base-card__body-card-item-right">
             <view class="jfb-base-card__body-card-item-right-top">
@@ -35,7 +40,7 @@
                 <xd-font-icon
                   icon="iconkaquan"
                   size="30"
-                  style="margin-right: 10rpx"
+                  :style="{marginRight: '10rpx'}"
                 ></xd-font-icon>
                 <view>{{ item.card_type_name }}</view>
               </view>
@@ -66,10 +71,12 @@
           </view>
         </view>
       </view>
-
+      <view :style="{height: '50rpx'}"></view>
       <view class="bottom_fix" :style="button_bottom">
-        <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
-        <xd-button type="primary" @click="toOrderList">我的订单</xd-button>
+        <view>
+          <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
+          <xd-button type="primary" @click="toOrderList">我的订单</xd-button>
+        </view>
       </view>
     </view>
   </view>
@@ -102,6 +109,13 @@
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
         orderListPath: "",
+        login_name:'',
+        margin: {
+          top: 0,
+          left: 0,
+          bottom: 0,
+          right: 0
+        },
       }
     },
     watch: {
@@ -111,13 +125,14 @@
     },
     computed: {
       button_bottom() {
-        return this.fixedStyle({paddingBottom: 24, zIndex: 111})
+        return this.fixedStyle({paddingBottom: 0, zIndex: 111})
+      },
+      marginUi() {
+        return `${this.margin.top || 0}rpx ${this.margin.right || 0}rpx ${this.margin.bottom || 0}rpx ${this.margin.left || 0}rpx`
       },
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -149,6 +164,8 @@
         this.cardInfoPath = getContainerPropsValue(container, "content.cardInfoPath", {value: ""}).value;
         this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
         this.orderListPath = getContainerPropsValue(container, "content.orderListPath", {value: ""}).value;
+        this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+        this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
       },
       handleBindLogin(item){
         this.$xdShowLoading({});
@@ -194,27 +211,11 @@
           url: `${this.cardInfoPath}?card_number=${item["card_number"]}`,
         });
       },
-      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)
+        this.$xdUniHelper.navigateBack()
       },
+      
     }
   }
 
@@ -229,16 +230,21 @@
         position: fixed;
         right: 0;
         left: 0;
-        bottom: 0;
         background: #FFFFFF;
-        width: 100%;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 24rpx;
+      
+        
+        padding: 0 unit(24, rpx);
         box-sizing: border-box;
         box-shadow: 0px 0px 8rpx 0px rgba(179, 193, 196, 0.5);
         z-index: 111;
+        
+        &>view {
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          padding: unit(24, rpx);
+        }
       }
     }
   }

package/src/components/JfbBaseCardV3/Attr.js

@@ -7,6 +7,17 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '票券登陆文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'login_name',
+        value: data.login_name || null,
+        placeholder: '请输入票券登陆文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
+      },
       {
         label: '卡券绑定地址:', //label
         ele: 'xd-select-pages-path', //package 名称
@@ -43,6 +54,6 @@ export default {
     ].filter(i=>i)
   },
   advanced: [
-    
+
   ],
 };

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -18,6 +18,7 @@
       <view class="card_list" v-if="cardList.length">
         <xd-card-v2 v-for="(item, index) in cardList"
           :mainColor="mainColor"
+          :login-name="login_name"
           :key="index"
           :cardInfo="item"
           :tabIndex="1"
@@ -58,10 +59,10 @@
         cardList: [],
         inCallback: "",
         tabIndex: 1,
-        //todo
         cardBindPath: "",
         changeUrl: "",
         detailUrl: "",
+        login_name:''
       }
     },
     watch: {
@@ -94,7 +95,7 @@
           vm: this,
           data: params,
         }).then((res) => {
-          this.cardList = res.list.map((item) => {
+          this.cardList = [].concat(res.list, res.list).map((item) => {
             item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);
             item['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(item.other_card_point,100);
             return item;
@@ -109,6 +110,7 @@
         this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
         this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
         this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
+        this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       },
       toBindCard(){
         this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -893,6 +893,7 @@ export default {
         },
       })
         .then((res) => {
+          debugger
           this.biz_code = res.biz_code;
           if (this.isPreview) {
             switch (this.viewStatus) {
@@ -1422,8 +1423,16 @@ export default {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        
+        
+        &>view {
+          white-space: pre-wrap;
+          word-wrap: break-word;
+          word-break: break-all;
+        }
 
         &-copy {
+          margin-left: unit(10, rpx);
           margin-top: unit(24, rpx);
           border-radius: unit(16, rpx);
           border: unit(2, rpx) solid #999999;

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -1,5 +1,99 @@
 'use strict';
 
 module.exports = {
-  getBaseOrderDetail: { "pay_order_id": "488003809474256896", "detail": [{ "label": "主订单号", "value": "488003806667481089", "type": "copy", "style": "bold" }, { "label": "下单时间", "value": "1677309174", "type": "text", "style": "normal" }, { "label": "支付时间", "value": "1677309184", "type": "text", "style": "normal" }, { "label": "订单备注", "value": "无", "type": "text", "style": "normal" }], "status": { "status": "COMPLETED", "status_name": "已完成", "comment": "", "status_type": "success", "loading": false, "loading_timeout": -1 }, "film_show": { "name": "聚福宝-万里归途", "thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E", "show_version": "", "seat_name": "7排4列 | 7排3列", "hall_name": "", "show_time": 0, "num": 1 }, "codes": [{ "code": "A1121|1234", "can_read_code": "取票码:A1121|验证码:1234", "code_url": "\/xxx?text=A1121|1234", "password": "", "can_read_password": "", "show_type": "qrcode" }, { "code": "A2222|2222", "can_read_code": "取票码:A2222|验证码:2222", "code_url": "\/xxx?text=A2222|2222", "password": "", "can_read_password": "", "show_type": "qrcode" }], "pay_info": { "real_pay_amount": 9600, "base": [{ "label": "商品总额", "value": "9600", "type": "price", "style": "normal" }, { "label": "订单总额", "value": "9600", "type": "price", "style": "bold" }, { "label": "", "value": "", "type": "line", "style": "normal" }, { "label": "票券支付", "value": "9600", "type": "price", "style": "bold" }, { "label": "补差金额", "value": "0", "type": "price", "style": "bold" }, { "label": "实付总额", "value": "9600", "type": "price", "style": "bold" }], "cards": [{ "card_number": "101001000005185", "card_type_name": "", "card_use_point": 9600 }] }, "shop": { "layer_name": "影院信息", "shop_id": 60487, "shop_name": "大地影院（北京西三旗物美店）", "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 " }, "request_id": "6178d3499b91f274" }
+  getBaseOrderDetail: {
+    "pay_order_id": "488003809474256896",
+    "detail": [
+      {"label": "主订单号", "value": "488003806667481089", "type": "copy", "style": "bold"},
+      {"label": "下单时间", "value": "1677309174", "type": "text", "style": "normal"},
+      {"label": "支付时间", "value": "1677309184", "type": "text", "style": "normal"},
+      {"label": "订单备注", "value": "无", "type": "text", "style": "normal"}
+    ],
+    "status": {
+      "status": "COMPLETED",
+      "status_name": "已完成",
+      "comment": "",
+      "status_type": "success",
+      "loading": false,
+      "loading_timeout": -1
+    },
+    "film_show": {
+      "name": "聚福宝-万里归途",
+      "thumb": "https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E",
+      "show_version": "",
+      "seat_name": "7排4列 | 7排3列",
+      "hall_name": "",
+      "show_time": 0,
+      "num": 1
+    },
+    "codes": [
+      {
+        "code": "A1121|1234",
+        "can_read_code": "取票码:A1121|验证码:1234",
+        "code_url": "\/xxx?text=A1121|1234",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "qrcode"
+      },
+      {
+        "code": "A2222|2222",
+        "can_read_code": "取票码:A2222|验证码:2222",
+        "code_url": "\/xxx?text=A2222|2222",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "qrcode"
+      },
+      {
+        "code": "JKQ3X8PtuJO|647632",
+        "can_read_code": "取票码:k7NW02BJKQ3X8PtuJO4T0<br/>验证码:647632",
+        "code_url": "//sandbox-img.jufubao.cn/uploads/20230531/1dbe68ef5f26efc1d1c70ecd579c6b16.png",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "barcode"
+      },
+      {
+        "code": "10004",
+        "can_read_code": "电子码:10004",
+        "code_url": "",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "text"
+      },
+      {
+        "code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "can_read_code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "code_url": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "url"
+      }
+    ],
+    "pay_info": {
+      "real_pay_amount": 9600,
+      "base": [{"label": "商品总额", "value": "9600", "type": "price", "style": "normal"}, {
+        "label": "订单总额",
+        "value": "9600",
+        "type": "price",
+        "style": "bold"
+      }, {"label": "", "value": "", "type": "line", "style": "normal"}, {
+        "label": "票券支付",
+        "value": "9600",
+        "type": "price",
+        "style": "bold"
+      }, {"label": "补差金额", "value": "0", "type": "price", "style": "bold"}, {
+        "label": "实付总额",
+        "value": "9600",
+        "type": "price",
+        "style": "bold"
+      }],
+      "cards": [{"card_number": "101001000005185", "card_type_name": "", "card_use_point": 9600}]
+    },
+    "shop": {
+      "layer_name": "影院信息",
+      "shop_id": 60487,
+      "shop_name": "大地影院（北京西三旗物美店）",
+      "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 "
+    },
+    "request_id": "6178d3499b91f274"
+  }
 }

package/src/components/JfbBaseOrderDetail/bizMock.js

@@ -181,21 +181,48 @@ export default {
       "info": [{"label": "配送方式", "value": "自动发货", "type": "text", "style": "normal"}],
       "comment": ""
     }],
-    "codes": [{
-      "code": "261001000002479\t",
-      "can_read_code": "电子码:261001000002479\t",
-      "code_url": "\/common\/v1\/image\/barcode?code_content=261001000002479\t",
-      "password": "3182615",
-      "can_read_password": "密  码:3182615",
-      "show_type": "barcode"
-    }, {
-      "code": "261001000002480\t",
-      "can_read_code": "电子码:261001000002480\t",
-      "code_url": "\/common\/v1\/image\/barcode?code_content=261001000002480\t",
-      "password": "48856920",
-      "can_read_password": "密  码:48856920",
-      "show_type": "barcode"
-    }],
+    "codes": [
+      {
+        "code": "A1121|1234",
+        "can_read_code": "取票码:A1121|验证码:1234",
+        "code_url": "\/xxx?text=A1121|1234",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "qrcode"
+      },
+      {
+        "code": "A2222|2222",
+        "can_read_code": "取票码:A2222|验证码:2222",
+        "code_url": "\/xxx?text=A2222|2222",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "qrcode"
+      },
+      {
+        "code": "JKQ3X8PtuJO|647632",
+        "can_read_code": "取票码:k7NW02BJKQ3X8PtuJO4T0<br/>验证码:647632",
+        "code_url": "//sandbox-img.jufubao.cn/uploads/20230531/1dbe68ef5f26efc1d1c70ecd579c6b16.png",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "barcode"
+      },
+      {
+        "code": "10004",
+        "can_read_code": "电子码:10004",
+        "code_url": "",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "text"
+      },
+      {
+        "code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "can_read_code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "code_url": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "password": "",
+        "can_read_password": "",
+        "show_type": "url"
+      }
+    ],
     "support_shops": {"layer_name": "附近门店", "brand_id": 10957, "brand_name": "电子码品牌jls"},
     "pay_info": {
       "real_pay_amount": 4016,

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -263,9 +263,12 @@
                   <view
                     class="jfb-base-success__body-num-info-copy"
                     @click="handleToLink(item.code)"
-                    >访问</view
-                  >
+                    >访问</view>
                 </view>
+                <view
+                  class="jfb-base-success__body-num-info-copy"
+                  @click="copy(item.code)"
+                >复制</view>
                 <view
                   v-if="item.code_end_time"
                   class="jfb-base-success__body-cashier-code"
@@ -679,6 +682,12 @@ export default {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+  
+        & > view {
+          white-space: pre-wrap;
+          word-wrap: break-word;
+          word-break: break-all;
+        }
 
         &-copy {
           margin-top: unit(24, rpx);