合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1003

@@ -80,7 +80,7 @@ class BaseController extends Controller
             case "order":
             case "order":
                 $this->order = $v;
                 $this->order = $v;
                 break;
                 break;
-            case "order":
+            case "order_type":
                 $this->order_type = $v;
                 $this->order_type = $v;
                 break;
                 break;
             case 'page':
             case 'page':

@@ -68,13 +68,12 @@ class ProductController extends BaseController
                 $v = $this->getHandleFileImage($v);
                 $v = $this->getHandleFileImage($v);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
+            $lists['order_type'] = $this->order_type;
+            $lists['order'] = $this->order;
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
-    public function setOrderBy(){
-
-    }
     /**
     /**
      * @remark :列表
      * @remark :列表
      * @name   :index
      * @name   :index