jufubao-movie 1.0.57-beta3 → 1.0.57-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.57-beta3",
+  "version": "1.0.57-beta4",
   "private": false,
   "description": "聚福宝在线选座业务组件插件包",
   "main": "index.js",

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -162,11 +162,12 @@
       <view v-if="otherPayMethod.length" class="jfb-movie-confirm__body-card">
         <template v-for="item in otherPayMethod">
            <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="0" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
+              <view slot="label">{{item.show_name}} <text v-if="choseCard && choseCard.cardPayPrice" style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
               <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
                 <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
               </view>
               <view v-else>
-                <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
+                <!-- <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view> -->
                 <template v-if="choseCard && choseCard.cardPayPrice">
               <xd-unit v-if="choseCard.unit == '次'" :price="choseCard.cardPayPoint" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit"></xd-unit>
               <xd-unit v-else :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit || ''"></xd-unit>

package/src/components/JfbMovieTfkFilmRecommend/Attr.js

@@ -449,6 +449,40 @@ export default {
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
       },
+      {
+        label: "影片标题样式:",
+        ele: "xd-font",
+        valueKey: "contTitle",
+        value: data['contTitle'] || {},
+        groupKey:'style',
+        setting: {
+          color:true,
+          decoration: true,
+          weight: true,
+          fontSize: false,
+          icon: false,
+          style:false,
+          align:false,
+          lineHeight: false, //行高
+          isEmpty: true,
+          default:{
+            color:'#333',
+            decoration:'none',
+            weight:'bold'
+          }
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              data.cb([])
+              console.error(error);
+            });
+        },
+
+      },
       {
         label: '是否有投影:',
         ele: 'xd-radio',

package/src/components/JfbMovieTfkFilmRecommend/JfbMovieTfkFilmRecommend.vue

@@ -114,7 +114,7 @@
               <view class="tfk-scroll-item-image" :style="{borderRadius:contItemRradius + 'rpx'}">
                 <image :src="item.poster" :alt="item.show_name" mode="scaleToFill" @error="handleError(item)"></image>
               </view>
-              <view class="tfk-scroll-item-title">{{item.show_name}}</view>
+              <view class="tfk-scroll-item-title" :style="[contTitle]">{{item.show_name}}</view>
               <view class="tfk-scroll-item-btn">
                 <template v-if="type === 'hot'">
                   <xd-button
@@ -247,6 +247,7 @@
         isContShadow:'N',
         isContShadowColor:'#eee',
         isContShadowWidth:'0',
+        contTitle:{},
 
         buyPath:'',
         fimeDetailPath:'',
@@ -287,19 +288,21 @@
 
 
       titleMarginComp(){
-        let str = `${this.checkValue(this.titleMargin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.titleMargin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.titleMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.titleMargin.left, 20)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.titleMargin, 20)
+        // let str = `${this.checkValue(this.titleMargin.top, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.titleMargin.right, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.titleMargin.bottom, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.titleMargin.left, 20)}rpx`;
+        // return str
       },
 
       contPaddingComp(){
-        let str = `${this.checkValue(this.contMargin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.contMargin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.contMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.contMargin.left, 20)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.contMargin, 20)
+        // let str = `${this.checkValue(this.contMargin.top, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.contMargin.right, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.contMargin.bottom, 20)}rpx`;
+        // str = `${str} ${this.checkValue(this.contMargin.left, 20)}rpx`;
+        // return str
       }
     },
     watch: {
@@ -448,6 +451,7 @@
         this.isContShadow =  getContainerPropsValue(container, 'content.isContShadow', 'N');
         this.isContShadowWidth = getContainerPropsValue(container, 'content.isContShadowWidth', '10');
         this.isContShadowColor =  getContainerPropsValue(container, 'content.isContShadowColor', '#eee');
+        this.contTitle = getContainerPropsValue(container,'content.contTitle',{color:'#333',fontWeight:'bold',textDecoration:'none'});
 
         //链接
         this.buyPath = getContainerPropsValue(container, 'content.buyPath', {value: ""}).value;