jufubao-movie 1.0.57 → 1.0.59

package/package.json

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

package/src/components/JfbMovieConfirm/Attr.js

@@ -16,6 +16,17 @@ export default {
           {label: '否', value: 'N'},
         ]
       },
+      {
+        label: "支付时是否跳过补差提示:",
+        ele: 'xd-radio',
+        valueKey: "skipTip",
+        value: data['skipTip'] || 'N',
+        groupKey:'content',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+      },
       {
         label: '去支付路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -791,7 +791,9 @@
                   }else{
                     //支持补差, 提示是否使用补差
                     if(this.payThird){
-                      await this.handleConfirmAllWxPay();
+                      if(this.skipTip === 'N'){
+                        await this.handleConfirmAllWxPay();
+                      }
                     }else{
                       //不支持补差，仅提示
                       return this.$xdAlert({content: "请选择兑换方式"})
@@ -944,6 +946,7 @@
       init(container) {
         this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
         this.skipToPay = getContainerPropsValue(container, 'content.skipToPay', 'N');
+        this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
         this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ''}).value;
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: "/pages/order/success"}).value;
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");

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;