jufubao-base 1.0.235-beta1 → 1.0.235

package/package.json

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

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/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,6 +801,7 @@
           </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>
@@ -862,6 +863,7 @@ export default {
 
       showPassword: false,
       dialogPassword: "",
+      dialogCode: null,
 
       //基础
       radius: 0,
@@ -1274,6 +1276,7 @@ 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/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -102,16 +102,17 @@
                 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 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
                   v-if="info.codes[0].can_read_password"
                   class="jfb-base-success__body-cashier-password"
@@ -354,6 +355,7 @@
           </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>
@@ -443,6 +445,7 @@ export default {
       codeSrc: "",
       logo: "",
       dialogPassword: "",
+      dialogCode: null,
       ...styleForm.getDataItem(),
     };
   },
@@ -486,6 +489,7 @@ export default {
       this.showType = item.show_type;
       this.logo = item.logo;
       this.dialogPassword = item.can_read_code;
+      this.dialogCode = item;
       this.showCode = true;
     },
     /**