Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/public_producer

app/JsonRpc/PublicRpcService.php

@@ -854,7 +854,7 @@ class PublicRpcService implements PublicRpcServiceInterface
         $result = Template::where($where)
             ->leftJoin('template_class', 'template.template_class_id', 'template_class.class_id')
             ->select('template.*', 'template_class.name as template_class_name')
-            ->orderBy('template.id', 'desc')
+            ->orderBy('template.template_id','desc')
             ->paginate($data['page_size'], ['*'], 'mypage_name', $data['page']);
         if (empty($result)) {
             return Result::error("暂无皮肤", 0);
@@ -2202,10 +2202,10 @@ class PublicRpcService implements PublicRpcServiceInterface
         $template_page_str = json_encode($template_page);
         $result['template'] = $query->where($where)
             ->whereRaw("JSON_CONTAINS(template.page_type, ?)", [$template_page_str])
-            ->orderBy('updated_at', 'desc')
+            ->orderBy('template.template_id','desc')
             ->paginate($data['page_size'], ['*'], 'page', $data['page']);
         if (empty($result['template'])) {
-            $result['template'] = Template::orderBy('updated_at', 'desc')
+            $result['template'] = Template::orderBy('template.template_id','desc')
                 ->paginate($data['page_size'], ['*'], 'page', $data['page']);
         }
         $template = WebsiteTemplateInfo::where('website_id', $data['website_id'])->value('template_id');
@@ -2653,6 +2653,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             $component = ComponentImg::whereIn('component_id',$component_id)
             ->where($template)
             ->select('img_id','img_name','img_url','template_id')
+            ->orderBy('component_img.img_id','asc')
             ->get()->all();
         }else{
             if(isset($data['type_id']) && !empty($data['type_id'])){
@@ -2666,7 +2667,9 @@ class PublicRpcService implements PublicRpcServiceInterface
             }
             $component = Component::where($where)
             ->leftJoin('component_img','component.component_id','=','component_img.component_id')
-            ->select('component.*','component_img.img_id','component_img.img_url','img_name')
+            ->select('component.*','component_img.img_id','component_img.img_url','component_img.img_name')
+            // ->orderBy('component_img.template_id')
+            ->orderBy('component_img.img_id','asc')
             ->get()->all();
         }
         
@@ -2830,6 +2833,8 @@ class PublicRpcService implements PublicRpcServiceInterface
         ->leftJoin('template','component_img.template_id','=','template.template_id')
         ->leftJoin('component','component_img.component_id','=','component.component_type')
         ->select('component_img.*','template.template_name','component.component_name')
+        ->orderBy('component_img.template_id')
+        ->orderBy('component_img.img_id')
         ->paginate($data['page_size'], ['*'], 'page', $data['page']);
         if($component_img->isEmpty()){
             return Result::error('组件预览图不存在！');