Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/controllers/Index.php

@@ -59,7 +59,7 @@ class IndexController extends \Our\Controller_Abstract  {
         $sort == 1 ? $order = ['browsedate','ASC'] : $order = ['browsedate','DESC'];
         $startTime = mktime(0,0,0,$month-2,1,$year);
         $endTime = mktime(0,0,-1,$month+1,1,$year);
-        $res=$browseDAO->getDistinctDate(1,$startTime,$endTime);
+        $res=$browseDAO->getDistinctDate(1,$startTime,$endTime,$order);
         echo json_encode($res);exit;
         //$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getDistinctDate'),array($memberId,$startTime,$endTime,$order),\Our\ApiConst::twoMinSecond,array($memberId));
 //        $clientPush=\JPush\ClientPush::getInstance();