jufubao-base 1.0.237-beta7 → 1.0.237-beta9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.237-beta7",
+  "version": "1.0.237-beta9",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -59,7 +59,7 @@
                   <text>{{plusDiscount/1000}}</text>折
                 </view>
               </view>
-              <view class="vip-open" @click="handleToOpen">
+              <view v-if="is_vip==='N'" class="vip-open" @click="handleToOpen">
                 <xd-font-icon color="#FCBF28" size="20" icon="iconPLUShuiyuan"></xd-font-icon>
                 <text>立即开通</text>
                 <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
@@ -146,7 +146,8 @@
         isFlow: false,
         xnamespace: '',
         plusDiscount: 0,
-        userInfo: {}
+        userInfo: {},
+        is_vip: 'N',
       }
     },
     watch: {
@@ -193,7 +194,7 @@
     },
     created() {
       console.log(this.siteInfo,'configProject');
-      
+      this.is_vip = this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP'?'Y':'N'
       this.init(this.container);
     },
     methods: {

package/src/components/JfbBaseHeader/Attr.js

@@ -300,6 +300,28 @@ export default {
         groupKey:'style',
         hidden: true,
       },
+      {
+        label: "是否展示二维码",
+        ele: "xd-radio",
+        valueKey: "showQrcode",
+        value: data.showQrcode || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
+      {
+        label: "是否展示扫一扫",
+        ele: "xd-radio",
+        valueKey: "showScan",
+        value: data.showScan || "N",
+        list: [
+          {label: "不显示", value: "N"},
+          {label: "显示", value: "Y"}
+        ],
+        groupKey:'content',
+      },
       {
         label: "是否展示快捷入口",
         ele: "xd-radio",
@@ -356,6 +378,40 @@ export default {
         placeholder: '请选择快捷入口背景颜色',
         classNmae: 'input80',
       },
+      data.showQrcode === 'Y' && {
+        ele: 'title',
+        label: '二维码样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码大小:",
+        ele: "el-input",
+        valueKey: "qrcodeSize",
+        value: data.qrcodeSize || 32,
+        type: "number",
+        groupKey: "style",
+      },
+      data.showQrcode === 'Y' && {
+        label: "二维码图标颜色:",
+        ele: 'xd-color',
+        valueKey: "qrCodeColor",
+        groupKey:'style',
+        value: data.qrCodeColor || '',
+      },
+      data.showScan === 'Y' && {
+        ele: "title",
+        label: "扫一扫样式设置",
+        size: "small",
+        groupKey: "style",
+      },
+      data.showScan === 'Y' && {
+        label: "扫一扫图标颜色:",
+        ele: 'xd-color',
+        valueKey: "scanIconColor",
+        value: data.scanIconColor || '',
+        groupKey:'style',
+      },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -429,6 +485,32 @@ export default {
         notice:'<div><span style="color:red">客服类型</span>不需要配置</div>',
         inline: false,
       },
+      {
+        label: '二维码跳转链接:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'qrcodePath',
+        groupKey:'advanced',
+        placeholder: '选择二维码跳转链接',
+        value: data['qrcodePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showQrcode === 'N'
+      },
+      {
+        label: "扫一扫跳转链接:",
+        ele: 'xd-select-pages-path',
+        valueKey: "scanPath",
+        groupKey:'advanced',
+        placeholder: '选择扫一扫跳转链接',
+        value: data['scanPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+        hidden: data.showScan === 'N'
+      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -60,6 +60,9 @@
               :key="showLocationKey"
             ></xd-city-show-api>
           </view>
+          <view v-if="showScan==='Y'" class="scan_in" @click.stop="handleScanClick">
+            <xd-font-icon :size="32" :color="scanIconColor" icon="iconsaoma1"></xd-font-icon>
+          </view>
           <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
           <input
             v-if="useSearch==='Y'"
@@ -78,6 +81,9 @@
             @click.stop="doSearch"
           >{{searchBtnText || '搜索'}}</view>
         </view>
+        <view v-if="showQrcode==='Y'" class="qr_code" @click.stop="handleQrCodeClick">
+          <xd-font-icon :size="qrcodeSize" icon="iconerweima" :color="qrCodeColor"></xd-font-icon>
+        </view>
         <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
           class="search_btn_out"
           :style="[searchBtnStyle]"
@@ -196,6 +202,13 @@
         searchBoxRadius: 30,
         bottomBorder: "",
         inputBorder: "",
+        showQrcode: "",
+        qrcodeSize: 32,
+        qrcodePath: "",
+        qrCodeColor: "",
+        showScan: "",
+        scanIconColor: "",
+        scanPath: "",
       }
     },
     watch: {
@@ -226,7 +239,11 @@
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
-
+        this.showQrcode = getContainerPropsValue(container, "content.showQrcode", "");
+        this.qrcodeSize = getContainerPropsValue(container, "content.qrcodeSize", 32);
+        this.qrCodeColor = getContainerPropsValue(container, "content.qrCodeColor", "#333");
+        this.showScan = getContainerPropsValue(container, "content.showScan", "");
+        this.scanIconColor = getContainerPropsValue(container, "content.scanIconColor", "#333");
 
         //基础
         this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", '#fff');
@@ -263,6 +280,8 @@
         this.showQuickEntry = getContainerPropsValue(container, 'content.showQuickEntry', "N");
         this.quickEntryType = getContainerPropsValue(container, 'content.quickEntryType', "");
         this.quickEntryPath = getContainerPropsValue(container, 'content.quickEntryPath', {value:""}).value;
+        this.qrcodePath = getContainerPropsValue(container, 'content.qrcodePath', {value:""}).value;
+        this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value:""}).value;
 
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
@@ -301,6 +320,16 @@
           })
         }
       },
