jufubao-base 1.0.169-beta3 → 1.0.169-beta5

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -18,6 +18,12 @@ export default {
           { label: '我的优惠券', value: 'coupon' },
         ],
       },
+      {
+        ele: "title",
+        label: "公告内容配置 - 通用",
+        size: "small",
+        groupKey: "content",
+      },
       {
         label: '公告内容:',
         ele: 'xd-site-news',
@@ -247,6 +253,7 @@ export default {
         label: "我的票券包内容配置",
         size: "small",
         groupKey: "content",
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: '票券背景图:',
@@ -267,12 +274,14 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'card'
       },
       {
         ele: "title",
         label: "我的优惠券内容配置",
         size: "small",
         groupKey: "content",
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: '优惠券背景图:',
@@ -293,10 +302,11 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         ele: "title",
-        label: "列表容器配置",
+        label: "列表容器配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -327,7 +337,7 @@ export default {
       },
       {
         ele: "title",
-        label: "标题菜单配置",
+        label: "标题菜单配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -362,7 +372,7 @@ export default {
         groupKey:'style',
         ele: 'el-input',
         valueKey: 'menuItemMargin',
-        value: data.menuItemMargin || 20,
+        value: data.menuItemMargin || 40,
         type: "number",
         className: "input40",
         placeholder: '请输入菜单间距',
@@ -425,11 +435,83 @@ export default {
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
       },
+      {
+        ele: "title",
+        label: "公告样式配置 - 通用",
+        size: "small",
+        groupKey: "style",
+      },
+      {
+        label: "外边距设置:",
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'noticeMargin',
+        value: data.noticeMargin || {
+          top: 20,
+          right: 0,
+          bottom: 20,
+          left:20
+        },
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+      },
+      {
+        label: "内边距设置:",
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'noticePadding',
+        value: data.noticePadding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "背景色设置:",
+        ele: "xd-color",
+        groupKey:'style',
+        valueKey: "noticeBgColor",
+        value: data.noticeBgColor || null,
+        setting: {
+          showAlpha: true,
+          isAlpha: true
+        }
+      },
+      {
+        label: "文字设置:",
+        ele: "xd-font",
+        valueKey: "noticeFont",
+        value: data.noticeFont || {},
+        groupKey:'style',
+        setting: {
+          align: false,
+          lineHeight: false,
+        },
+        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);
+            });
+        },
+        inline: false,
+        notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+      },
       {
         ele: "title",
         label: "我的票券包样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "单项内边距设置:",
@@ -443,6 +525,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "圆角设置",
@@ -462,6 +545,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮文字背景色设置:",
@@ -485,6 +569,7 @@ export default {
               data.cb([])
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮圆角设置",
@@ -504,6 +589,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮内边距设置:",
@@ -517,12 +603,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'card'
       },
       {
         ele: "title",
         label: "我的优惠券样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "优惠券左侧背景色设置:",
@@ -530,6 +618,7 @@ export default {
         valueKey: "couponLeftBgColor",
         value: data.couponLeftBgColor || 'linear-gradient(180deg, #FFA852 0%, #FF5733 100%)',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "圆角设置",
@@ -549,6 +638,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "优惠券标题背景颜色设置:",
@@ -559,7 +649,8 @@ export default {
         setting: {
           showAlpha: true,
           isAlpha: true
-        }
+        },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "去使用按钮文字背景色设置: ",
@@ -583,6 +674,7 @@ export default {
               data.cb([])
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "按钮内边距设置:",
@@ -596,6 +688,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "按钮圆角设置",
@@ -615,6 +708,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: '票券绑定跳转路径:', //label

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -39,17 +39,18 @@
       <view class="JfbBaseNotice">
         <!--notice-->
         <view class="jfb-base-tfk-card-login__body-line" v-if="!notice"></view>
-        <view :style="{marginTop: '0rpx'}" class="jfb-base-tfk-card-login__body-notice" v-if="notice">
+        <view class="jfb-base-tfk-card-login__body-notice" :style="noticeWrapBoxStyle" v-if="notice">
           <view
             class="jfb-base-tfk-card-login__body-notice-in"
-            :style="{ background: noticeBackgroundColor }"
+            :style="noticeBoxStyle"
           >
             <xd-notice-bar
               style="width: 100%"
+              :color="noticeFont.color"
               :showIcon="true"
               :scrollable="true"
               :speed="20"
-              :fontSize="24"
+              :fontSize="noticeFont.size"
               :height="70"
               :is-no-bgc="false"
             >
@@ -59,15 +60,14 @@
             </xd-notice-bar>
           </view>
         </view>
-        <view class="jfb-base-tfk-card-login__body-notice" v-if="noticeStatus && isPreview && notice === ''">
+        <view class="jfb-base-tfk-card-login__body-notice" :style="noticeWrapBoxStyle" v-if="noticeStatus && isPreview && notice === ''">
           <view
             class="jfb-base-tfk-card-login__body-notice-in"
-            :style="{
-              background: noticeBackgroundColor,
+            :style="[noticeBoxStyle, {
               textAlign: 'center',
               color: dangerColor,
               fontSize: 26 + 'rpx',
-            }">该组件未配置数据，因此改模块在正式环境将不显示</view>
+            }]">该组件未配置数据，因此改模块在正式环境将不显示</view>
         </view>
         <!--notice end-->
       </view>
@@ -200,6 +200,10 @@
         couponUseBtnPadding: {},
         couponBtnRadius: 16,
         couponLeftBgColor: "",
+        noticeBgColor: "",
+        noticeMargin: {},
+        noticePadding: {},
+        noticeFont: {},
       }
     },
     computed: {
@@ -348,6 +352,26 @@
           borderRadius: this.couponRadius + 'rpx',
         })
       },
