jufubao-base 1.0.63-beta2 → 1.0.63-beta202

package/package.json

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

package/src/components/JfbBaseBackground/Attr.js

@@ -0,0 +1,106 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '背景颜色:', //label
+        ele: 'xd-color', //package 名称
+        valueKey: 'bgcolor', //form[valueKey]
+        value: data.bgcolor || '', //v-model
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框背景颜色',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '选中路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'select-pages-path', //form[valueKey]
+        value: data['select-pages-path'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      data.bgcolor && {
+        label: '高度:', //label
+        ele: 'el-input', //package 名称
+        type: 'number',
+        valueKey: 'height', //form[valueKey]
+        value: data.height || 100, //v-model
+        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框高度',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '', //label
+        ele: 'slot', //package 名称
+        slot: 'is_reference',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [
+    {
+      label: '背景颜色:', //label
+      ele: 'xd-color', //package 名称
+      valueKey: 'bgcolor', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入占位框背景颜色',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框背景颜色',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '选中路径:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'select-pages-path', //form[valueKey]
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree')
+      },
+      inline: false,
+    },
+    {
+      label: '高度:', //label
+      ele: 'el-input', //package 名称
+      type: 'number',
+      valueKey: 'height', //form[valueKey]
+      value: null, //v-model
+      placeholder: '请输入占位框高度，单位像素，默认：10px',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框高度',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '', //label
+      ele: 'slot', //package 名称
+      slot: 'is_reference',
+    },
+  ],
+};

package/src/components/JfbBaseBackground/JfbBaseBackground.vue

@@ -0,0 +1,110 @@
+<template>
+  <view
+    class="jfb-base-background"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-background__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-background__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-background__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseBackgroundMixin from "./JfbBaseBackgroundMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseBackground",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseBackgroundMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    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)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseBackgroundLess.less";
+
+  .jfb-base-background {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseBackground/JfbBaseBackgroundLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-background {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(100, rpx);
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-background {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseBackground/JfbBaseBackgroundMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-background'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -262,6 +262,8 @@ export default {
   },
   data() {
     return {
+      options: {},
+
       //提示文案
       noticeBackgroundColor: "",
       notice: "",
@@ -473,14 +475,15 @@ export default {
     },
 
     onJfbLoad(options) {
+      this.options = options;
       let { inCallback } = options;
-      if (inCallback) {
-        this.$storage.set("inCallback", inCallback, 0.05);
-        inCallback = Base64.decode(inCallback);
-      } else {
-        inCallback = this.$storage.get("inCallback");
-        if (inCallback) {
+      if(!inCallback) this.$storage.remove("inCallback"); //作为入口
+      else {
+        this.$storage.set("inCallback", inCallback);
+        try{
           inCallback = Base64.decode(inCallback);
+        }catch (e){
+          inCallback = null;
         }
       }
 

package/src/components/JfbBaseCardDisabledEntry/cardListMixins.js

@@ -10,10 +10,11 @@ export default {
       cardOrgList:[], //原始数据
       cardList:null, //计算后的卡列表
       cardPageNum: 0, //当前页面
-      cardPageLen: 5, //每页获取数据调试
+      cardPageLen: 10, //每页获取数据调试
       cardComputedList:[], //当前获取的数据列表
       cardLoading: false, //加载状态值设置
       cardNextTop: 0, //计算到每一个节点的距离顶部Top值
+      cardIndex: 0,
       contentStatus: false, //内容框是否已经进行过计算距离顶部Top值状态
       hasContent: true, //是否可以进行继续加载状态
 
@@ -76,10 +77,13 @@ export default {
             })[0];
             card['height'] = item.height;
             card['top'] =  this.cardNextTop;
-            this.cardNextTop =  this.cardNextTop + card['height'] +  (paddingBottom * this.$rpxNum)
+            card['index'] = this.cardIndex;
+            this.cardNextTop =  this.cardNextTop + card['height'] +  (paddingBottom * this.$rpxNum);
+            this.cardIndex++;
             return card
           });
           this.cardList = (this.cardList||[]).concat(arr);
+          this.cardPageNum++;
           this.$xdHideLoading();
         }).exec();
       })
@@ -98,6 +102,9 @@ export default {
         this.cardPageNum*this.cardPageLen,
         this.cardPageNum*this.cardPageLen + this.cardPageLen
       );
+      if(this.cardComputedList.length < this.cardPageLen) {
+        this.hasContent = false;
+      }
       this.handleCardComputed(paddingBottom).then().catch();
     },
 
