dever 3 年之前
父节点
当前提交
26b3616ac2
共有 1 个文件被更改,包括 11 次插入2 次删除
  1. 11 2
      app/mshop/src/My.php

+ 11 - 2
app/mshop/src/My.php

@@ -372,7 +372,11 @@ class My extends Core
                 $this->data['data'][$k]['name'] = Dever::load('cash/lib/set')->statDate($stat_type, $v['day']);
                 $v['day'] = date('Y-m-d', $v['day']);
                 Dever::setInput('day', $v['day']);
-                list($this->data['data'][$k]['start'], $this->data['data'][$k]['end']) = Dever::month();
+                if ($stat_type == 1) {
+                    list($this->data['data'][$k]['start'], $this->data['data'][$k]['end']) = Dever::month();
+                } else {
+                    list($this->data['data'][$k]['start'], $this->data['data'][$k]['end']) = Dever::week();
+                }
                 $this->data['data'][$k]['start'] = date('Y-m-d', $this->data['data'][$k]['start']);
                 $this->data['data'][$k]['end'] = date('Y-m-d', $this->data['data'][$k]['end']);
                 $this->data['data'][$k]['status_name'] = $status[$v['shop_status']];
@@ -419,7 +423,12 @@ class My extends Core
         $this->data['info']['name'] = Dever::load('cash/lib/set')->statDate($stat_type, $this->data['info']['day']);
         $this->data['info']['day'] = date('Y-m-d', $this->data['info']['day']);
         Dever::setInput('day', $this->data['info']['day']);
-        list($this->data['info']['start'], $this->data['info']['end']) = Dever::month();
+        if ($stat_type == 1) {
+            list($this->data['info']['start'], $this->data['info']['end']) = Dever::month();
+        } else {
+            list($this->data['info']['start'], $this->data['info']['end']) = Dever::week();
+        }
+        
         $this->data['info']['status_name'] = $status[$this->data['info']['shop_status']];
 
         $where = array();