开发联调

salesperson/pages/history/index.wxml

@@ -1,3 +1,5 @@
+<wxs src="../../../utils/filter.wxs" module="filters" />
+
 <view class="container">
     <view class="message">被邀请用户为首次登录的用户</view>
     <view class="total">
@@ -16,13 +18,13 @@
         </view>
     </view>
     <scroll-view class="historyList" scroll-y="true" enhanced show-scrollbar="{{false}}" scroll-top="{{scrollTop}}"
-        bindscrolltolower='loadMore'  wx:if="{{!nullList}}">
+        bindscrolltolower='loadMore' wx:if="{{!nullList}}">
         <view class="user" wx:for="{{list}}" wx:key='index'>
-            <image src="https://reader-wx.ai160.com/reader/resource/20230215/1676472360368723.jpg" class="avatar" />
+            <image src="{{item.avatar}}" class="avatar" />
             <view class="info">
-                <view class="nickName">刘聪{{index}}</view>
+                <view class="nickName">{{item.nickName||item.eid}}</view>
                 <view class="addTime">
-                    加入时间 ：20230-08-27 14:00
+                    加入时间 ：{{filters.formatDate(item.gmtCreated,1)}}
                 </view>
             </view>
         </view>

salesperson/pages/lxDetail/index.js

@@ -22,24 +22,40 @@ Page({
             title: '半年'
         }],
         allIncome: {},
-        orderList: []
+        orderList: [],
+        orderListKey: []
     },
     async onShow() {
         let allIncome = await getSaleData()
-        let data = await getIncomeList({pageSize:1000,type:this.data.currentIndex})
-        console.log(allIncome,data);
+        this.getData()
         this.setData({
             allIncome,
-            orderList:data.list
         })
     },
-
+    async getData() {
+        let data = await getIncomeList({
+            pageSize: 1000,
+            type: this.data.currentIndex
+        })
+        let detailedList = {}
+        data.list.forEach(item => {
+            if (detailedList.hasOwnProperty(item.dateStr)) {
+                detailedList.item.dateStr.push(item)
+            } else {
+                detailedList[item.dateStr] = [item]
+            }
+        })
+        this.setData({
+            orderList: detailedList,
+            orderListKey: Object.keys(detailedList)
+        })
+    },
     setClass({
         currentTarget
     }) {
         this.setData({
             currentIndex: currentTarget.dataset.index,
         });
-        // this.resetData();
+        this.getData()
     },
 })

salesperson/pages/lxDetail/index.wxml

@@ -40,75 +40,23 @@
             </view>
         </view>
         <view class="detailsList">
-            <view class="group">
+            <view class="group" wx:for="{{orderListKey}}" wx:key="index">
                 <view class="header">
                     <view>
-                        2023-09
+                        {{item}}
                     </view>
                     <view>
                         结余（元）
                     </view>
                 </view>
                 <view class="body">
-                    <view class="row">
-                        <view class="col">02日</view>
+                    <view class="row" wx:for="{{orderList[item]}}" wx:key="id" wx:for-item="row">
+                        <view class="col">{{row.dateStr}}日</view>
                         <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
+                            <view class="num {{row.type=='1'?'add':'reduce'}}"> {{row.type=='1'?'+':'-'}}{{filters.twoDecimal(row.amount)}}</view>
+                            {{row.title}}
                         </view>
-                        <view class="col">1200.00</view>
-                    </view>
-                    <view class="row">
-                        <view class="col">02日</view>
-                        <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
-                        </view>
-                        <view class="col">1200.00</view>
-                    </view>
-                    <view class="row">
-                        <view class="col">02日</view>
-                        <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
-                        </view>
-                        <view class="col">1200.00</view>
-                    </view>
-                </view>
-            </view>
-            <view class="group">
-                <view class="header">
-                    <view>
-                        2023-09
-                    </view>
-                    <view>
-                        结余（元）
-                    </view>
-                </view>
-                <view class="body">
-                    <view class="row">
-                        <view class="col">02日</view>
-                        <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
-                        </view>
-                        <view class="col">1200.00</view>
-                    </view>
-                    <view class="row">
-                        <view class="col">02日</view>
-                        <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
-                        </view>
-                        <view class="col">1200.00</view>
-                    </view>
-                    <view class="row">
-                        <view class="col">02日</view>
-                        <view class="col">
-                            <view class="num reduce">-100.00</view>
-                            提现
-                        </view>
-                        <view class="col">1200.00</view>
+                        <view class="col">{{filters.twoDecimal(row.balance)}}</view>
                     </view>
                 </view>
             </view>

salesperson/pages/management/index.wxml

@@ -1,3 +1,5 @@
+<wxs src="../../../utils/filter.wxs" module="filters" />
+
 <view class="container">
     <view class="categoryBox">
         <view class="category {{currentIndex==item.id?'currentClass':''}}" wx:for="{{categoryList}}" wx:key="id"
@@ -16,7 +18,7 @@
                     <view>
                         <view class="nickName">{{item.name}}</view>
                         <view class="addTime">
-                            加入时间 ：{{item.joinTime}}
+                            加入时间 ：{{filters.formatDate(item.joinTime,1)}}
                         </view>
                     </view>
                 </view>

utils/filter.wxs

@@ -53,6 +53,7 @@ function gradeFilter(grade) {
 }
 // 数字满万补w
 function numFilter(num) {
+    console.log(num,'zzz');
     if (!num) {
         return 0
     }