Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -297,7 +297,12 @@ class ProductController extends BaseController
         }elseif($v['type'] == 4){
         }elseif($v['type'] == 4){
             $arr1 = json_decode($info['values']);
             $arr1 = json_decode($info['values']);
             foreach ($arr1 as $k1=>$v1){
             foreach ($arr1 as $k1=>$v1){
-                $v1 = getFileUrl($v1);
+                $v1 = (array)$v1;
+                if(isset($v1['url'])){
+                    $v1['url'] = getFileUrl($v1['url']);
+                }else{
+                    $v1 = getFileUrl($v1);
+                }
                 $arr1[$k1] = $v1;
                 $arr1[$k1] = $v1;
             }
             }
             $v['values'] = $arr1;
             $v['values'] = $arr1;

@@ -30,7 +30,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $lists = $this->model->list($map,$order,$filed);
+        $lists = $this->model->list($map,$order,$filed,'desc',10);
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 if(empty($v['source_country'])){
                 if(empty($v['source_country'])){

@@ -175,7 +175,7 @@ class ProductLogic extends  BaseLogic
             $v['values'] = json_encode($v['values']);
             $v['values'] = json_encode($v['values']);
         }elseif ($v['type'] == 4){
         }elseif ($v['type'] == 4){
             foreach ($v['values'] as $k1=>$v1){
             foreach ($v['values'] as $k1=>$v1){
-                $v1 = str_replace_url($v1);
+                $v1['url'] = str_replace_url($v1['url']);
                 $v['values'][$k1] = $v1;
                 $v['values'][$k1] = $v1;
             }
             }
             $v['values'] = json_encode($v['values']);
             $v['values'] = json_encode($v['values']);