jufubao-base 1.0.232-beta3 → 1.0.233-beta1

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -103,10 +103,14 @@
                   color:textColor,
                   borderRadius: contRadius,
                   padding: paddingUi,
-                  lineHeight: '50rpx'
+                  lineHeight: '50rpx',
                 }"
                 v-if="content"
               >
+                <image v-if="show_tip_icon==='Y' && staticTipIcon" :src="staticTipIcon"
+                  :style="{height: tipIconHeight+'rpx'}"
+                  style="width: auto;margin-right: 12rpx;" mode="heightFix"
+                ></image>
                 <xd-content-xss
                   :key="contentKey"
                   :html="content"
@@ -162,6 +166,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer.vue";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import getServiceUrl from "@/common/getServiceUrl";
   import storage from "@/common/storage";
   import Color from "color";
   const color = require('color');
@@ -219,6 +224,9 @@
 
         backgroundColor: '',
         is_hide_dailog:'N',
+        show_tip_icon: "",
+        staticTipIcon: "",
+        tipIconHeight: 50,
 
         isMp:false,
 
@@ -337,12 +345,16 @@
         this.btnConfirmWidth = getContainerPropsValue(container, 'content.btnConfirmWidth', '');
         this.btnConfirmBgColor = getContainerPropsValue(container, 'content.btnConfirmBgColor', '');
         this.btnConfirmTextColor = getContainerPropsValue(container, 'content.btnConfirmTextColor', '');
+        this.show_tip_icon = getContainerPropsValue(container, 'content.show_tip_icon', '');
+        let staticTipIcon = getContainerPropsValue(container, 'content.staticTipIcon', '');
+        this.staticTipIcon = staticTipIcon ? getServiceUrl(staticTipIcon.url) : '';
+        this.tipIconHeight = getContainerPropsValue(container, 'content.tipIconHeight', 50);
         if (this.fontSize === 20) this.titleFontSize = 28;
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
 
-        console.log("this.btnConfirmTextColor", this.btnConfirmTextColor);
+        console.log("this.staticTipIcon", this.staticTipIcon);
 
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
@@ -520,6 +532,8 @@
 
       &-content {
         padding: unit(8, rpx) unit(10, rpx);
+        display: flex;
+        align-items: center;
       }
     }
 

package/src/components/JfbBasePosterType/Attr.js

@@ -34,6 +34,33 @@ export default {
     if(params['textColor']) fontColor = params['textColor']
     if(params.titleStyle && params.titleStyle.color) fontColor = params.titleStyle.color;
 
+    //图片高度= 上下内边距 + 单个内容高度*行数 + 指示器高度
+    //图片宽度= 750 - 左右外边距
+    let outWidth = 750;
+    let marginLeft = params.margin.left || 0;
+    let marginRight = params.margin.right || 0;
+    let paddingLeft = params.contentPadding.left || 0;
+    let paddingRight = params.contentPadding.right || 0;
+    let paddingTop = params.contentPadding.top || 0;
+    let paddingBottom = params.contentPadding.bottom || 0;
+    let columnSpacing = params.columnSpacing || 0;
+    let columnSpacings = columnSpacing * (params.cells-1);
+    let textHeight = 40;
+    if(params.titleStyle && params.titleStyle.lineHeight) textHeight = parseInt(params.titleStyle.lineHeight);
+
+    let itemWidth = (outWidth - (marginLeft + marginRight + paddingLeft + paddingRight + columnSpacings))/ params.cells;
+    let itemHeight = textHeight + itemWidth;
+    let indicatorHeight = 0;
+
+    if(params.dot_type){
+      if(['indexes', 'nav'].includes(params['dot_type'])) indicatorHeight = 60;
+      else indicatorHeight = params.dot_type === 'normal'?0:48;
+    }
+    let bgImgHeight = params.jdRows * itemHeight + paddingTop + paddingBottom + indicatorHeight;
+    let bgImgWidth = 750 - (marginLeft + marginRight);
+    // console.log("itemHeight", bgImgHeight, bgImgWidth, params['dot_type'])
+
+
     return [
       {
         label: '导航配置:',
@@ -512,6 +539,23 @@ export default {
           showAlpha: true
         },
       },
+      {
+        label: "背景图片：",
+        ele: 'xd-upload',
+        valueKey: 'bgImage',
+        groupKey: 'style',
+        value: params.bgImage || null,
+        defaultValue: params.bgImage || null,
+        slot: true,
+        tipsformet: `上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：${bgImgWidth}*${bgImgHeight}像素`,
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        oneWidth: bgImgWidth/2,
+        oneHeight: bgImgHeight/2,
+        uploadType: 'aliyun',
+        size: 5, //5M
+        action: 'aliyun',
+      },
       {
         label: "圆角设置：",
         groupKey: 'style',

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -28,7 +28,7 @@
       </view>
       <view class="prodcut-content-btn" v-if="isBtn">
         <view :class="{onePrice: cell === 1}">
-          <!-- <view v-if="productConfig.isPrice === 'Y'">
+          <view v-if="productConfig.isPrice === 'Y'">
             <xd-unit
               :price="(item['promo_price'] || item['sale_price'])"
               :isOld="false"
@@ -46,13 +46,7 @@
               delete-line
               is-gray
             />
-          </view> -->
-          <CusPrice 
-            v-if="productConfig.isPrice === 'Y'" 
-            type="two"
-            :showPrice="item['showPrice']" 
-            :isVip="true">
-          </CusPrice>
+          </view>
         </view>
         <view>
           <view @click.stop="handleDetail()" v-if="productConfig.isAddCart === 'Y'">
@@ -74,15 +68,13 @@ import getServiceUrl from "@/common/getServiceUrl";
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
 import XdProductStatus from "@/components/XdProductStatus/XdProductStatus";
 import XdUnit from "@/components/XdUnit/XdUnit.vue";
-import CusPrice from "@/components/CusPrice/CusPrice";
 
 export default {
   name: "ContentProduct",
   components:{
     XdFontIcon,
     XdUnit,
-    XdProductStatus,
-    CusPrice
+    XdProductStatus
   },
   props:{
     keyword:{
@@ -258,10 +250,10 @@ export default {
         & > view:first-child {
           flex: 1;
           & > view:first-child {
+            height: 40rpx;
             display: flex;
-            flex-direction: column;
             justify-content: flex-start;
-            align-items: flex-start;
+            align-items: center;
             overflow: hidden;
           }
           & > view:nth-child(2) {

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -86,7 +86,7 @@
       CustomList,
       XdFontIcon,
       AllList,
-      XdSearchHistory,
+      XdSearchHistory
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins

package/src/components/JfbBaseCodeOpenVip/Api.js

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

package/src/components/JfbBaseCodeOpenVip/Attr.js

@@ -1,48 +0,0 @@
-'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/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

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

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVipLess.less

@@ -1,79 +0,0 @@
-/**
-* @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-code-open-vip {
-  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-code-open-vip {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
-}
-/**endNotPreview**/

package/src/components/JfbBaseCodeOpenVip/Mock.js

@@ -1,13 +0,0 @@
-'use strict';
-
-module.exports = {
-  
-  getCodeByIdFilmSquate:{},
-  
-  updateCodeFilmPaiqiDate:{},
-  
-  removeCodeFilmAddress:{},
-  
-  addCodeFilmcart:{},
-  
-}

package/src/components/JfbBaseConsumpCode/Api.js

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

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -1,48 +0,0 @@
-'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: [],
-};