jufubao-base 1.0.218 → 1.0.220-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,62 @@ 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'&&{
+        label: "快捷入口类型",
+        ele: "xd-radio",
+        valueKey: "quickEntryType",
+        value: data.quickEntryType || "service",
+        list: [
+          {label: "联系客服", value: "service"},
+        ],
+        notice:'<div style="color:red">客服功能仅在小程序下生效</div>',
+        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 +409,26 @@ 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'),
+        },
+        notice:'<div><span style="color:red">客服类型</span>不需要配置</div>',
+        inline: false,
+      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -83,6 +83,27 @@
           :style="[searchBtnStyle]"
           @click="doSearch"
         >{{searchBtnText || '搜索'}}</view>
+        <!-- 非预览情况下，H5隐藏客服功能 -->
+        <!--#ifdef H5-->
+        <view v-if="isPreview">
+          <view  v-if="showQuickEntry==='Y'" @click="handleQuickEntry" :style="{backgroundColor:quickBackgroundColor}" class="quick">
+            <xd-font-icon size="32" :style="{color:quickTextColor||mainColor}" :icon="quickIcon"></xd-font-icon>
+          </view>
+        </view>
+        <view v-else>
+          <view  v-if="showQuickEntry==='Y'&&quickEntryType!=='service'" @click="handleQuickEntry" :style="{backgroundColor:quickBackgroundColor}" class="quick">
+            <xd-font-icon size="32" :style="{color:quickTextColor||mainColor}" :icon="quickIcon"></xd-font-icon>
+          </view>
+        </view>
+        <!-- #endif -->
+        <!-- #ifdef MP-WEIXIN -->
+        <view  v-if="showQuickEntry==='Y'&&quickEntryType!=='service'" @click="handleQuickEntry" :style="{backgroundColor:quickBackgroundColor}" class="quick">
+          <xd-font-icon size="32" :style="{color:quickTextColor||mainColor}" :icon="quickIcon"></xd-font-icon>
+        </view>
+        <button v-if="showQuickEntry==='Y'&&quickEntryType==='service'" :style="{backgroundColor:quickBackgroundColor}" class="quick-button" open-type="contact">
+          <xd-font-icon size="32" :style="{color:quickTextColor||mainColor}" :icon="quickIcon"></xd-font-icon>
+        </button>
+         <!-- #endif -->
       </view>
     </view>
   </view>
@@ -136,7 +157,12 @@
         searchPagePath: "",
         placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
-
+        quickEntryPath: "",  //快速入口
+        quickBackgroundColor: "",
+        quickTextColor: "",
+        quickIcon: "",
+        showQuickEntry: '',
+        quickEntryType: "",
 
         //基础
         textColor: '',
@@ -230,6 +256,14 @@
         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");
+        this.quickEntryType = getContainerPropsValue(container, 'content.quickEntryType', "");
+        this.quickEntryPath = getContainerPropsValue(container, 'content.quickEntryPath', {value:""}).value;
+
         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'];
@@ -284,6 +318,12 @@
         },true)
       },
 
+      handleQuickEntry() {
+          this.$xdUniHelper.navigateTo({
+            url: this.quickEntryPath
+          })
+      },
+
       onJfbBack(options) {
         if(getCurrentPages().length === 1 ) {
           this.$xdUniHelper.redirectTo({
@@ -318,6 +358,26 @@
         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;
+        }
+        .quick-button {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 12rpx 24rpx;
+          border-radius: 36rpx;
+          margin-left: 16rpx;
+          line-height: inherit;
+        }
+        .quick-button::after{
+          border: none !important;
+        }
 
         &-back {
           padding-left: unit(20, rpx);

package/src/components/JfbBaseNoticeDialog/Api.js

@@ -0,0 +1,22 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Notice
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getListNoticeDialogContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', '1'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -0,0 +1,290 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '弹框内容设置:',
+        ele: 'xd-site-poster',
+        valueKey: 'background',
+        groupKey:'content',
+        className: 'input80',
+        value: data.background || {size:{"width":"730", "height":"730"}},
+        setting: {
+          count: 1,
+          scene: { label: '背景', value: 'normal'},
+          width: 730,
+          height: 730,
+          typeDisabled: true,
+        },
+        handleCustom({action, data}) {
+          //设置场景参数
+          if(data) {
+            data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
+          }
+
+          //获取显示内容
+          if (action === 'screenList') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
+              .then(res => {
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getPosterInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb(res)
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          let loading = XdBus.getParentApi('loading')({});
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updatePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deletePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updatePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deletePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告内容跳转地址类型
+          if (action === 'jumpPosterContentType') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+              .then(res => {
+                loading.close();
+                data.cb(res['redirect_type'])
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //发布
+          if (action === 'publish') {
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //获取站内页面地址
+          if (action === 'router') {
+            loading.close()
+            return XdBus.getParentApi('getPagesTree');
+
+          }
+
+          //通知页面进行刷新
+          if(action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+        inline: false,
+        notice: '设置背景图片时候，建议上传图片尺寸大小为:<span style="color:red">730 * 730</span>像素',
+      },
+      {
+        label: '使用数量:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'number',
+        groupKey:'content',
+        value: data.number || 1,
+        placeholder: '请输入使用数量',
+        className: 'input40',
+        unit: '张',
+        rules: [
+          {
+            required: true,
+            message: '请输入使用数量',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '弹框提示方式:',
+        ele: 'xd-radio',
+        valueKey: 'type',
+        groupKey:'content',
+        value: data['type'] || 'pop',
+        placeholder: '请选择弹框提示方式',
+        className: 'input60',
+        list: [
+          { label: '弹框', value: 'pop' },
+        ]
+      },
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'is_hide_dailog',
+        groupKey:'content',
+        value: data['is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
+      {
+        label: '关闭按钮位置:',
+        ele: 'xd-radio',
+        valueKey: 'close_position',
+        groupKey:'content',
+        value: data['close_position'] || 'right',
+        placeholder: '请选择关闭按钮位置',
+        className: 'input60',
+        list: [
+          { label: '右上角', value: 'right' },
+          { label: '下居中', value: 'bottom' },
+        ]
+      },
+      {
+        label: '弹窗间隔:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey:'content',
+        valueKey: 'time',
+        value: data.time || '',
+        className: 'input80',
+        inline: false,
+        notice: '弹窗间隔，单位：小时。默认值：<span style="color: red">3</span>小时',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};