jufubao-base 1.0.237-beta2 → 1.0.237-beta5

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,7 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
+            <view class="column_label">{{text1}}<text class="label_sub">{{ text2 }}</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -112,8 +112,8 @@
           </view>
         </view>
         <view class="remain_header">
-          <view>选择以下补差方式</view>
-          <view class="flex align-center text-primary">
+          <view>{{ text3 }}</view>
+          <view v-if="showContinuePay==='Y'" class="flex align-center text-primary">
             <view class="margin-right">继续补差</view>
             <xd-unit
               :price="payInfo.channel_amount"
@@ -212,7 +212,11 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{}
+      options:{},
+      text1: "",
+      text2: "",
+      text3: "",
+      showContinuePay: "",
     };
   },
   watch: {
@@ -262,6 +266,10 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.text1 = getContainerPropsValue(container, 'content.text1', "");
+      this.text2 = getContainerPropsValue(container, 'content.text2', "");
+      this.text3 = getContainerPropsValue(container, 'content.text3', "");
+      this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,
         "content.pay_success_path",

package/src/components/JfbBasePay/Mock.js

@@ -24,15 +24,6 @@ module.exports = {
         "card_use_price": 10000,
         "use_card_point": "5000"
       },
-      {
-        "card_number": "101001000005195",
-        "card_type_name": "聚福宝福卡测试蛋糕",
-        "end_time": 1679034403,
-        "card_point": 5000,
-        "is_bind_card": true,
-        "card_use_price": 10000,
-        "use_card_point": "5000"
-      },
     ],
   },
   getBaseOrderStatus:{},

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -125,7 +125,7 @@
           vm: this,
           data: {
             nickname: this.info.nickname,
-            sex: this.info.sex.value,
+            sex: this.info.sex,
             birthday_date: this.info.birthday_date
           },
         }).then(res => {

package/src/components/JfbBasePoster/Attr.js

@@ -264,7 +264,7 @@ export default {
         size: 'small',
         groupKey:'content',
       },
-      showBg && params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+      showBg && params.poster && params.poster['type'] && {
         label: '广告背景图:',
         ele: 'xd-upload',
         valueKey: 'background',

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -112,7 +112,7 @@
             }"
           >
             <view
-              v-if="topIsCarousel === 1 && topList.lenght > 0"
+              v-if="topIsCarousel === 1 "
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',
@@ -190,7 +190,7 @@
             }"
           >
             <view
-              v-if="bottomIsCarousel === 1 &&  bottomList.lenght > 0"
+              v-if="bottomIsCarousel === 1 "
               :style="{
                 width: bigWidth + 'rpx',
                 height: smallHeight + 'rpx',

package/src/components/JfbBasePosterGroup/Api.js

@@ -6,51 +6,15 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Poster
-    mapFnName: 'getPosterByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getListPosterGroupContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/ad-content',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Poster
-    mapFnName: 'updatePosterFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Poster
-    mapFnName: 'removePosterFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Poster
-    mapFnName: 'addPosterFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBasePosterGroup/Attr.js

@@ -8,41 +8,139 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyMargin',
+        groupKey: 'style',
+        value: data['bodyMargin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
       },
       {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        label: '外填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyPadding',
+        groupKey: 'style',
+        value: data['bodyPadding'] || null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          type: 'padding',
         },
+        placeholder: '请设置外填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '20',
+        labelInline: true,
+        groupKey: 'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
         className: 'input60',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '背景图:',
+        ele: 'xd-upload',
+        valueKey: 'backgroundImage',
+        groupKey: 'content',
+        value: data.backgroundImage || {},
+        defaultValue: data.backgroundImage || null,
+        slot: true,
+        oneWidth: 375,
+        oneHeight: 290,
+        elinputClassName: 'input40',
+        tipsformet: `上传文件格式：@imageType@，不超过@size@MB，尺寸：375*290像素`,
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
+      },
+      {
+        label: "主标题:",
+        ele: "xd-tinymce",
+        valueKey: "title",
+        value: data.title || '',
+        groupKey: 'content',
+        imageConfig: {
+          sort: true,
+          maxlen: 100,
+          action: "action",
+          size: 5,
+          tipsformet: "上传文件格式：@imageType@，不超过@size@MB.",
+          uploadType: "aliyun",
+          type: ["jpg", "png", "jpeg"],
+        },
       },
       {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: "副标题:",
+        ele: "el-input",
+        valueKey: "subtitle",
+        groupKey: 'content',
+        value: data.subtitle || '',
+      },
+      {
+        label: '是否展示更多:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_more',
+        value: data['is_show_more'] || 'Y',
+        groupKey: 'content',
+        placeholder: '请选择是否展示更多',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ]
+      },
+      data['is_show_more'] === 'Y' && {
+        label: '更多跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'morePath',
+        groupKey: 'advanced',
+        placeholder: '请选择更多跳转路径',
+        value: data['morePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '广告组:',
+        ele: 'xd-site-poster-group',
+        valueKey: 'posterGroup',
+        groupKey: 'content',
+        value: data.posterGroup || {},
+        isKey: true,
+        key: new Date().getTime(),
+        setting: {
+          scene: { label: '广告', value: 'normal' },
+        },
+        rules: [
+          { required: true, message: '请选择广告位', trigger: 'change' },
+        ],
       },
-    ].filter(i=>i)
+    ].filter(i => i)
   },
   advanced: [],
 };