+      handleQrCodeClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.qrcodePath
+        })
+      },
+      handleScanClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.scanPath
+        })
+      },
 
       /***
        * @description 定位完成事件
@@ -446,6 +475,20 @@
               padding: 0;
             }
           }
+          .scan_in{
+            position: relative;
+            padding-right: 28rpx;
+            margin-right: 20rpx;
+            &::before{
+              content: " ";
+              position: absolute;
+              width: 2rpx;
+              height: 100%;
+              background-color: #CCCCCC;
+              right: -0rpx;
+              top: 0rpx;
+            }
+          }
           .search_input{
             flex: 1;
             text-align: left;
@@ -479,6 +522,9 @@
           align-items: center;
           justify-content: center;
         }
+        .qr_code{
+          margin-left: 16rpx;
+        }
       }
     }
   }

package/src/components/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -66,7 +66,7 @@
                 :key="showLocationKey"
               ></xd-city-show-api>
             </view>
-            <view v-if="showScan==='Y'" class="scan_in" @click="handleScanClick">
+            <view v-if="showScan==='Y'" class="scan_in" @click.stop="handleScanClick">
               <xd-font-icon :size="32" :color="scanIconColor" icon="iconsaoma1"></xd-font-icon>
             </view>
             <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
@@ -87,7 +87,7 @@
               @click.stop="doSearch"
             >{{searchBtnText || '搜索'}}</view>
           </view>
-          <view v-if="showQrcode==='Y'" class="qr_code" @click="handleQrCodeClick">
+          <view v-if="showQrcode==='Y'" class="qr_code" @click.stop="handleQrCodeClick">
             <xd-font-icon :size="qrcodeSize" icon="iconerweima" :color="qrCodeColor"></xd-font-icon>
           </view>
           <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"

package/src/components/JfbBaseNoticeGroup/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/JfbBaseNoticeGroup/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/JfbBaseNoticeGroup/JfbBaseNoticeGroup.vue

@@ -0,0 +1,111 @@
+<template>
+  <view
+    class="jfb-base-notice-group"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-notice-group__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-notice-group__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-notice-group__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseNoticeGroupMixin from "./JfbBaseNoticeGroupMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseNoticeGroup",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseNoticeGroupMixin
+    ],
+    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 "./JfbBaseNoticeGroupLess.less";
+
+  .jfb-base-notice-group {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseNoticeGroup/JfbBaseNoticeGroupLess.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-group {
+  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-group {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseNoticeGroup/JfbBaseNoticeGroupMixin.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-group'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseNoticeGroup/Mock.js

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

package/src/components/JfbBasePersonalData/Attr.js

@@ -6,7 +6,31 @@
 export default {
   style: [],
   content: (data) => {
-    return [].filter(i=>i)
+    return [
+      0&&{
+        label: '公告组:',
+        ele: 'xd-site-news-group',
+        valueKey: 'contentGroup',
+        groupKey: 'content',
+        value: data.contentGroup || {},
+        isKey: true,
+        key: new Date().getTime(),
+        setting: {
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
+        },
+        rules: [
+          { required: true, message: '请选择广告位', trigger: 'change' },
+        ],
+      },
+    ].filter(i=>i)
   },
   advanced: [],
 };

package/src/components/JfbBasePointsCard/Attr.js

@@ -163,7 +163,7 @@ export default {
         valueKey: 'pointsPath',
         groupKey:'advanced',
         placeholder: '请选择积分详情路径',
-        value: data['coupointsPathponPath'] || null,
+        value: data['pointsPath'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBasePosterGroup/Attr.js

@@ -143,6 +143,8 @@ export default {
         key: new Date().getTime(),
         setting: {
           scene: { label: '广告', value: 'normal' },
+          partDisabled: true,
+          disabled: true,
         },
         rules: [
           { required: true, message: '请选择广告位', trigger: 'change' },

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -85,6 +85,8 @@
   import echarts from './components/echarts.vue'
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl";
+
   export default {
     name: "JfbBaseSavingDetail",
     components: {
@@ -179,6 +181,13 @@
           vm: this,
           data: data,
         }).then(res => {
+          let list = res.list.map(item => {
+            item["order_time"] = this.$xdUniHelper.getDate(
+              item["order_time"] * 1000
+            ).fullTime;
+            item.product_image = getServiceUrl(item.product_image)
+            return item;
+          })
           const textColor = '#999'
           const seriesData = res.record_months.map(item => {
             return item.value
@@ -272,9 +281,9 @@
           this.saveAmount = res.save_amount
           this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
-            this.productList = res.list
+            this.productList = list
           } else {
-            this.productList = this.productList.concat(res.list);
+            this.productList = this.productList.concat(list);
           }
         })
       },
@@ -283,6 +292,13 @@
           vm: this,
           data: {},
         }).then(res => {
+          let list = res.list.map(item => {
+            item["order_time"] = this.$xdUniHelper.getDate(
+              item["order_time"] * 1000
+            ).fullTime;
+            item.product_image = getServiceUrl(item.product_image)
+            return item;
+          })
           // 最大值
           let max = this.getAmout(res.total_amount);
           // 数量
@@ -360,9 +376,9 @@
           this.saveAmount = res.save_amount
           this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
-            this.productList = res.list
+            this.productList = list
           } else {
-            this.productList = this.productList.concat(res.list);
+            this.productList = this.productList.concat(list);
           }
         })
       },
@@ -371,6 +387,13 @@
           vm: this,
           data: {},
         }).then(res => {
+          let list = res.list.map(item => {
+            item["order_time"] = this.$xdUniHelper.getDate(
+              item["order_time"] * 1000
+            ).fullTime;
+            item.product_image = getServiceUrl(item.product_image)
+            return item;
+          })
           let max = this.getAmout(res.total_amount);
           // 数量
           let value = this.getAmout(res.save_amount);
@@ -447,9 +470,9 @@
           this.saveAmount = res.save_amount
           this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
-            this.productList = res.list
+            this.productList = list
           } else {
-            this.productList = this.productList.concat(res.list);
+            this.productList = this.productList.concat(list);
           }
         })
       },