jufubao-base 1.0.234-beta1 → 1.0.234

package/package.json

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

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/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;
     },
     /**