jufubao-base 1.0.232-beta4 → 1.0.232-beta6

package/src/components/JfbBasePointsDetail/JfbBasePointsDetail.vue

@@ -9,28 +9,24 @@
       <view :style="[bodyStyleComp]" class="jfb-base-points-detail__body-points">
         <view>
           可用积分
-          <XdFontIcon @click="showDialog=true" style="margin-left: 10rpx" size="20" icon="iconmingchengtubiao"></XdFontIcon>
+          <XdFontIcon @click="showDialog=true" style="margin-left: 10rpx" size="20" icon="iconmingchengtubiao">
+          </XdFontIcon>
         </view>
-        <view>128.80</view>
+        <view>{{getAmout(amount)}}</view>
       </view>
-      <view :style="[bodyStyleComp]" class="jfb-base-points-detail__body-list">
-        <view class="jfb-base-points-detail__body-list-item">
+      <view v-if="recordList&&recordList.ength>0" :style="[bodyStyleComp]" class="jfb-base-points-detail__body-list">
+        <view v-for="(item,index) in recordList" :key="index" 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 class="jfb-base-points-detail__body-list-item-info-label">{{item.trade_type_name}}</view>
+            <view :class="item.operate_type==='A'?'income':'expenses'"
+              class="jfb-base-points-detail__body-list-item-info-value"><text>{{item.operate_type==='A'?'+':'-'}}</text>
+              {{getAmout(item.amount)}}
             </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 class="jfb-base-points-detail__body-list-item-date">{{item.created_time}}</view>
         </view>
       </view>
+      <XdNoData v-else></XdNoData>
       <XdDailog :cancel="false" @onBtn="showDialog=false" confirmText="我知道了" title="积分说明" :show.sync="showDialog">
         <xd-content-xss v-html="notice"></xd-content-xss>
       </XdDailog>
@@ -40,8 +36,9 @@
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import XdDailog from '@/components/XdDailog/XdDailog.vue'
-  import XdContentXss from '@/components/XdContentXss/XdContentXss'
+  import XdDailog from '@/components/XdDailog/XdDailog.vue';
+  import XdNoData from "@/components/XdNoData/XdNoData";
+  import XdContentXss from '@/components/XdContentXss/XdContentXss';
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePointsDetailMixin from "./JfbBasePointsDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -52,7 +49,8 @@
     components: {
       XdFontIcon,
       XdDailog,
-      XdContentXss
+      XdContentXss,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbBasePointsDetailMixin
@@ -66,7 +64,10 @@
         bgColor: '',
         bodyBorder: {},
         notice: '',
-        showDialog: false
+        showDialog: false,
+        method: '',
+        amount: 0,
+        recordList: []
       }
     },
     computed: {
@@ -93,8 +94,14 @@
     },
     methods: {
       onJfbLoad(options) {
+        console.log(this.getTokenForKey('csrf_user_id'), 'user_leveluser_level');
+        this.method = options.method
+        this.getPointsDetail()
         this.getContent()
       },
+      getAmout(amount) {
+        return this.$xdUniHelper.divisionFloatNumber(amount, 100)
+      },
       getContent() {
         jfbRootExec("getListBaseNewsContent", {
           vm: this,
@@ -116,6 +123,40 @@
             console.error(error);
           });
       },
+      getPointsDetail() {
+        jfbRootExec("getPointsWalletDetail", {
+          vm: this,
+          data: {
+            method: this.method
+          },
+        }).then(res => {
+          this.amount = res.wallet_list[0].amount
+          this.wallet_type = res.wallet_list[0].wallet_type
+          this.getPointsRecord()
+        })
+      },
+      getPointsRecord() {
+        jfbRootExec("getPointsWalletTradeList", {
+          vm: this,
+          data: {
+            wallet_type: this.wallet_type,
+            page_size: 10,
+          },
+        }).then(res => {
+          let list = res.list.map(item => {
+            item["created_time"] = this.$xdUniHelper.getDate(
+              item["created_time"] * 1000
+            ).fullTime;
+            return item;
+          })
+          this.hasNext = res.next_page_token !== "";
+          if (this.page_token === 1) {
+            this.recordList = list
+          } else {
+            this.recordList = this.recordList.concat(list);
+          }
+        })
+      },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -133,7 +174,10 @@
         console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
+        if (this.hasNext) {
+          this.page_token = this.next_page_token;
+          this.getPointsRecord()
+        }
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
@@ -174,6 +218,7 @@
           color: #333;
           font-size: 64rpx;
           font-weight: 500;
+          margin-top: 20rpx;
         }
       }
 

package/src/components/JfbBasePointsDetail/Mock.js

@@ -2,12 +2,6 @@
 
 module.exports = {
   
-  getPointsByIdFilmSquate:{},
-  
-  updatePointsFilmPaiqiDate:{},
-  
-  removePointsFilmAddress:{},
-  
-  addPointsFilmcart:{},
-  
+  getPointsWalletDetail:{"wallet_list":[{"sort":1,"wallet_type":"US","show_name":"可用积分","amount":10000,"is_support_withdraw":"N"}],"request_id":"43fa9f773f0c3014"},
+  getPointsWalletTradeList: {"next_page_token":"","total_size":0,"list":[{"trade_nnid":"zd0rYpZgWXE9Yf8e1mtH3","order_id":"111112-2025041517-03-54","amount":10000,"trade_type":"activity_a","trade_type_name":"活动收入","operate_type":"A","operate_type_name":"收入","trade_name":"","comment":"","created_time":1744707836}],"request_id":"eec94260e6f9de53"}
 }

package/src/components/JfbBaseSavingDetail/Api.js

@@ -6,51 +6,34 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Saving
-    mapFnName: 'getSavingByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getMonthSavingDetail',
+    title: '省钱明细-月度',
+    path: '/member/v1/money-saving-record/month',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      year: ['年', 'Number', true],
+      month: ['月', 'Number', true],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Saving
-    mapFnName: 'updateSavingFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getTotalSavingDetail',
+    title: '省钱明细-累计',
+    path: '/member/v1/money-saving-record/total',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Saving
-    mapFnName: 'removeSavingFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getYearSavingDetail',
+    title: '省钱明细-年度',
+    path: '/member/v1/money-saving-record/year',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Saving
-    mapFnName: 'addSavingFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      year: ['年', 'Number', true],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseSavingDetail/Attr.js

@@ -7,40 +7,62 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        ele: 'title',
+        label: '切换标签设置',
+        size: 'small',
+        groupKey: 'style',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
+        valueKey: 'titleBgc',
+        groupKey: 'style',
+        value: data['titleBgc'] || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
       },
       {
-        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: 'tabPadding',
+        groupKey: 'style',
+        value: data['tabPadding'] || null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          type: 'padding',
         },
+        placeholder: '请设置外填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">上下20，左右0</span>像素',
       },
-      data.bgColor && {
-        label: '高度:',
+      {
+        label: '切换标签与内容之间间距:',
         ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
+        type: 'text',
+        groupKey: 'style',
+        valueKey: 'titlePadding',
+        value: data['titlePadding'] || '',
         className: 'input60',
+        inline: false,
+        notice:'设置切换标签与内容之间间距，默认值:<span style="color:red">0</span>像素'
       },
       {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '未选中文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'titleColor',
+        value: data['titleColor'] || '',
+        groupKey: 'style',
+        placeholder: '请选择未选中文字颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '选中文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'titleActColor',
+        value: data['titleActColor'] || '',
+        groupKey: 'style',
+        placeholder: '请选择选中文字颜色',
+        classNmae: 'input80',
       },
     ].filter(i=>i)
   },