jufubao-base 1.0.232-beta3 → 1.0.232-beta4

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
@@ -67,16 +65,11 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              {{ type === "recharge" ? "充值订单" : "延期订单" }}
+              {{ item.rechargeType === "recharge" ? "充值订单" : "延期订单" }}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
-              <view
-                >订单编号：
-                {{ item.order_id }}
-              </view>
-              <view :style="{ color: item.textColor }">
-                {{ item.pay_status_name }}
-              </view>
+              <view>订单编号： {{ item.order_id }}</view>
+              <view :style="{ color: item.textColor }">{{ item.pay_status_name }}</view>
             </view>
             <view class="jfb-base-recharge-order__body-order-bottom">
               <view>交易日期：{{ item.created_time }} </view>
@@ -158,13 +151,7 @@ export default {
       is_border_c: "",
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
-      type: "recharge",
+      margin: {top: 0, left: 0, right: 0, bottom: 0,},
     };
   },
   watch: {
@@ -175,11 +162,7 @@ export default {
   },
   computed: {
     outMargin() {
-      let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-      return str;
+      return this.getMarginAndPadding(this.margin, 20)
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -197,7 +180,6 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -205,12 +187,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0,left: 0,right: 0,bottom: 0});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
       this.backgroundColor = getContainerPropsValue(
         container,
@@ -260,8 +237,7 @@ export default {
       }).value;
     },
     getList() {
-      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
-      jfbRootExec(fnName, {
+      jfbRootExec('getRechargeOrderList', {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -282,6 +258,12 @@ export default {
             } else {
               item.textColor = "#FA5C5C";
             }
+
+            //订单设置
+            item['rechargeType'] = item.source;
+            if(['new-recharge','recharge'].includes(item.source)) {
+              item['rechargeType'] = 'recharge'
+            }
             return item;
           });
           this.hasNext = res.next_page_token !== "";
@@ -293,12 +275,12 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${this.type}`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
+        url: `${this.detailPath}?id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
 

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -14,7 +14,33 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-share__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view class="card_wrap">
+        <swiper class="card_swiper" next-margin="50rpx" previous-margin="50rpx">
+          <swiper-item class="swiper_item" v-for="i in 3" :key="i">
+            <view class="swiper_item-inner">
+              <view class="swiper_item-logo"></view>
+              <view class="swiper_item-title">邀请好友领福利</view>
+              <view class="swiper_item-qrcode"></view>
+              <view class="swiper_item-visit">邀请码<br/>LWNXK7H</view>
+            </view>
+            <!-- <image style="width: 600rpx;height: 900rpx;"
+              src="https://sandbox-img.jufubao.cn/uploads/20250410/34559f90dd5a01e7368c02bf33f1b484.png?ver=1744249748881&x-oss-process=style/size5"></image> -->
+          </swiper-item>
+        </swiper>
+      </view>
+
+      <view class="share_wrap">
+        <view class="share_btn">
+          <image src="https://sandbox-img.jufubao.cn/uploads/20250410/57bc093618bc51a85dc8bb68825d2b97.png?x-oss-process=style/size8" mode="widthFix"></image>
+        </view>
+        <view class="share_btn">
+          <image src="https://sandbox-img1.jufubao.cn/uploads/20250410/faeb136bfd684ab6fa4608208ad26294.png?x-oss-process=style/size8" mode="widthFix"></image>
+        </view>
+      </view>
+
+      <view class="visit_tip">
+        好友使用你的邀请码成功注册后<br/>Ta将成为你的邀请用户
+      </view>
     </view>
   </view>
 </template>
@@ -36,7 +62,7 @@
     ],
     data() {
       return {
-
+        hideMask: true,
         //todo
       }
     },
@@ -105,7 +131,87 @@
 
   .jfb-base-share {
     &__body{
+      padding: 60rpx 0;
+      box-sizing: border-box;
+      .card_wrap{
+        height: 960rpx;
+        box-sizing: border-box;
+        .card_swiper{
+          height: 100%;
+          width: 100%;
+          .swiper_item{
+            display: flex;
+            align-items: center;
+            justify-content: center;
 
+            &-inner{
+              width: 630rpx;
+              height: 960rpx;
+              background: url('https://sandbox-img.jufubao.cn/uploads/20250410/2d9f5ec31efb5cddece747d8b8da51f0.png?x-oss-process=style/size8') no-repeat;
+              background-size: auto 100%;
+              box-sizing: border-box;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              padding-top: 60rpx;
+              
+            }
+            &-logo{
+              height: 96rpx;
+              width: 96rpx;
+              background-color: #FFFFFF;
+            }
+            &-title{
+              margin-top: 24rpx;
+              color: #B35300;
+              font-size: 40rpx;
+              font-weight: 500;
+            }
+            &-qrcode{
+              width: 400rpx;
+              height: 400rpx;
+              background-color: #FFFFFF;
+              margin-top: 60rpx;
+              border-radius: 24rpx;
+            }
+            &-visit{
+              width: 400rpx;
+              height: 120rpx;
+              background: linear-gradient(180deg, #FEFEF5 0%, #FDFDCB 100%);
+              margin-top: 36rpx;
+              border-radius: 24rpx;
+              font-size: 32rpx;
+              font-weight: 500;
+              color: #965720;
+              text-align: center;
+              padding-top: 20rpx;
+              box-sizing: border-box;
+            }
+          }
+        }
+      }
+      .share_wrap{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .share_btn{
+          margin-top: 60rpx;
+          width: 300rpx;
+          image{
+            width: 100%;
+          }
+
+          & + .share_btn{
+            margin-left: 32rpx;
+          }
+        }
+      }
+      .visit_tip{
+        color: #965720;
+        font-size: 26rpx;
+        margin-top: 32rpx;
+        text-align: center;
+      }
     }
   }
 </style>

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -7,6 +7,9 @@ import CusAttr from "./CusAttr";
 export default {
   style: [],
   content: (data) => {
+    let entryGroupId = 'default';
+    if(data['entryGroupId']) entryGroupId = data['entryGroupId'];
+
     return [
       {
         label: '是否支持聚好兑:',
@@ -239,89 +242,12 @@ export default {
         groupKey: "style",
         type: "number",
       },
-      // {
-      //   label: "全部 - 列表单个样式配置",
-      //   ele: "title",
-      //   groupKey:'style',
-      //   size: "small",
-      // },
-      // {
-      //   label: "业务板块列表单个背景色",
-      //   ele: "xd-color",
-      //   valueKey: 'allModuleItemContBgColor',
-      //   value: data['allModuleItemContBgColor'] || '#FFFFFF',
-      //   groupKey:'style',
-      // },
-      // {
-      //   label: "业务板块列表单个间距",
-      //   ele: "el-input",
-      //   valueKey: "allModuleItemContMargin",
-      //   value: data.allModuleItemContMargin || 20,
-      //   groupKey:'style',
-      //   type: "number",
-      // },
-      // {
-      //   label: "业务板块列表单个边框",
-      //   ele: "xd-border",
-      //   valueKey: 'allModuleItemContBorder',
-      //   value: data['allModuleItemContBorder'] || null,
-      //   groupKey:'style',
-      // },
-      // {
-      //   label: "业务板块列表单个阴影",
-      //   ele: "xd-shadow",
-      //   groupKey:'style',
-      //   valueKey: 'allModuleItemContShadow',
-      //   value: data['allModuleItemContShadow'] || null,
-      //   handleCustom({action, data}) {
-      //     XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-      //       .then(res => {
-      //         data.cb(res.list)
-      //       })
-      //       .catch(error => {
-      //         console.error(error);
-      //         data.cb([])
-      //       });
-      //   },
-      // },
-      // {
-      //   label: "业务板块列表单个内边距",
-      //   ele: "xd-margin-padding",
-      //   valueKey: "allModuleItemContPadding",
-      //   value: data['allModuleItemContPadding'] || null,
-      //   groupKey:'style',
-      //   setting: {
-      //     type: 'padding',
-      //   },
-      //   placeholder: '请设置内边距',
-      //   inline: false,
-      //   notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      // },
-      // {
-      //   label: "业务板块列表单个圆角",
-      //   ele: 'xd-site-select-list',
-      //   valueKey: 'allModuleItemContRadius',
-      //   value: data.allModuleItemContRadius || 16,
-      //   groupKey:'style',
-      //   placeholder: '请选择内容圆角设置',
-      //   multiple: false,
-      //   className: 'input80',
-      //   handleCustom({ action, data }) {
-      //     XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
-      //       .then(res => {
-      //         data.cb(res.list)
-      //       })
-      //       .catch(error => {
-      //         console.error(error);
-      //       });
-      //   },
-      // },
 
       {
         label: '选择综合入口类型:',
         ele: 'xd-site-select-list',
         valueKey: 'entryGroupId',
-        value: data.entryGroupId || 'default',
+        value: entryGroupId,
         placeholder: '请选择综合入口类型',
         multiple: false,
         groupKey:'content',
@@ -349,12 +275,12 @@ export default {
         multiple: false,
         className: 'input80',
         setting: {
-          group_id: data.entryGroupId || 'default',
+          group_id: entryGroupId,
         },
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getSearchSettingOptions')({group_id: 'default', ...data.params})
+        handleCustom(resData) {
+          XdBus.getParentApi('getSearchSettingOptions')(resData.data.params)
             .then(res => {
-              data.cb(res.list)
+              resData.data.cb(res.list)
             })
             .catch(error => {
               console.error(error);

package/src/components/JfbBaseUserInfo/Attr.js

@@ -20,6 +20,34 @@ export default {
 
     return [
       {
+        label: '是否plus站点:',
+        ele: 'xd-radio',
+        valueKey: 'is_plus_site',
+        value: data['is_plus_site'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否plus',
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '否', value: 'N'},
+          {label: '是', value: 'Y'},
+        ]
+      },
+      data['is_plus_site']==='Y'&&{
+        label: '预览plus样式:',
+        ele: 'xd-radio',
+        valueKey: 'is_plus_preview',
+        value: data['is_plus_preview'] || 'Y',
+        groupKey:'content',
+        placeholder: '请选择预览plus样式',
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: 'plus用户样式', value: 'Y'},
+          {label: '普通用户样式', value: 'N'},
+        ]
+      },
+      data['is_plus']==='N'&&{
         label: '内容排版:',
         ele: 'xd-radio',
         valueKey: 'text_type',
@@ -33,7 +61,7 @@ export default {
           {label: '垂直', value: 'Y'},
         ]
       },
-      {
+      data['is_plus']==='N'&&{
         label: "头像右侧内容:",
         ele: "xd-radio-self",
         valueKey: "rightContent",
@@ -91,7 +119,7 @@ export default {
         inline: false,
         notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
@@ -101,7 +129,47 @@ export default {
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
-      {
+      data['is_plus_site']==='Y'&&{
+        label: 'plus用户上半部分背景颜色:',
+        ele: 'el-input',
+        valueKey: 'plusTopBackgroundColor',
+        groupKey:'style',
+        value: data.plusTopBackgroundColor || '',
+        labelInline:true,
+        placeholder: '请输入背景颜色',
+        classNmae: 'input80',
+      },
+      data['is_plus_site']==='Y'&&{
+        label: 'plus用户下半部分背景颜色:',
+        ele: 'el-input',
+        valueKey: 'plusBottomBackgroundColor',
+        groupKey:'style',
+        value: data.plusBottomBackgroundColor || '',
+        labelInline:true,
+        placeholder: '请输入背景颜色',
+        classNmae: 'input80',
+      },
+      data['is_plus_site']==='Y'&&{
+        label: '普通用户上半部分背景颜色:',
+        ele: 'el-input',
+        valueKey: 'normalTopBackgroundColor',
+        groupKey:'style',
+        value: data.normalTopBackgroundColor || '',
+        labelInline:true,
+        placeholder: '请输入背景颜色',
+        classNmae: 'input80',
+      },
+      data['is_plus_site']==='Y'&&{
+        label: '普通用户下半部分背景颜色:',
+        ele: 'el-input',
+        valueKey: 'normalBottomBackgroundColor',
+        groupKey:'style',
+        value: data.normalBottomBackgroundColor || '',
+        labelInline:true,
+        placeholder: '请输入背景颜色',
+        classNmae: 'input80',
+      },
+      data['is_plus_site']==='N'&&{
         label: '内容背景图片:', //label
         ele: 'xd-upload', //package 名称
         valueKey: 'bgImage', //form[valueKey]
@@ -125,7 +193,7 @@ export default {
         label: '圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: data['radius'] || '0',
+        value: data['radius'] || '20',
         labelInline:true,
         groupKey:'style',
         placeholder: '请选择圆角设置',
@@ -363,13 +431,13 @@ export default {
           {label: '显示', value: 'Y'},
         ]
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容配置",
         ele: "title",
         size: "small",
         groupKey: "style"
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容背景颜色:",
         ele: "xd-color",
         valueKey: "rightContentBgColor",
@@ -377,7 +445,7 @@ export default {
         placeholder: '请选择头像右侧内容背景颜色',
         groupKey: "style",
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容文字颜色",
         ele: "xd-text-and-bgc",
         groupKey:'style',
@@ -409,7 +477,7 @@ export default {
       //   placeholder: '请选择头像右侧内容文字颜色',
       //   groupKey: "style",
       // },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容内边距配置:",
         ele: 'xd-margin-padding',
         valueKey: 'rightContentPadding',
@@ -421,7 +489,7 @@ export default {
         inline: false,
         notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: "头像右侧内容圆角:",
         ele: 'xd-site-select-list',
         valueKey: 'rightContentRadius',
@@ -440,7 +508,7 @@ export default {
             });
         },
       },
-      {
+      data['is_plus_site']==='N'&&{
         label: '编辑地址路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'addressUrl',
@@ -452,6 +520,30 @@ export default {
         },
         inline: false,
       },
+      data['is_plus_site']==='Y'&&{
+        label: '开通vip路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'openVipPath',
+        groupKey:'advanced',
+        placeholder: '请选择编辑地址路径',
+        value: data['openVipPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      data['is_plus_site']==='Y'&&{
+        label: '立即查看路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'viewPath',
+        groupKey:'advanced',
+        placeholder: '请选择编辑地址路径',
+        value: data['viewPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       {
         label: '',
         ele: 'slot',