package/src/components/JfbBasePosterGroup/JfbBasePosterGroup.vue

@@ -1,43 +1,73 @@
 <template>
-  <view
-    class="jfb-base-poster-group"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-poster-group" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-poster-group__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-poster-group__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-poster-group__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-poster-group__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view class="jfb-base-poster-group__body" :style="[bodyStyleComp]">
+      <view class="jfb-base-poster-group__body-header">
+        <view class="jfb-base-poster-group__body-header-title">
+          <XdContentXss v-html="title"></XdContentXss>
+          <view @click="handleToMore" v-if="is_show_more==='Y'" class="jfb-base-poster-group__body-header-title-more">
+            更多
+            <XdFontIcon size="20" icon="iconxiangyou_xian"></XdFontIcon>
+          </view>
+        </view>
+        <view class="jfb-base-poster-group__body-header-subtitle">
+          {{subtitle}}
+        </view>
+      </view>
+      <view class="jfb-base-poster-group__body-content">
+        <view class="jfb-base-poster-group__body-content-tabs">
+          <view @click="handleChangeTab(item)" :style="tab===item.random?[activeStyleComp]:[normalStyleComp]"
+            class="jfb-base-poster-group__body-content-tabs-item" v-for="(item, index) in posterGroup.group"
+            :key="index">
+            {{item.title}}
+          </view>
+        </view>
+        <view v-if="imageGroup&&imageGroup.length>0" class="jfb-base-poster-group__body-content-images">
+          <image :style="{width: imageWidth,height:imageWidth}" @click="handleClick(item)"
+            v-for="(item,index) in imageGroup" :key="index" :src="item.image_url">
+          </image>
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdContentXss from '@/components/XdContentXss/XdContentXss';
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePosterGroupMixin from "./JfbBasePosterGroupMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import getServiceUrl from "@/common/getServiceUrl";
   import componentsMixins from "@/mixins/componentsMixins";
+  import posterMixins from "@/mixins/posterMixins";
   import extsMixins from "@/mixins/extsMixins";
   export default {
     name: "JfbBasePosterGroup",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdContentXss
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBasePosterGroupMixin
+      componentsMixins, extsMixins, JfbBasePosterGroupMixin, posterMixins
     ],
     data() {
       return {
-
-        //todo
+        posterGroup: {},
+        morePath: '',
+        is_show_more: 'Y',
+        backgroundImage: '',
+        title: '',
+        subtitle: '',
+        imageGroup: [],
+        tab: '',
+        radius: 0,
+        margin: {},
+        padding: {},
       }
     },
     watch: {
@@ -46,33 +76,100 @@
         if (this.$configProject['isPreview']) this.init(value)
       },
     },
