jufubao-base 1.0.232-beta3 → 1.0.232-beta4

package/src/components/JfbBasePointsDetail/Api.js

@@ -6,51 +6,16 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'getPointsByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getListBaseNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'updatePointsFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'removePointsFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'addPointsFilmcart',
-    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', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBasePointsDetail/Attr.js

@@ -8,41 +8,297 @@ 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-border",
+        valueKey: "bodyBorder",
+        value: data['bodyBorder'] || { type: 'Y', value: { color: '#eee', style: "solid", width: '1' } },
+        className: 'input80',
+        groupKey: 'style',
       },
       {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        groupKey: 'style',
+        value: data['bgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        label: '公告内容:',
+        ele: 'xd-site-news',
+        valueKey: 'notice',
+        groupKey: 'content',
+        value: data.notice || null,
+        className: 'input70',
+        setting: {
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
+        },
+        handleCustom({ action, data }) {
+          if (data && data.params) {
+            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
+            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
+          }
+
+          //获取返回参数(场景类型名称为必填)
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close() { } }
+
+          //获取显示内容
+          if (action === 'screen') {
+            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
+              .then(res => {
+                loading.close();
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+              });
+
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getNewsInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                loading.close()
+                data.cb({ list: res.list, selectId: res.selected })
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+
+          //获取产品业务线列表
+          if (action === 'namespace') {
+            XdBus.getParentApi('getOptionsNamespaces')({})
+              .then(res => {
+                loading.close()
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                console.log('cmsPublishEditxContent', res)
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置列表
+          if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getListNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('addNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('updateNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('deleteNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getListNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('addNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('updateNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('deleteNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //内容发布
+          if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //通知页面进行刷新
+          if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
       },
-    ].filter(i=>i)
+    ].filter(i => i)
   },
   advanced: [],
 };

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,