jufubao-base 1.0.63-beta1 → 1.0.63-beta3

package/package.json

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

package/src/components/JfbBaseCardDisabledEntry/cardListMixins.js

@@ -14,6 +14,7 @@ export default {
       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();
       })
@@ -105,7 +109,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 +121,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,6 +626,7 @@ export default {
     },
 
     onJfbLoad(options) {
+      this.options = options;
       let { inCallback } = options;
       if (inCallback) {
         this.$storage.set("inCallback", inCallback, 0.05);
@@ -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/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();
     },

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -48,7 +48,7 @@
                 class="get_code"
                 @click="reGetCode"
                 :style="{color: mainColor}"
-              >{{time ? time + '秒后获取':'获取验证码'}}</view>
+              >{{jfbTimeer ? jfbTimeer + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
         </xd-form>
@@ -100,7 +100,7 @@
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
-  
+
   export default {
     name: "JfbBasePhoneLogin",
     components: {
@@ -119,7 +119,7 @@
           phone_number: '',
           verification_code: '',
         },
-        time: 0,
+        jfbTimeer: 0,
         interval: null,
         auth_code: "",
         provider_id: "",
@@ -157,7 +157,7 @@
           url: `/pages/content/content?${params}`
         })
       },
-      
+
       onJfbLoad(options) {
         this.auth_code = options.auth_code;
         this.provider_id = options.provider_id;
@@ -172,7 +172,11 @@
         //this.height = getContainerPropsValue(value, '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({
@@ -191,10 +195,10 @@
           }
         }).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)
@@ -275,11 +279,11 @@
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
-    
+
       .get_code {
         color: @xd-base-color;
         font-size: 24rpx;
@@ -291,32 +295,32 @@
             color: #A6A6A6;
           }
         }
-      
+
         /deep/ .uni-easyinput__placeholder-class {
           font-size: 26rpx;
           color: #D4D4D4;
         }
-      
+
         .phone-login-type {
           display: flex;
           color: #808080;
           font-size: 32rpx;
           padding: 20rpx 70rpx;
           align-items: center;
-        
+
           ._item {
             margin: 0 30rpx;
             position: relative;
             line-height: 2;
-          
+
             &:first-child {
               margin-left: 0;
             }
-          
+
             &.active {
               color: #383838;
               font-size: 36rpx;
-            
+
               text {
                 position: absolute;
                 height: 6rpx;
@@ -329,15 +333,15 @@
             }
           }
         }
-      
+
         .forget_password {
           font-size: 24rpx;
           color: #A6A6A6;
           text-align: right;
           margin: 20rpx 70rpx 0 0;
-        
+
         }
-      
+
         .not_login {
           position: fixed;
           width: 100%;