jufubao-base 1.0.234 → 1.0.235-beta2

package/package.json

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

package/src/components/JfbBaseConPhone/Api.js

@@ -18,7 +18,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -433,14 +433,15 @@ export default {
         data: {
           phone_number: this.phoneNumber,
           biz_name: "login",
+          is_expire_time: 'Y',
         },
       }).then((res) => {
-        this.startCountdown();
+        this.startCountdown(res);
       });
     },
-    startCountdown() {
+    startCountdown(res={}) {
       // 设置剩余时间
-      this.timeRemaining = 120;
+      this.timeRemaining = typeof res.expire_time === 'number'? res.expire_time:120;
       // 设置定时器，每秒执行一次
       this.countdownTimer = setInterval(() => {
         // 每秒减少1
@@ -456,7 +457,7 @@ export default {
           // 清除定时器
           clearInterval(this.countdownTimer);
           // 重新设置时间
-          this.timeRemaining = 120;
+          this.timeRemaining = typeof res.expire_time === 'number'? res.expire_time:120;;
         }
       }, 1000);
     },
@@ -541,7 +542,7 @@ export default {
               time: 2000,
               isClose: false,
             });
-            if (res.code == 400) {
+            if (res.code === 400) {
               this.getList();
             }
             if (this.timeer) {

package/src/components/JfbBaseLogin/Api.js

@@ -82,7 +82,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -634,7 +634,7 @@ export default {
         name = this["siteInfo"]["mapping"]["site_name"];
       if (this.projectAttr["site_logo"])
         logo = getServiceUrl(this.projectAttr["site_logo"], "size3");
-      
+
       this.partnerName = name || "聚福宝福利";
       this.logoTextColor = getContainerPropsValue(value, "content.logoTextColor", "#333");
       this.callback_url = getContainerPropsValue(value, "content.callback_url", {value: ''}).value;
@@ -890,10 +890,11 @@ export default {
         data: {
           phone_number,
           biz_name: "login",
+          is_expire_time: 'Y',
         },
       }).then((res) => {
         this.$xdHideLoading();
-        this.time = 120;
+        this.time = typeof res.expire_time === 'number'? res.expire_time:120;
         this.interval = setInterval(() => {
           this.time--;
           if (this.time === 0) {
@@ -901,6 +902,7 @@ export default {
           }
         }, 1000);
       }).catch((error) => {
+        debugger
         this.$xdHideLoading();
         console.error(error);
         this.$xdLog.catch(error)
@@ -1229,7 +1231,7 @@ export default {
           color: #a6a6a6;
         }
       }
-      
+
       .login_types {
         padding: 10rpx 50rpx;
 

package/src/components/JfbBaseLoginForgetPwd/Api.js

@@ -18,7 +18,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -166,13 +166,14 @@ export default {
         data: {
           phone_number,
           biz_name: "passport-password",
+          is_expire_time:'Y'
         },
       }).then((res) => {
         this.$xdHideLoading();
-        this.time = 120;
+        this.time = typeof res.expire_time === 'number'? res.expire_time:120;
         this.interval = setInterval(() => {
           this.time--;
-          if (this.time == 0) {
+          if (this.time === 0) {
             clearTimeout(this.interval);
           }
         }, 1000);

package/src/components/JfbBaseMergeUserCard/Api.js

@@ -12,7 +12,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCard.vue

@@ -164,11 +164,12 @@
           vm: this,
           data: {
             phone_number,
-            biz_name: "find_back_card"
+            biz_name: "find_back_card",
+            is_expire_time: 'Y',
           }
         }).then(res => {
           this.$xdHideLoading()
-          this.time = 120;
+          this.time = typeof res.expire_time === 'number'? res.expire_time:120;
           this.interval = setInterval(() => {
             this.time--;
             if (this.time === 0) {

package/src/components/JfbBasePhoneCollect/Api.js

@@ -31,7 +31,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -41,33 +41,33 @@
               'margin-top': '40rpx'
             }"
         >
-          <xd-form-item 
+          <xd-form-item
             v-if="isCollectUsername"
             class="form-item"
-            :class="[inputStyle]" 
-            :labelWidth="labelWidth" 
-            label="姓名" 
+            :class="[inputStyle]"
+            :labelWidth="labelWidth"
+            label="姓名"
             content-align="left">
             <xd-form-input
               v-model="accountForm.user_name"
               placeholder="请输入姓名"
             />
           </xd-form-item>
-          <xd-form-item 
+          <xd-form-item
             class="form-item"
-            :class="[inputStyle]" 
+            :class="[inputStyle]"
             :leftIcon="phoneIcon"
-            :labelWidth="labelWidth" 
-            label="手机号" 
+            :labelWidth="labelWidth"
+            label="手机号"
             content-align="left">
             <xd-form-input
               v-model="accountForm.phone_number"
               :placeholder="phonePlaceholder"
             />
           </xd-form-item>
-          <xd-form-item 
+          <xd-form-item
             class="form-item"
-            label="验证码" 
+            label="验证码"
             content-align="left"
             :class="[inputStyle]"
             :leftIcon="codeIcon"
@@ -384,7 +384,7 @@ export default {
       }
       this.jumpFont = jumpFont;
       console.log(this.jumpFont,'this.jumpFont');
-      
+
       this.jumpAlign = getContainerPropsValue(value, "content.jumpAlign", 'right');
     },
     reGetCode() {
@@ -408,13 +408,14 @@ export default {
         data: {
           phone_number,
           biz_name: "login",
+          is_expire_time: 'Y',
         },
       }).then((res) => {
         this.$xdHideLoading()
-        this.jfbTimeer = 120;
+        this.jfbTimeer = typeof res.expire_time === 'number'? res.expire_time:120;
         this.interval = setInterval(() => {
           this.jfbTimeer--;
-          if (this.jfbTimeer == 0) {
+          if (this.jfbTimeer === 0) {
             clearTimeout(this.interval);
           }
         }, 1000);

package/src/components/JfbBasePhoneLogin/Api.js

@@ -33,7 +33,8 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
-      biz_name: ['业务名称', 'String', '必选']
+      biz_name: ['业务名称', 'String', '必选'],
+      is_expire_time: ['是否启动后台返回过去时间', 'String', '必选', 'Y'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -518,15 +518,16 @@ export default {
         data: {
           phone_number,
           biz_name: "login",
+          is_expire_time:'Y'
         },
       })
         .then((res) => {
           this.p_checkSendStatus(phone_number);
           this.$xdHideLoading();
-          this.jfbTimeer = 120;
+          this.jfbTimeer = typeof res.expire_time === 'number'? res.expire_time:120;
           this.interval = setInterval(() => {
             this.jfbTimeer--;
-            if (this.jfbTimeer == 0) {
+            if (this.jfbTimeer === 0) {
               clearTimeout(this.interval);
             }
           }, 1000);
@@ -666,7 +667,7 @@ export default {
         }
       }
     }
-  
+
       // #ifdef H5
     .form-item {
       ::v-deep &.uni-forms-item {