jufubao-base 1.0.217 → 1.0.218-beta1

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -33,7 +33,9 @@
             @bindLogin="handleBindLogin(item)"
             ></xd-card-v2>
         </view>
-        <view v-else class="empty_data">暂时没有票券</view>
+        <view v-else class="empty_data">暂时没有票券 
+          <view v-if="isShowBuy==='Y'" class="buy_new" @click="toBuyNew" :style="{color: mainColor}"><view>{{buy_name}}</view> <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon></view>
+        </view>
       </template>
       <view class="bottom_fix" :style="button_bottom">
         <xd-button type="primary" @click="toBindCard">绑定新票券</xd-button>
@@ -79,6 +81,9 @@
         loadingCardList: true,
 
         inCallbackUrlOrg:'',//是否带有回调地址
+        buy_new_url: '',
+        isShowBuy: "",
+        buy_name: ""
       }
     },
     watch: {
@@ -140,6 +145,9 @@
         this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
         this.logged_name = getContainerPropsValue(container, "content.logged_name", "已登录");
+        this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
+        this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
+        this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
       },
       toBindCard(){
         let path = this.getUrlCallback(this.cardBindPath)
@@ -150,6 +158,11 @@
       toDetail(item) {
         this.$xdUniHelper.navigateTo({url: `${this.detailUrl}?card_number=${item["card_number"]}`,}, false);
       },
+      toBuyNew() {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.buy_new_url}`,
+        });
+      },
       /**
        * @description 已绑定卡登录
        * @param item
@@ -236,6 +249,15 @@
         text-align: center;
         font-size: 24rpx;
         color: #999999;
+        display: flex;
+        justify-content: center;
+        .buy_new {
+          display: flex;
+          margin-left: 8rpx;
+          & > view:first-child {
+            margin-right: 8rpx;
+          }
+        }
       }
       .bottom_fix{
         position: fixed;

package/src/components/JfbBaseHeader/Attr.js

@@ -300,6 +300,51 @@ export default {
         groupKey:'style',
         hidden: true,
       },
+      {
+        label: "是否展示快捷入口",
+        ele: "xd-radio",
+        valueKey: "showQuickEntry",
+        value: data.showQuickEntry || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
+      data.showQuickEntry==='Y'&&{
+        ele: 'title',
+        label: '快捷入口功能样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      data.showQuickEntry==='Y'&&{
+        label: '文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'quickTextColor',
+        value: data.quickTextColor || '',
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+        groupKey:'style',
+      },
+      data.showQuickEntry==='Y'&&{
+        label: 'ICON:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey:'style',
+        valueKey: 'quickIcon',
+        value: data['quickIcon'] || '',
+        placeholder: '请输入快捷入口ICON',
+        className: 'input80',
+      },
+      data.showQuickEntry==='Y'&&{
+        label: '背景颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'quickBackgroundColor',
+        value: data.quickBackgroundColor || '',
+        placeholder: '请选择快捷入口背景颜色',
+        classNmae: 'input80',
+      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -353,13 +398,25 @@ export default {
         ele: 'xd-select-pages-path',
         valueKey: 'choseCityPath',
         groupKey:'advanced',
-        placeholder: '选择城城市选择链接',
+        placeholder: '选择城市选择链接',
         value: data['choseCityPath'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
+      {
+        label: '快捷入口链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'quickEntryPath',
+        groupKey:'advanced',
+        placeholder: '选择快捷入口链接',
+        value: data['quickEntryPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -83,6 +83,9 @@
           :style="[searchBtnStyle]"
           @click="doSearch"
         >{{searchBtnText || '搜索'}}</view>
+        <view  v-if="showQuickEntry==='Y'" :style="{backgroundColor:quickBackgroundColor}" class="quick">
+          <xd-font-icon size="32" :style="{color:quickTextColor||mainColor}" :icon="quickIcon"></xd-font-icon>
+        </view>
       </view>
     </view>
   </view>
@@ -136,7 +139,11 @@
         searchPagePath: "",
         placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
-
+        quickEntryPath: "",  //快速入口
+        quickBackgroundColor: "",
+        quickTextColor: "",
+        quickIcon: "",
+        showQuickEntry: '',
 
         //基础
         textColor: '',
@@ -230,6 +237,12 @@
         this.bottomBorder = this.getBorderCompatibleOldStyle(bottomBorder, {})
         this.inputBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.inputBorder', {}))
 
+        //快捷入口
+        this.quickBackgroundColor = getContainerPropsValue(container, 'content.quickBackgroundColor', "#FFEDDB");
+        this.quickTextColor = getContainerPropsValue(container, 'content.quickTextColor', "");
+        this.quickIcon = getContainerPropsValue(container, 'content.quickIcon', "iconkefu");
+        this.showQuickEntry = getContainerPropsValue(container, 'content.showQuickEntry', "N");
+
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
         if (this['siteInfo'] && this['siteInfo']['mapping'] && this['siteInfo']['mapping']['site_name'])  name = this['siteInfo']['mapping']['site_name'];
@@ -318,6 +331,14 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        .quick {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 12rpx 24rpx;
+          border-radius: 36rpx;
+          margin-left: 16rpx;
+        }
 
         &-back {
           padding-left: unit(20, rpx);

package/src/components/JfbBaseNoticeDialog/Api.js

@@ -0,0 +1,58 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Notice
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Notice
+    mapFnName: 'getNoticeByIdFilmSquate',
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Notice
+    mapFnName: 'updateNoticeFilmPaiqiDate',
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Notice
+    mapFnName: 'removeNoticeFilmAddress',
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Notice
+    mapFnName: 'addNoticeFilmcart',
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -0,0 +1,48 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        value: data.bgColor || '',
+        placeholder: '请输入占位框背景颜色',
+        groupKey:'content',
+      },
+      {
+        label: '选中路径:',
+        groupKey:'advanced',
+        className: 'input100',
+        ele: 'xd-select-pages-path',
+        valueKey: 'select-pages-path',
+        value: data['select-pages-path'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+      },
+      data.bgColor && {
+        label: '高度:',
+        ele: 'el-input',
+        groupKey:'style',
+        type: 'number',
+        valueKey: 'height',
+        value: data.height || 100,
+        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        className: 'input60',
+      },
+      {
+        label: '', //label
+        groupKey:'advanced',
+        ele: 'slot', //package 名称
+        slot: 'is_reference',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -0,0 +1,111 @@
+<template>
+  <view
+    class="jfb-base-notice-dialog"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-notice-dialog__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-notice-dialog__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-notice-dialog__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseNoticeDialogMixin from "./JfbBaseNoticeDialogMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseNoticeDialog",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseNoticeDialogMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseNoticeDialogLess.less";
+
+  .jfb-base-notice-dialog {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialogLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-notice-dialog {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-notice-dialog {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialogMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-notice-dialog'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseNoticeDialog/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getNoticeByIdFilmSquate:{},
+  
+  updateNoticeFilmPaiqiDate:{},
+  
+  removeNoticeFilmAddress:{},
+  
+  addNoticeFilmcart:{},
+  
+}

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -336,6 +336,29 @@ export default {
         ],
         hidden: data.previewCurrent !== 'card'
       },
+      {
+        label: "无票券时是否展示购买新卡入口:",
+        ele: "xd-radio",
+        valueKey: "isShowBuy",
+        value: data.isShowBuy || "N",
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "隐藏", value: "N" }
+        ],
+        groupKey: "content",
+      },
+      {
+        label: '购买新卡文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'buy_name',
+        groupKey:'content',
+        value: data.buy_name || '',
+        placeholder: '请输入购买新卡文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
+      },
       {
         ele: "title",
         label: "我的优惠券内容配置",
@@ -1114,6 +1137,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '购买新卡地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'buy_new_url',
+        groupKey:'advanced',
+        placeholder: '请选择购买新卡地址',
+        value: data.buy_new_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -104,7 +104,9 @@
             </view>
             <view v-else class="empty_data">
               <image :src="emptyBg"></image>
-              暂无票券
+              <view style="display:flex;align-items: center;justify-content: center;">
+                暂无票券 <view v-if="isShowBuy==='Y'" class="buy_new" @click="toBuyNew" :style="{color: mainColor}"><view>{{buy_name}}</view> <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon></view>
+              </view>
             </view>
           </view>
         </template>
@@ -245,6 +247,9 @@
         cardBtnMinWidth: 100,
         menuShowType: "text",
         cardFontColor: "",
+        buy_new_url: '',
+        isShowBuy: "",
+        buy_name: ""
       }
     },
     computed: {
@@ -587,6 +592,9 @@
         this.noticePadding = getContainerPropsValue(value, "content.noticePadding", {top: 20, left: 20, right: 20, bottom: 20});
         this.noticeFont = getContainerPropsValue(value, "content.noticeFont", {});
         this.noticeMoreFont = getContainerPropsValue(value, "content.noticeMoreFont", {});
+        this.isShowBuy = getContainerPropsValue(value, "content.isShowBuy", "N");
+        this.buy_name = getContainerPropsValue(value, "content.buy_name", "购买新卡");
+        this.buy_new_url = getContainerPropsValue(value,"content.buy_new_url",{value: ""}).value;
 
         console.log(this.cardShadow, 'cardShadow')
         if(this.bindCardTextStyle && !this.bindCardTextStyle.color){
@@ -716,6 +724,11 @@
           url: this.disabledPath
         })
       },
+      toBuyNew() {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.buy_new_url}`,
+        });
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -886,6 +899,13 @@
           flex-direction: column;
           align-items: center;
           justify-content: center;
