jufubao-base 1.0.216 → 1.0.218-beta1

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -49,52 +49,64 @@
           class="jfb-base-card__body-card"
           :style="{padding: marginUi}"
         >
-          <view
-            v-for="(item, index) in cardList"
-            :key="index"
-            @click="handleBindLogin(item)"
-            class="jfb-base-card__body-card-item"
-            :style="{
-              marginBottom: list_sp + 'rpx',
-              backgroundColor:(item['is_login'] === 'Y'? mainBorderColor : '#fff'),
-              borderColor:`${item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}`
-            }"
-          >
-            <view class="jfb-base-card__body-card-item-left">
-              <xd-font-icon
-                size="100"
-                :color="mainColor"
-                :icon="item['is_login'] === 'Y'?'iconkaquandengluchenggong':'iconyouhuiquan1-011'"
-              ></xd-font-icon>
-              <view :style="{color: item['is_login'] === 'Y'?mainColor :''}">{{ item['is_login'] === 'Y'? logged_name : login_name}}</view>
-            </view>
+          <view v-if="cardList&&cardList.length>0">
             <view
-              class="jfb-base-card__body-card-item-right"
-              :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
+              v-for="(item, index) in cardList"
+              :key="index"
+              @click="handleBindLogin(item)"
+              class="jfb-base-card__body-card-item"
+              :style="{
+                marginBottom: list_sp + 'rpx',
+                backgroundColor:(item['is_login'] === 'Y'? mainBorderColor : '#fff'),
+                borderColor:`${item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}`
+              }"
             >
+              <view class="jfb-base-card__body-card-item-left">
+                <xd-font-icon
+                  size="100"
+                  :color="mainColor"
+                  :icon="item['is_login'] === 'Y'?'iconkaquandengluchenggong':'iconyouhuiquan1-011'"
+                ></xd-font-icon>
+                <view :style="{color: item['is_login'] === 'Y'?mainColor :''}">{{ item['is_login'] === 'Y'? logged_name : login_name}}</view>
+              </view>
               <view
-                class="jfb-base-card__body-card-item-right-top"
+                class="jfb-base-card__body-card-item-right"
                 :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
               >
-                <view>
-                  <xd-font-icon
-                    icon="iconkaquan"
-                    size="30"
-                    :style="{marginRight: '10rpx'}"
-                  ></xd-font-icon>
-                  <view>{{ item.card_type_name }}</view>
+                <view
+                  class="jfb-base-card__body-card-item-right-top"
+                  :style="{borderColor: item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}"
+                >
+                  <view :class="{card_name:item.is_gift === 'Y'}">
+                    <view :style="{backgroundColor: mainColor}" v-if="item.is_gift === 'Y'" class="is-gift">赠</view>
+                    <xd-font-icon
+                      v-else
+                      icon="iconkaquan"
+                      size="30"
+                      :style="{marginRight: '10rpx'}"
+                    ></xd-font-icon>
+                    <view>{{ item.card_type_name }}</view>
+                  </view>
+                  <view>
+                    <view>ID:{{ item.card_number }}</view>
+                    <view>有效期至:{{ item.end_time }}</view>
+                  </view>
                 </view>
-                <view>
-                  <view>ID:{{ item.card_number }}</view>
-                  <view>有效期至:{{ item.end_time }}</view>
+                <view class="jfb-base-card__body-card-item-right-bottom">
+                  <view class="jfb-base-card__body-card-item-right-bottom-info">
+                    <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
+                    <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
+                  </view>
+                  <view @click.stop="toDetail(item)" :style="{ background: mainColor }">{{look_name}}</view>
                 </view>
               </view>
-              <view class="jfb-base-card__body-card-item-right-bottom">
-                <view class="jfb-base-card__body-card-item-right-bottom-info">
-                  <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
-                  <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
-                </view>
-                <view @click.stop="toDetail(item)" :style="{ background: mainColor }">{{look_name}}</view>
+              </view>
+          </view>
+          <view v-else class="jfb-base-card__body-empty">
+            <view class="jfb-base-card__body-empty-wrap">
+              <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>
@@ -124,6 +136,7 @@
   import JfbBaseCardV2Mixin from "./JfbBaseCardV2Mixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