+      noticeWrapBoxStyle(){
+        let padding = `${this.checkValue(this.noticeMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.left, 20)}rpx`;
+
+        return this.styleObjectToString({
+          padding: padding,
+        })
+      },
+      noticeBoxStyle(){
+        let padding = `${this.checkValue(this.noticePadding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.left, 20)}rpx`;
+        return this.styleObjectToString({
+          padding: padding,
+          background: this.noticeBgColor
+        })
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -393,8 +417,12 @@
         this.couponUseBtnPadding = getContainerPropsValue(value, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
         this.couponBtnRadius = getContainerPropsValue(value, "content.couponBtnRadius", 16);
         this.couponLeftBgColor = getContainerPropsValue(value, "content.couponLeftBgColor", "");
+        this.noticeBgColor = getContainerPropsValue(value, "content.noticeBgColor", "");
+        this.noticeMargin = getContainerPropsValue(value, "content.noticeMargin", {top: 20, left: 20, right: 20, bottom: 20});
+        this.noticePadding = getContainerPropsValue(value, "content.noticePadding", {top: 20, left: 20, right: 20, bottom: 20});
+        this.noticeFont = getContainerPropsValue(value, "content.noticeFont", {});
 
-        console.log(this.couponLeftBgColor, 'couponLeftBgColor')
+        console.log(this.noticeFont, 'noticeFont')
 
         if(this.$configProject.isPreview){
           this.menuType = this.previewCurrent;
@@ -472,19 +500,12 @@
       }
       &-notice {
         width: 100%;
-        margin-top: unit(30, rpx);
-        height: unit(80, rpx);
-        position: relative;
+        box-sizing: border-box;
         &-in {
-          position: absolute;
-          left: unit(-30, rpx);
-          top: unit(0, rpx);
-          right: unit(-30, rpx);
-          bottom: 0;
           display: flex;
-          padding: 0 unit(30, rpx);
           overflow: hidden;
           align-items: center;
+          box-sizing: border-box;
         }
 
       }
@@ -569,7 +590,11 @@
             }
           }
         }
-        .coupon_list{}
+        .coupon_list{
+          ::v-deep .xd-coupon_item{
+            margin: var(--card-list-margin) 0;
+          }
+        }
         .no_more_card{
           text-align: center;
           padding: 20rpx 0;

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -1,4 +1,5 @@
 'use strict';
+import CusAttr from "./CusAttr";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -8,50 +9,36 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80',
+        label: '是否支持聚好兑:',
+        ele: 'xd-radio',
+        valueKey: 'isShowExchange',
+        value: data['isShowExchange'] || "N",
+        groupKey:'content',
         rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "支持", "value": "Y"},