+          .buy_new {
+            display: flex;
+            margin-left: 8rpx;
+            & > view:first-child {
+              margin-right: 8rpx;
+            }
+          }
           & > image {
             width: unit(460,rpx);
             height: unit(400,rpx);

package/src/components/JfbBaseUserCenter/Attr.js

@@ -44,6 +44,29 @@ export default {
         notice: '卡券自定义名称设置，默认值：<span style="color:red">卡券</span>，长度为：1-4字符',
         inline: false,
       },
+      {
+        label: "无票券时是否展示购买新卡入口:",
+        ele: "xd-radio",
+        valueKey: "isShowBuy",
+        value: data.isShowBuy || "N",
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "隐藏", value: "N" }
+        ],
+        groupKey: "content",
+      },
+      {
+        label: '购买新卡文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'buy_name',
+        groupKey:'content',
+        value: data.buy_name || '',
+        placeholder: '请输入购买新卡文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
+      },
 
       //style
       {
@@ -519,6 +542,18 @@ export default {
           router: XdBus.getParentApi('getPagesTree'),
         },
       },
+      {
+        label: '购买新卡地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'buy_new_url',
+        groupKey:'advanced',
+        placeholder: '请选择购买新卡地址',
+        value: data.buy_new_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       {
         label: '',
         ele: 'slot',