jufubao-base 1.0.440 → 1.0.441

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseCardConsumpCode/Attr.js

@@ -1,5 +1,8 @@
 'use strict';
-import { dataVal } from "@/utils/AttrTools";
+import {
+  dataVal,
+  getAttrPathMsg
+} from "@/utils/AttrTools";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -7,6 +10,7 @@ import { dataVal } from "@/utils/AttrTools";
 export default {
   style: [],
   content: (data, gValue, gColor, oldData={}) => {
+    // const cardPath = getAttrPathMsg(data , 'cardPath', '票券列表');
     return [
       {
         ele: 'title',
@@ -25,6 +29,52 @@ export default {
         inline: false,
         placeholder: "输入消费标题"
       },
+      {
+        label: '去绑定票券',
+        ele: 'el-input',
+        valueKey: 'bindName',
+        value: dataVal({ data, key: 'bindName', dValue: '去绑定票券', gValue }),
+        groupKey: 'content',
+        className: 'input80',
+        labelInline: true,
+        inline: false,
+        placeholder: "输入去绑定票券自定义文案"
+      },
+
+      // {
+      //   label: cardPath.label,
+      //   ele: 'xd-select-pages-path',
+      //   valueKey: cardPath['key'],
+      //   groupKey:'advanced',
+      //   placeholder: cardPath.hold,
+      //   value: cardPath.path,
+      //   labelInline:true,
+      //   className: 'input100',
+      //   setting: {
+      //     mode:'new',
+      //     router: XdBus.getParentApi('getPagesTree'),
+      //   },
+      //   inline: false,
+      //   notice: '当用户票券列表为空时，使用到跳转到票券列表'
+      // },
+      {
+        label: '版本号:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'version',
+        value: 'v2.0',
+        hidden: true,
+      },
+      {
+        label: '过滤引用模版字段:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'refFilterKey',
+        value: '[]',
+        hidden: true,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseCardConsumpCode/JfbBaseCardConsumpCode.vue

@@ -62,11 +62,14 @@
             </view>
           </view>
         </template>
-
         <view class="card-code__empty" v-else>
           <xd-no-data height="600rpx" :scaleSize="2">
-            <view class="empty_txt">
-              {{ card_number ? '卡券信息加载失败，请稍后重试' : '暂无可用票券' }}
+            <view class="empty_txt-list" >
+              <view>{{ card_number ? '卡券信息加载失败，请稍后重试' : '暂无可用票券' }}</view>
+              <view @click="handleBindCard">
+                <text :style="{color: mainColor}">{{bindName}}</text>
+                <xd-font-icon size="28" icon="iconxiangyou_xian"></xd-font-icon>
+              </view>
             </view>
           </xd-no-data>
         </view>
@@ -187,6 +190,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { Base64 } from "js-base64";
+  import {mapState} from "vuex";
 
   export default {
     name: "JfbBaseCardConsumpCode",
@@ -203,7 +207,7 @@
     ],
     data() {
       return {
-        takeTitleName: '提货二维码',
+        closeMask: true,
         info: null,
         timeStr: "",
         timeer: null,
@@ -223,6 +227,11 @@
         show_type: 'normal', //normal:已绑定卡券 coupon: 优惠券
         card_number: '',
 
+        //基础
+        takeTitleName: '提货二维码',
+        bindName:'去绑定票券',
+        // cardPath:'',
+
         //品牌logo
         //#ifdef H5
         brandLogo: '//img.jufubao.cn/common/jufubao_logo.png?v=1.0.0',
@@ -234,6 +243,7 @@
       }
     },
     computed: {
+      ...mapState(['jfbAuthorize']),
       activityType() {
         return {
           color: '#E5010E',
@@ -251,6 +261,10 @@
       this.init(this.container);
     },
     methods: {
+      handleBindCard(){
+        if(this.$configProject['isPreview']) return;
+        this.jfbAuthorize.jumpToCardLogin(this);
+      },
       /**
        * @description 监听页面进入，开始拉取展码数据
        * @param options {object} 页面参数
@@ -289,6 +303,8 @@
        */
       init(container) {
         this.takeTitleName = gCPVal(container, 'takeTitleName', '提货二维码');
+        this.bindName = gCPVal(container, 'bindName', '去绑定票券');
+        //this.cardPath = gCPVal(container, 'cardPath', {value:''}).value;
       },
       /**
        * @description 未带卡号入参时，拉取可用票券列表并默认选中登录卡
@@ -527,12 +543,7 @@
           this.refrushTimeer = null;
         }
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
+
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
         //从其他页面返回时，二维码已失效且定时器已被清理，重新拉取展码数据
@@ -549,12 +560,6 @@
       onJfbBack(options) {
         this.clearAllTimer();
       },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
     }
   }
 
@@ -793,6 +798,19 @@
       .align-center {
         align-items: center;
       }
+
+      .empty_txt-list {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        & > view:nth-child(2) {
+          margin: 0 unit(12, rpx);
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+        }
+      }
     }
   }