+          {"label": "不支持", "value": "N"},
         ]
       },
       {
-        label: '选中路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgcolor && {
-        label: '高度:',
+        label: '外边间距:',
         ele: 'el-input',
         type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80',
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        groupKey:'style',
+        valueKey: 'outSpacing',
+        value: data['outSpacing'] || '',
+        notice: '外边间距设置，单位：像素，默认值：<span style="color:red">20</span> px',
+        inline: false,
+        className: 'input60',
       },
+
+      //todo
+
+
+      //列表相关属性
+      ...CusAttr(data),
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseTfkSearch/ContentCinema.vue

@@ -0,0 +1,147 @@
+<template>
+  <view class="content" @click="handleCinemaDetail">
+    <view class="title">{{item['cinema_name']}}</view>
+    <view class="address">{{item['address']}}</view>
+    <view class="bottom">
+      <view class="distance">
+        <template v-if="item['distance']">
+          <xd-font-icon size="26" icon="icondizhi" :color="color.SEAT"></xd-font-icon>
+          <text :style="{color: color.SEAT}">{{item['distance']}}</text>
+        </template>
+      </view>
+      <view class="btn">
+        <!--不展示核销类型【SELL】-->
+        <view
+          v-for="(name,index) in item['cinema_type_name']"
+          v-if="item['cinema_type'][index] !== 'SELL'"
+          :key="index"
+          @click.stop="handleBtn(item['cinema_type'][index])"
+          :style="{
+            backgroundColor:color[item['cinema_type'][index]],
+            color:'#fff'
+          }">{{name}}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdButton from "@/components/XdButton/XdButton.vue";
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
+
+  export default {
+    name:'ContentCinema',
+    components:{
+      XdButton,
+      XdFontIcon
+    },
+    props:{
+      item:Object,
+      color: {
+        type: Object,
+        default: {}
+      },
+
+    },
+    data(){
+      return {
+
+      }
+    },
+    created() {
+
+    },
+    methods:{
+      handleCinemaDetail(){
+        //优先在线选座
+        if(this.item['cinema_type'].includes('SEAT')) {
+          this.handleSchedule();
+          return
+        }
+        if(this.item['cinema_type'].includes('CODE')) {
+          this.handleCodeDetail();
+          return
+        }
+        if(this.item['cinema_type'].includes('SELL')) {
+          this.handleCashierDetail();
+          return
+        }
+        console.error(`${JSON.stringify(this.item['cinema_type'])}`)
+      },
+
+      handleBtn(code){
+        if(code === 'SEAT') this.handleSchedule();
+        else if(code === 'CODE') this.handleCodeDetail();
+        else if(code === 'SELL') this.handleCashierDetail();
+        else console.error(`${JSON.stringify(this.item['cinema_type'])}`)
+      },
+
+      //电子码
+      handleCodeDetail(){
+        console.warn(`handleCodeDetail`)
+        this.$emit('on-code-detail', this.item);
+      },
+      //核销
+      handleCashierDetail(){
+        console.warn(`handleCashierDetail`)
+        this.$emit('on-cashier-detail', this.item);
+      },
+
+      //选座排期
+      handleSchedule(){
+        console.warn(`handleSchedule`)
+        this.$emit('on-schedule', this.item);
+      },
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.content {
+  .title {
+    font-size: 32rpx;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+    color: #333;
+    font-weight: 500;
+  }
+  .address {
+    font-size: 24rpx;
+    line-height: 30rpx;
+    color: #999;
+    margin-bottom: 15rpx;
+  }
+
+  .bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 30rpx;
+
+    & > .distance {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+
+      & > text {
+        margin-left: 10rpx;
+        font-size: 24rpx;
+      }
+    }
+
+    & > .btn {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      & > view {
+        margin-left: 10rpx;
+        padding: 0 30rpx;
+        line-height: 60rpx;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+}
+</style>