jufubao-base 1.0.234-beta1 → 1.0.235-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.234-beta1",
+  "version": "1.0.235-beta1",
   "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/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/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -287,7 +287,7 @@
               ></image>
               <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
             </view>
-            <view v-if="info.codes[0].tips" class="jfb-base-order-detail__body-cashier-text">{{ info.codes[0].tips }}</view>
+
             <view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
               {{ showPassword ? info.codes[0].can_read_code : "查看" }}
             </view>
@@ -801,7 +801,6 @@
           </image>
         </view>
       </view>
-      <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
   </view>
@@ -863,7 +862,6 @@ export default {
 
       showPassword: false,
       dialogPassword: "",
-      dialogCode: null,
 
       //基础
       radius: 0,
@@ -1276,7 +1274,6 @@ export default {
       this.showType = item.show_type;
       this.logo = item.logo;
       this.dialogPassword = item.can_read_code;
-      this.dialogCode = item;
       console.log(this.codeSrc, "this.codeSrc");
       this.showCode = true;
     },

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 {

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -29,6 +29,7 @@
 			</view>
 		</view>
 		<view class="sreen__box carousel" v-if="config['isCarousel'] === true">
+
 			<xd-swiper-dot
 				:current="current"
 				:info="list"
@@ -172,8 +173,10 @@
         return parseInt(this.config.titleStyle.lineHeight)+'rpx'
       },
       notCarouselComp(){
+        let rowMaxHeight = this.height * this.config.row;
+        let trueDataHeight = Math.ceil(this.content.length/this.config.column) * this.height;
         return {
-          height: this.height * this.config.row  + 'px'
+          height: Math.min(rowMaxHeight, trueDataHeight)  + 'px'
         }
       },
       getIndexHeigth(){
@@ -181,18 +184,15 @@
         return (this.config['mode'] === 'normal'?0:48) * this.$rpxNum;
       },
       getContHeight() {
-        let realRow = this.config['row'];
-
+        //当只有一屏时候需要判断是否满屏
         if(this.list.length === 1) {
-          this.list[0] = this.list[0].splice(0,5);
-          realRow = Math.ceil(this.list[0].length/this.config.column);
+          let trueRow =  Math.ceil(this.list[0].length/this.config.column);
+          return this.height * Math.min(this.config.row,trueRow);
         }
-        //数量小于等于1,2行
-        if(realRow < 3) {
-          return this.height * realRow;
-        }
-        return this.height * this.config['row'];
+        //多屏幕情况
+        return this.height * this.config.row;
       },
+
       boxHeight(){
         return  this.height + this.$rpxNum * this.text;
       }

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -102,17 +102,16 @@
                 class="jfb-base-success__body-card jfb-base-success__body-cashier"
               >
                 <view class="jfb-base-success__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-                <view style="position: relative">
-                  <image
-                    :style="{
-                      height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                      width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-                    }"
-                    :src="info.codes[0].code_url"
-                  ></image>
-                  <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
-                </view>
-                <view v-if="info.codes[0].tips" class="jfb-base-success__body-cashier-text">{{ info.codes[0].tips }}</view>
+                  <view style="position: relative">
+                    <image
+                      :style="{
+                        height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                        width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                      }"
+                      :src="info.codes[0].code_url"
+                    ></image>
+                    <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+                  </view>
                 <view
                   v-if="info.codes[0].can_read_password"
                   class="jfb-base-success__body-cashier-password"
@@ -355,7 +354,6 @@
           </image>
         </view>
       </view>
-      <view v-if="dialogCode && dialogCode.tips" class="jfb-base-success__body-d_password">{{ dialogCode.tips }}</view>
       <view v-if="dialogPassword" class="jfb-base-success__body-d_password">
         {{ dialogPassword }}
       </view>
@@ -445,7 +443,6 @@ export default {
       codeSrc: "",
       logo: "",
       dialogPassword: "",
-      dialogCode: null,
       ...styleForm.getDataItem(),
     };
   },
@@ -489,7 +486,6 @@ export default {
       this.showType = item.show_type;
       this.logo = item.logo;
       this.dialogPassword = item.can_read_code;
-      this.dialogCode = item;
       this.showCode = true;
     },
     /**