jufubao-base 1.0.159-beta2 → 1.0.159-beta20

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -18,13 +18,12 @@
 					height: (height + rpxText) + 'px'
 				}"
 			>
-
-				<view :style="{ height: height + 'px', width:width}">
+				<view :style="{ height: height + 'px', width:width, padding: config.iconPadding}">
 					<view :style="{
 						borderRadius: config.radius  + 'rpx',
 						boxShadow: config.shadow === 1? `0 0 8rpx ${config.shadowColor}` : '',
 					}">
-						<image :src="item.image_url"></image>
+						<image :src="item.image_url" style=""></image>
 					</view>
 				</view>
 				<view v-if="item['content_name']" :style="{color: config.textColor}">{{item['content_name']}}</view>
@@ -70,7 +69,7 @@
                 :style="{height: boxHeight + 'px'}"
                 @click="handleClick(it)"
               >
-                <view :style="{ height: height + 'px'}">
+                <view :style="{ height: height + 'px', padding: config.iconPadding}">
                   <view :style="{
 										borderRadius: config.radius  + 'rpx',
 										boxShadow: config.shadow === 1? `0 0 10rpx rgba(0, 0, 0, .5)` : '',
@@ -114,7 +113,7 @@
 								}"
 								@click="handleClick(it)"
 							>
-								<view :style="{ height: height + 'px'}">
+								<view :style="{ height: height + 'px', padding: config.iconPadding}">
 									<view :style="{
 										borderRadius: config.radius  + 'rpx',
 										boxShadow: config.shadow === 1? `0 0 10rpx rgba(0, 0, 0, .5)` : '',
@@ -158,7 +157,7 @@
         timer: null,
         width: 0,
         height: 0,
-				text: 50,
+				text: 40,
         padding: 0,
         status: false,
 				list: [],
@@ -400,15 +399,15 @@
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						width: 100%;
+            box-sizing: border-box;
+
 						& > view {
-							width: 75%;
-							height: 75%;
+							width: 100%;
+							height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 							& > image {
 								width: 100%;
 								height: 100%;
@@ -441,15 +440,15 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 80%;
-							height: 80%;
+              width: 100%;
+              height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 
 							& > image {
 								width: 100%;
@@ -505,11 +504,11 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 75%;
-							height: 75%;
-							overflow: hidden;
+							width: 100%;
+							height: 100%;
 							display: flex;
 							justify-content: center;
 							align-items: center;
@@ -542,15 +541,15 @@
 						justify-content: center;
 						align-items: center;
 						width: 100%;
+            box-sizing: border-box;
 
 						& > view {
-							width: 80%;
-							height: 80%;
+							width: 100%;
+							height: 100%;
 							overflow: hidden;
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							overflow: hidden;
 
 							& > image {
 								width: 100%;

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -72,6 +72,7 @@
 				timer: null,
 				info: [],
         mS: {},
+        iconPadding:{},
 				isPreview: false,
 				noData:false,
 
@@ -100,8 +101,18 @@
           shadow: this.shadow,
           shadowColor: this.shadowColor,
           textColor: this.textColor,
+          iconPadding:this.iconCPadding,
 				}
 			},
+      iconCPadding(){
+        let defaultPadding = 20;
+        if(this.cells === 4) defaultPadding = 25
+        let str = `${this.checkValue(this.iconPadding.top, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.right, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.bottom, defaultPadding)}rpx`;
+        str = `${str} ${this.checkValue(this.iconPadding.left, defaultPadding)}rpx`;
+        return str
+      },
       margin(){
         let str = `${this.checkValue(this.mS.top, 0)}rpx`;
         str = `${str} ${this.checkValue(this.mS.right, 0)}rpx`;
@@ -164,6 +175,7 @@
         this.shadow = getContainerPropsValue(container, 'content.shadow', 2);
         this.shadowColor = getContainerPropsValue(container, 'content.shadowColor', 'rgba(0,0,0,.3)');
         this.mS = getContainerPropsValue(container, 'content.margin', {});
+        this.iconPadding = getContainerPropsValue(container, 'content.iconPadding', {});
 
         //样式设置
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#333');

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -65,7 +65,7 @@
             <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
               <view>{{settle.label}}：</view>
               <view v-if="settle.type === 'price'">
-                <xd-unit :price="settle.value" unit="" :is-old="false"></xd-unit>
+                <xd-unit :price="settle.value" :is-old="false"></xd-unit>
               </view>
               <view v-else v-html="settle.value"></view>
             </view>
@@ -107,7 +107,7 @@
                   class="jfb-base-success__body-cashier-password"
                   @click="showPassword = true"
                   :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                >{{ showPassword ? info.codes[0].can_read_code : "查看密码" }}</view>
+                >{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
@@ -218,7 +218,7 @@
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
                         :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                      >查看二维码和密码</view>
+                      >查看二维码和{{ item.password_title }}</view>
                       <view
                         v-if="item['code_end_time']"
                         class="jfb-base-success__body-cashier-code"
@@ -302,7 +302,7 @@
               </view>
               <view class="jfb-base-success__body-detail-html">
                 <xd-content-xss
-                  v-html="info.custom_content.content"
+                  :html="info.custom_content.content"
                 ></xd-content-xss>
               </view>
             </view>
@@ -315,7 +315,7 @@
                 <view>商品详情</view>
               </view>
               <view class="jfb-base-success__body-detail-html x-content-info" v-if="info.productDetail">
-                <xd-content-xss v-html="info.productDetail"></xd-content-xss>
+                <xd-content-xss :html="info.productDetail"></xd-content-xss>
               </view>
             </view>
           </view>