+    computed: {
+      bodyStyleComp() {
+        return {
+          backgroundImage: `url(${this.backgroundImage})`,
+          backgroundSize: '100% 100%',
+          backgroundPosition: 'center',
+          backgroundRepeat: 'no-repeat',
+          borderRadius: `${this.radius}rpx`,
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding: this.getMarginAndPadding(this.padding, 20),
+        }
+      },
+      activeStyleComp() {
+        return {
+          color: '#6D4604',
+          background: '#FDDC83',
+          border: '1px solid #FDDC83',
+          borderRadius: '40rpx'
+        }
+      },
+      normalStyleComp() {
+        return {
+          color: '#F5DC9E',
+          border: '1px solid #F5DC9E',
+          borderRadius: '40rpx'
+        }
+      },
+      imageWidth() {
+        let width = 750
+        let paddingLeft = this.checkValue(this.padding.left,20)
+        let paddingRight = this.checkValue(this.padding.right,20)
+        let marginLeft = this.checkValue(this.margin.left,20)
+        let marginRight = this.checkValue(this.margin.right,20)
+        width = width - paddingLeft - paddingRight - marginLeft - marginRight
+        width = width - 60 //减去右边距 
+        return `${width / 4}rpx`
+      }
+    },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.getPosterGroup(this.posterGroup.group[0])
+      },
+      getPosterGroup(item) {
+        this.tab = item.random;
+        this.imageGroup = [];
+        jfbRootExec('getListPosterGroupContent', {
+          vm: this,
+          data: {
+            page_id: this.pageAttr["page_id"], //页面ID
+            container_id: this.containerId + item.random, //组件ID
+            page_size: 200
+          }
+        }).then(res => {
+          this.imageGroup = res.list.map(item => {
+            return {
+              ...item,
+              image_url: getServiceUrl(item.image_url)
+            }
+          })
+        }).catch()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.posterGroup = getContainerPropsValue(container, 'content.posterGroup', {});
+        this.morePath = getContainerPropsValue(container, 'content.morePath', { value: "" }).value;
+        this.is_show_more = getContainerPropsValue(container, 'content.is_show_more', 'Y');
+        this.backgroundImage = getServiceUrl(getContainerPropsValue(container, 'content.backgroundImage', { url: "" }).url);
+        this.title = getContainerPropsValue(container, 'content.title', '<p style="font-weight:bold;font-size:16px"><span style="color: #FFF">全球大牌，会员低至</span><span style="color: #F2D894">8折</span></p>');
+        this.subtitle = getContainerPropsValue(container, 'content.subtitle', '超300+品牌商品');
+        this.radius = getContainerPropsValue(container, 'content.radius', 20);
+        this.margin = getContainerPropsValue(container, 'content.bodyMargin', {});
+        this.padding = getContainerPropsValue(container, 'content.bodyPadding', {});
+      },
+      checkValue(value, dValue = 0) {
+        if (value === undefined || value === '' || value === null) return dValue;
+        return Number(value || 0);
+      },
+      handleClick(item) {
+        if (this.isPreview) return;
+        this.handlePosterClick(item)
+      },
+      handleToMore() {
+        this.$xdUniHelper.navigateTo({
+          url: this.morePath,
+        });
+      },
+      handleChangeTab(item) {
+        this.getPosterGroup(item)
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +201,66 @@
   @import "./JfbBasePosterGroupLess.less";
 
   .jfb-base-poster-group {
-    &__body{
+    &__body {
+      padding: 24rpx;
+      margin: 20rpx;
+      border-radius: 30rpx;
+
+      &-header {
+        &-title {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: 10rpx;
+
+          &-more {
+            display: flex;
+            align-items: center;
+            color: #FFFFFF;
+            font-size: 24rpx;
+          }
+        }
 
+        &-subtitle {
+          color: #FFFFFF;
+          font-size: 24rpx;
+        }
+      }
+
+      &-content {
+        &-tabs {
+          display: flex;
+          flex-wrap: wrap;
+
+          &-item {
+            margin-top: 20rpx;
+            margin-right: 20rpx;
+            padding: 11rpx 25rpx;
+            font-size: 25rpx;
+          }
+        }
+
+        &-images {
+          display: flex;
+          flex-wrap: wrap;
+          align-content: flex-start;
+
+          &>image {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20rpx;
+            margin-right: 20rpx;
+            width: 145rpx;
+            height: 145rpx;
+            border-radius: 14rpx;
+          }
+
+          &>image:nth-child(4n) {
+            margin-right: 0;
+          }
+        }
+      }
     }
   }
-</style>
+</style>

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -29,8 +29,8 @@
           </swiper-item>
         </swiper>
       </view>
-      <!-- #ifdef MP-WEIXIN -->
-      <view class="share_wrap">
+      
+      <view v-if="showShare" class="share_wrap">
         <view class="share_btn" @click="toSendWx">
           <image src="https://sandbox-img.jufubao.cn/uploads/20250410/57bc093618bc51a85dc8bb68825d2b97.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
@@ -38,7 +38,6 @@
           <image src="https://sandbox-img1.jufubao.cn/uploads/20250410/faeb136bfd684ab6fa4608208ad26294.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
       </view>
-      <!-- #endif -->
 
       <view class="visit_tip">
         好友使用你的邀请码成功注册后<br/>Ta将成为你的邀请用户
@@ -69,11 +68,21 @@
         closeMask: true,
         shareIndex: 0,
         shareList: [],
+        isPreview: false,
         //todo
       }
     },
     computed: {
       ...mapState(["shareInfo"]),
+      showShare(){
+        if(this.isPreview) return true;
+        // #ifdef MP-WEIXIN
+        return true;
+        // #endif
+        // #ifdef H5
+        return false;
+        // #endif
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -83,7 +92,7 @@
     },
     created() {
       this.init(this.container);
-
+      this.isPreview = this.$configProject['isPreview'];
       //todo
     },
     methods: {
@@ -106,7 +115,9 @@
           }
         }).then(res => {
           this.shareList = res.list.map(item => {
-            item.share_image_url = getServiceUrl(item.share_image_url);
+            let urlSearch = item.share_image_url.split('?')[1];
+            let newImgUrl = getServiceUrl(item.share_image_url);
+            item.share_image_url = newImgUrl.split('?')[0] + '?' + urlSearch;
             return item;
           });
         })

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -32,6 +32,7 @@
             v-if="productConfig.isPrice === 'Y'" 
             type="two"
             :showPrice="item['show_prices']" 
+            :isShowIcon="productConfig.isShowIcon"
             :isPlus="productConfig.is_plus_site">
           </CusPrice>
         </view>