+  import colorCardMixins from "@/mixins/colorCardMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
   import {mapState} from "vuex";
@@ -136,7 +149,7 @@
       XdButton
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBaseCardV2Mixin
+      componentsMixins, extsMixins, JfbBaseCardV2Mixin,colorCardMixins
     ],
     data() {
       return {
@@ -157,6 +170,9 @@
         list_sp:20,
 
         inCallbackUrlOrg:'',//是否带有回调地址
+        buy_new_url: '',
+        isShowBuy: "",
+        buy_name: ""
       }
     },
     watch: {
@@ -178,6 +194,9 @@
         str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
         return str
       },
+      emptyBg() {
+        return this.getNoData();
+      },
     },
     created() {
       this.init(this.container);
@@ -233,6 +252,9 @@
         this.look_name =  getContainerPropsValue(container, 'content.look_name', '查看');
         this.logged_name =  getContainerPropsValue(container, 'content.logged_name', '已登录');
         this.list_sp = getContainerPropsValue(container, 'content.list_sp', 20);
+        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;
 
       },
 
@@ -272,6 +294,11 @@
           url:path
         })
       },
+      toBuyNew() {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.buy_new_url}`,
+        });
+      },
       toOrderList(){
         this.$xdUniHelper.navigateTo({
           url: this.orderListPath
@@ -326,9 +353,61 @@
           /* #endif */
         }
       }
+
+      & .card_name {
+        display: flex;
+        justify-content: flex-start;
+        align-items: flex-start;
+
+        & .is-gift {
+          margin-top: 6rpx;
+          font-size: 18rpx;
+          padding: 2rpx 10rpx;
+          border-radius: 8rpx;
+          line-height:26rpx;
+          height: 26rpx;
+          color: #fff;
+          margin-right: 18rpx;
+        }
+
+        & .card_name_text {
+          //line-height: 36rpx;
+        }
+      }
     }
   }
   .jfb-base-card__body{
+
+      &-empty {
+        color: #888;
+        font-size: unit(24,rpx);
+        height: 60vh;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .buy_new {
+          display: flex;
+          margin-left: 8rpx;
+          & > view:first-child {
+            margin-right: 8rpx;
+          }
+        }
+
+        &-wrap {
+          display: flex;
+          flex-direction: column;
+
+          & > image {
+            width: unit(460,rpx);
+            height: unit(400,rpx);
+          }
+        }
+
+        & > view {
+          text-align: center;
+        }
+      }
     &-card {
       &-item {
         display: flex;

package/src/components/JfbBaseCardV2/Mock.js

@@ -13,7 +13,8 @@ module.exports = {
       "main_product_name": "",
       "other_card_point": 0,
       "is_exchange": "N",
-      "is_login":"Y"
+      "is_login":"Y",
+      "is_gift":"Y"
     }, {
       "card_number": "101001000005193",
       "card_point": 99963600,
@@ -23,7 +24,8 @@ module.exports = {
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "is_gift":"N"
     }, {
       "card_number": "101001000005184",
       "card_point": 100000000,
@@ -33,7 +35,8 @@ module.exports = {
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "is_gift":"Y"
     }, {
       "card_number": "101001000005185",
       "card_point": 99631000,
@@ -43,7 +46,8 @@ module.exports = {
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "N"
+      "is_exchange": "N",
+      "is_gift":"Y"
     }, {
       "card_number": "101001000006990",
       "card_point": 1400,
@@ -63,7 +67,8 @@ module.exports = {
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "Y"
+      "is_exchange": "Y",
+      "is_gift":"Y"
     }, {
       "card_number": "101001000006989",
       "card_point": 3600,
@@ -83,7 +88,8 @@ module.exports = {
       "is_valid": "Y",
       "main_product_name": "",
       "other_card_point": 0,
-      "is_exchange": "Y"
+      "is_exchange": "Y",
+      "is_gift":"Y"
     }, {
       "card_number": "101001000005479",
       "card_point": 10000000,

package/src/components/JfbBaseCardV3/Attr.js

@@ -31,6 +31,29 @@ export default {
         inline: false,
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
+      {
+        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>个汉字'
+      },
       {
         label: '绑定新票券地址:',
         ele: 'xd-select-pages-path',
@@ -67,6 +90,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/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: [],
+};