1

pages/avg/avg.js

@@ -127,9 +127,19 @@ Page({
             total:0
           })
         }
+        var pre=0;
         days.forEach(item=>{
           var w=this.getWeekNumber(item.stock_date)
-          weeks[w-1].data.push(item)
+          if(w<pre){
+            if(w==1){
+              weeks[pre-1].data.push(item)
+            }else{
+              weeks[pre+w-2].data.push(item)
+            }
+          }else{
+            weeks[w-1].data.push(item)
+            pre=w
+          } 
         })
         weeks=weeks.filter(item=>item.data.length>0)
         var w_text=['一','二','三','四','五','六','七','八','九','十','十一','十二','十三','十四','十五']

pages/index/index.js

@@ -197,18 +197,29 @@ Page({
       $api.getAvg({match_id:res.data.data[0].match_id}).then(res=>{
         var days=res.data.data.list,weeks=[]
         days=days.reverse()
-        for(let i=0;i<55;i++){
+        for(let i=0;i<100;i++){
           weeks.push({
             name:'',
             data:[],
             total:0
           })
         }
+        var pre=0;
         days.forEach(item=>{
           var w=this.getWeekNumber(item.stock_date)
-          weeks[w-1].data.push(item)
+          if(w<pre){
+            if(w==1){
+              weeks[pre-1].data.push(item)
+            }else{
+              weeks[pre+w-2].data.push(item)
+            }
+          }else{
+            weeks[w-1].data.push(item)
+            pre=w
+          } 
         })
         weeks=weeks.filter(item=>item.data.length>0)
+        
         var w_text=['一','二','三','四','五','六','七','八','九','十','十一','十二','十三','十四','十五']
         weeks.forEach((item,index)=>{
           if(item.data.length>0){