jufubao-base 1.0.232-beta3 → 1.0.232-beta5

package/src/components/JfbBasePointsDetail/JfbBasePointsDetail.vue

@@ -1,26 +1,47 @@
 <template>
-  <view
-    class="jfb-base-points-detail"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-points-detail" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-points-detail__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-points-detail__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-points-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-points-detail__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view :style="[bodyStyleComp]" class="jfb-base-points-detail__body-points">
+        <view>
+          可用积分
+          <XdFontIcon @click="showDialog=true" style="margin-left: 10rpx" size="20" icon="iconmingchengtubiao"></XdFontIcon>
+        </view>
+        <view>128.80</view>
+      </view>
+      <view :style="[bodyStyleComp]" class="jfb-base-points-detail__body-list">
+        <view class="jfb-base-points-detail__body-list-item">
+          <view class="jfb-base-points-detail__body-list-item-info">
+            <view class="jfb-base-points-detail__body-list-item-info-label">积分兑换余额</view>
+            <view :class="income?'income':'expenses'" class="jfb-base-points-detail__body-list-item-info-value">- 12:00
+            </view>
+          </view>
+          <view class="jfb-base-points-detail__body-list-item-date">2025-04-10 16:23</view>
+        </view>
+        <view class="jfb-base-points-detail__body-list-item">
+          <view class="jfb-base-points-detail__body-list-item-info">
+            <view class="jfb-base-points-detail__body-list-item-info-label">积分兑换余额</view>
+            <view :class="income?'income':'expenses'" class="jfb-base-points-detail__body-list-item-info-value">- 12:00
+            </view>
+          </view>
+          <view class="jfb-base-points-detail__body-list-item-date">2025-04-10 16:23</view>
+        </view>
+      </view>
+      <XdDailog :cancel="false" @onBtn="showDialog=false" confirmText="我知道了" title="积分说明" :show.sync="showDialog">
+        <xd-content-xss v-html="notice"></xd-content-xss>
+      </XdDailog>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdDailog from '@/components/XdDailog/XdDailog.vue'
+  import XdContentXss from '@/components/XdContentXss/XdContentXss'
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePointsDetailMixin from "./JfbBasePointsDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,17 +50,36 @@
   export default {
     name: "JfbBasePointsDetail",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdDailog,
+      XdContentXss
     },
     mixins: [
       componentsMixins, extsMixins, JfbBasePointsDetailMixin
     ],
     data() {
       return {
-
-        //todo
+        income: false,
+        radius: 0,
+        margin: {},
+        padding: {},
+        bgColor: '',
+        bodyBorder: {},
+        notice: '',
+        showDialog: false
       }
     },
+    computed: {
+      bodyStyleComp() {
+        return {
+          borderRadius: `${this.radius}rpx`,
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding: this.getMarginAndPadding(this.padding, 40),
+          background: this.bgColor,
+          border: this.bodyBorder,
+        }
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -53,26 +93,41 @@
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.getContent()
+      },
+      getContent() {
+        jfbRootExec("getListBaseNewsContent", {
+          vm: this,
+          data: {
+            page_id: this.pageAttr["page_id"], //页面ID
+            container_id: this.containerId, //组件ID
+            limit: 1,
+          },
+        })
+          .then((res) => {
+            if (res.list.length > 0) {
+              if (res.list && res.list.length > 0) {
+                this.notice = this.$xdUniHelper.filterHtml(res.list[0].content);
+              }
+              this.noticeStatus = true;
+            }
+          })
+          .catch((error) => {
+            console.error(error);
+          });
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.radius = getContainerPropsValue(container, 'content.radius', '20');
+        this.margin = getContainerPropsValue(container, 'content.bodyMargin', {});
+        this.padding = getContainerPropsValue(container, 'content.bodyPadding', {});
+        this.bgColor = getContainerPropsValue(container, 'content.bgColor', '#fff');
+        this.bodyBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.bodyBorder', {}))
+        console.log(getContainerPropsValue(container, 'content.bodyBorder', {}), 'this.bgColor');
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +159,63 @@
   @import "./JfbBasePointsDetailLess.less";
 
   .jfb-base-points-detail {
-    &__body{
+    &__body {
+      &-points {
+        background: #fff;
+
+        &>view:first-child {
+          display: flex;
+          align-items: center;
+          color: #333;
+          font-size: 24rpx;
+        }
 
+        &>view:nth-child(2) {
+          color: #333;
+          font-size: 64rpx;
+          font-weight: 500;
+        }
+      }
+
+      &-list {
+        &-item {
+          margin-bottom: 40rpx;
+
+          &-info {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            &-label {
+              color: #333333;
+              font-size: 28rpx;
+            }
+
+            &-value {
+              font-size: 32rpx;
+              font-weight: 700;
+            }
+
+            .income {
+              color: #FF5A39;
+            }
+
+            .expenses {
+              color: #00C800;
+            }
+          }
+
+          &-date {
+            color: #999999;
+            font-size: 22rpx;
+            margin-top: 26rpx;
+          }
+        }
+
+        &-item:last-child {
+          margin-bottom: 0;
+        }
+      }
     }
   }
-</style>
+</style>

package/src/components/JfbBaseRechargeOrder/Api.js

@@ -17,19 +17,9 @@ module.exports = [
     path: '/card/v1/card-recharge/list-order',
     isRule: false,
     params: {
-      page_size: ['page_size', 'Number', true],
-      page_token: ['page_token', 'Number', true]
-    },
-    isConsole: true,
-    disabled: true,
-  }, {
-    mapFnName: 'getDelayOrderList',
-    title: '获取卡延期订单列表',
-    path: '/card/v1/card-delay/list-order',
-    isRule: false,
-    params: {
-      page_size: ['page_size', 'Number', true],
-      page_token: ['page_token', 'Number', true]
+      page_size: ['每页显示记录数量', 'Number', '必选'],
+      page_token: ['页码', 'Number', '必选'],
+      source: ['来源', 'String', '必选', 'all'],
     },
     isConsole: true,
     disabled: true,

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 {
-
+        closeMask: 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);