@@ -105,7 +112,6 @@ export default {
       if(this.cardLoading || !this.hasContent || this.cardPageNum ===0) return;
       this.cardLoading = true;
       this.$xdShowLoading({});
-      this.cardPageNum++;
       this.$nextTick(()=>{
         setTimeout(()=>{
           this.cardLoading = false;
@@ -118,6 +124,7 @@ export default {
           if(this.cardComputedList.length < this.cardPageLen) {
             this.hasContent = false;
           }
+          this.cardPageNum++;
         },500)
       })
 

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -386,11 +386,13 @@ export default {
     },
     tabIndex(){
       this.clearDefault();
-      this.handleCardInit(this.ajaxCardList, this.tabIndex === 1);
+      this.onJfbLoad(this.options);
     }
   },
   data() {
     return {
+      options:{},
+
       //提示文案
       noticeBackgroundColor: "",
       notice: "",
@@ -414,6 +416,7 @@ export default {
       disabledUrl: "",
       //cardLayout: "1",  //票券布局
       showDisabled: 'Y',
+      showCardList: false,
 
       //活动
       dialogEvent: false,
@@ -623,14 +626,15 @@ export default {
     },
 
     onJfbLoad(options) {
+      this.options = options;
       let { inCallback } = options;
-      if (inCallback) {
-        this.$storage.set("inCallback", inCallback, 0.05);
-        inCallback = Base64.decode(inCallback);
-      } else {
-        inCallback = this.$storage.get("inCallback");
-        if (inCallback) {
+      if(!inCallback) this.$storage.remove("inCallback"); //作为入口
+      else {
+        this.$storage.set("inCallback", inCallback);
+        try{
           inCallback = Base64.decode(inCallback);
+        }catch (e){
+          inCallback = null;
         }
       }
 
@@ -667,13 +671,12 @@ export default {
             };
           });
           this.ajaxCardList =  res;
-          this.handleCardInit(this.ajaxCardList, this.tabIndex === 1);
-
-
           this.hasChangeStatus = this.getCardGroupItem(this.ajaxCardList.list.filter((item) => {
             return item["is_exchange"] === "Y";
           }), res['site_entry_settings']).length > 0;
 
+
+          this.handleCardInit(this.ajaxCardList, this.tabIndex === 1);
           this.$xdHideLoading();
         })
         .catch(() => this.$xdHideLoading());

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -91,7 +91,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
-  
+
   export default {
     name: "JfbBaseCardV2",
     components: {
@@ -137,14 +137,23 @@
     methods: {
       onJfbLoad(options) {
         let { inCallback } = options;
-        if (inCallback) inCallback = Base64.decode(inCallback);
+        if(!inCallback) this.$storage.remove("inCallback"); //作为入口
+        else {
+          this.$storage.set("inCallback", inCallback);
+          try{
+            inCallback = Base64.decode(inCallback);
+          }catch (e){
+            inCallback = null;
+          }
+        }
         this.inCallback = inCallback || this.settings.index;
-  
+
+
         let params = {is_all: 'Y'};
         if (options['jfb_business_code']) {
           params['card_business_code'] = options['jfb_business_code'];
         }
-        
+
         jfbRootExec("getListCardBind", {
           vm: this,
           data: params,
@@ -211,11 +220,11 @@
           url: `${this.cardInfoPath}?card_number=${item["card_number"]}`,
         });
       },
-      
+
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack()
       },
-      
+
     }
   }
 
@@ -231,13 +240,13 @@
         right: 0;
         left: 0;
         background: #FFFFFF;
-      
-        
+
+
         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;

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -44,6 +44,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import {Base64} from "js-base64";
   export default {
     name: "JfbBaseCardV3",
     components: {
@@ -83,7 +84,15 @@
     methods: {
       onJfbLoad(options) {
         let { inCallback } = options;
-        if (inCallback) inCallback = Base64.decode(inCallback);
+        if(!inCallback) this.$storage.remove("inCallback"); //作为入口
+        else {
+          this.$storage.set("inCallback", inCallback);
+          try{
+            inCallback = Base64.decode(inCallback);
+          }catch (e){
+            inCallback = null;
+          }
+        }
         this.inCallback = inCallback || this.settings.index;
 
         let params = {is_all: 'Y'};

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -43,7 +43,7 @@
                 class="get_code"
                 @click="reGetCode"
                 :style="{ color: mainColor }"
-                >{{ time ? time + "秒后获取" : "获取验证码" }}</view
+                >{{ jfbTimeer ? jfbTimeer + "秒后获取" : "获取验证码" }}</view
               >
             </view>
           </xd-form-item>
@@ -79,7 +79,7 @@
           class="jump_collect"
           @click="jumpCollect"
           >跳过</view>
-        
+
         <!-- <view
           class="not_login"
           :style="{color: mainColor}"
@@ -121,7 +121,7 @@ export default {
         phone_number: "",
         verification_code: "",
       },
-      time: 0,
+      jfbTimeer: 0,
       interval: null,
       provider_id: "",
       callback_url: "",
@@ -160,7 +160,7 @@ export default {
         url: `/pages/content/content?${params}`
       })
     },
-    
+
     onJfbLoad(options) {
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
@@ -174,7 +174,11 @@ export default {
       //this.height = getContainerPropsValue(container, 'content.height', 10);
     },
     reGetCode() {
-      if (this.time > 0) return;
+      this.$xdLog.setProject('get.code.handle', {
+        time: this.time,
+        jfbTimeer: this.jfbTimeer
+      });
+      if (this.jfbTimeer > 0) return;
       const { phone_number } = this.accountForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
         uni.showToast({
@@ -193,10 +197,10 @@ export default {
         },
       }).then((res) => {
         this.$xdHideLoading()
-        this.time = 120;
+        this.jfbTimeer = 120;
         this.interval = setInterval(() => {
-          this.time--;
-          if (this.time == 0) {
+          this.jfbTimeer--;
+          if (this.jfbTimeer == 0) {
             clearTimeout(this.interval);
           }
         }, 1000);
@@ -216,7 +220,7 @@ export default {
       const { provider_id } = this;
       const { phone_number, verification_code } = this.accountForm;
       if (!phone_number || !verification_code) return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
-     
+
       this.$xdShowLoading({})
       jfbRootExec("phoneCollect", {
         vm: this,
@@ -237,7 +241,7 @@ export default {
         this.$xdLog.catch(error)
       });
     },
-    
+
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack();
     },