日期

pages/index/index.js

@@ -98,24 +98,46 @@ Page({
   },
   getWeekAvg:function(){
     $api.getMark().then(res=>{
-      var days=res.data.data,weeks={}
+      var days=res.data.data.reverse(),weeks=[]
+      var pre=0
+      console.log(days)
         days.forEach(item=>{
           item.week=getYearWeek(item.stock_date)
+          if(item.week < pre){
+            if(item.week == 1){
+              item.week=pre
+            }
+          }else{
+            pre=item.week
+          }
           item.date=(new Date(item.stock_date).getMonth()+1)+'/'+(new Date(item.stock_date).getDate())
-          weeks[item.week]=[]
         })
-        days.forEach(item=>{
-          weeks[item.week].push(item)
+        days=days.reverse()
+        
+        // days.forEach((item,i)=>{
+         
+        // })
+        const result = days.reduce((acc, curr) => {
+          let weekGroup = acc.find(item => item.name === curr.week);
+          if (!weekGroup) {
+            weekGroup = { name: curr.week, data: [] };
+            acc.push(weekGroup);
+          }
+          weekGroup.data.push({ avg_score: curr.avg_score,date:curr.date});
+          return acc;
+        }, []);
+        result.forEach(item=>{
+          item.data=item.data.reverse()
         })
-        var scoredays=[]
-        for (let key in weeks) {
-          scoredays.push({
-            name:key,
-            data:weeks[key].reverse()
-          })
-        }
+        // var scoredays=[]
+        // for (let key in weeks) {
+        //   scoredays.push({
+        //     name:key,
+        //     data:weeks[key].reverse()
+        //   })
+        // }
         this.setData({
-          scoredays:scoredays.reverse()
+          scoredays:result
         })
     })
     

pages/index/index.wxml

@@ -131,7 +131,7 @@
   <view class="article-title" > 今日市场打分</view>
   <view wx:if='{{scoredays.length>0}}' class=" ">
       <view wx:for='{{scoredays}}' wx:if='{{item.data.length>0}}' class="yk">
-        <view class="week_name">{{item.name}}周</view>
+        <view class="week_name">第{{item.name}}周</view>
         <view class="week_incom">
           <view wx:for='{{item.data}}' wx:for-item='week' class=" {{week.avg_score < 5 ?'down':'up'}}">
             {{week.date}}