添加查询订单

manage-server/app/Http/Controllers/ProductController.php

@@ -19,6 +19,7 @@ class ProductController extends Controller
         $name = $request->input('name');
         $info = $request->input('info');
         $classify = $request->input('classify');
+        $color = $request->input('color');
         $price = $request->input('price');
         $status = $request->input('status');
         if ($id) {
@@ -28,9 +29,10 @@ class ProductController extends Controller
             $product = new Product;
             $product->status = 0;
         }
-        if ($name && $info && $classify) {
+        if ($name && $info && $classify && $color) {
             $product->name = $name;
             $product->info = $info;
+            $product->color = $color;
             $product->price = $price;
             $product->save();
             return Response()->json([

manage-server/app/Models/Product.php

@@ -16,6 +16,7 @@ class Product extends Model
 		'info', // 产品信息
         'price', // 产品价格
         'classify', // 产品分类
+        'color', // 产品颜色款色
         'collect_num', // 收藏数
         'sell_num', // 销量
 		'status', // 产品状态, 上架/下架

manage-server/readme.md

@@ -1,60 +1,263 @@
-<p align="center"><img src="https://laravel.com/assets/img/components/logo-laravel.svg"></p>
+# 接口说明
+## 通用接口
+### 上传图片
+- `POST /upload`
+- 参数:
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
+参数         |  类型    |   可选  |    备注
+----------- |  ------  |  ------   |  --------
+photo       |   png/jpeg  | 	必须  |  图片
 
-## About Laravel
+- 响应:
+ 
+```
+{
+	"status": 0,
+	"path": "/path/photo.jpeg"
+}
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as:
+{
+	"status": -1,
+	"message": "error, photo is valid"
+}
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+{
+	"status": -2,
+	"message": "error, error message"
+}
+```
 
-Laravel is accessible, yet powerful, providing tools needed for large, robust applications.
+## 活动接口
+### 创建/修改活动
+- `POST /campaign/store`
+- 参数：
 
-## Learning Laravel
+参数         |  类型    |   可选               |    备注
+----------- |  ------  |  ------------------ |  --------
+id          |  integer | 	创建时空，修改时必须  |  活动id
+title       |  string  | 	必须               |  标题
+content     |  string  | 	必须               |  内容
+status      |  integer | 	可选               |  活动状态：0.进行中, 1.结束
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of any modern web application framework, making it a breeze to get started learning the framework.
+- 响应:
 
-If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
+```
+{
+	"status": 0,
+	"message": "保存成功"
+}
 
-## Laravel Sponsors
+{
+	"status": -1,
+	"message": "信息不能为空！"
+}
+```
 
-We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell):
+### 删除活动
+- `DELETE /campaign/delete`
+- 参数：
 
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[British Software Development](https://www.britishsoftware.co)**
-- [Fragrantica](https://www.fragrantica.com)
-- [SOFTonSOFA](https://softonsofa.com/)
-- [User10](https://user10.com)
-- [Soumettre.fr](https://soumettre.fr/)
-- [CodeBrisk](https://codebrisk.com)
-- [1Forge](https://1forge.com)
-- [TECPRESSO](https://tecpresso.co.jp/)
-- [Runtime Converter](http://runtimeconverter.com/)
-- [WebL'Agence](https://weblagence.com/)
-- [Invoice Ninja](https://www.invoiceninja.com)
+参数         |  类型    |   可选    |    备注
+----------- |  ------  |  ------- |  --------
+id          |  integer | 	 必须  |  活动id
 
-## Contributing
+- 响应:
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+ ```
+{
+	"status": 0,
+	"message": "删除成功"
+}
 
-## Security Vulnerabilities
+{
+	"status": -1,
+	"message": "id不能为空！"
+}
+```
 
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
+### 获得某活动
 
-## License
+- `GET /campaign/${id}`
+- 参数： 无
+- 响应：
 
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+ ```
+{
+	"status": 0,
+	"data": {
+		"id": 123456,
+		"title": "测试标题",
+		"content": "测试内容",
+		"status": 0,
+		"created_at": "2018-02-16 11:10:56",
+		"updated_at": "2018-02-16 12:00:51"
+	}
+}
+```
+
+
+### 分页查询活动
+- `GET /campaigns`
+- 参数： 无
+- 响应:
+
+```
+{
+   "total": 50,
+   "per_page": 15,
+   "current_page": 1,
+   "last_page": 4,
+   "first_page_url": "http://laravel.app?page=1",
+   "last_page_url": "http://laravel.app?page=4",
+   "next_page_url": "http://laravel.app?page=2",
+   "prev_page_url": null,
+   "path": "http://laravel.app",
+   "from": 1,
+   "to": 15,
+   "data":[{
+			"id": 123456,
+			"title": "测试标题",
+			"content": "测试内容",
+			"status": 0,
+			"created_at": "2018-02-16 11:10:56",
+			"updated_at": "2018-02-16 12:00:51"
+		},{
+			"id": 34578,
+			"title": "测试标题2",
+			"content": "测试内容2",
+			"status": 1,
+			"created_at": "2018-02-16 11:10:56",
+			"updated_at": "2018-02-16 12:00:51"
+		},
+		...
+   ]
+}
+```
+
+## 产品接口
+### 创建/修改产品
+- `POST /product/store`
+- 参数：
+
+参数         |  类型    |   可选               |    备注
+----------- |  ------  |  ------------------ |  --------
+id          |  integer | 	创建时空，修改时必须  |  产品id
+name        |  string  | 	必须               |  产品名称
+info        |  string  | 	必须               |  产品信息
+color       |  string  |   必须               |  产品款色
+price       |  double  | 	必须               |  产品价格
+classify    |  string  | 	必须               |  产品分类
+status      |  integer | 	可选               |  产品状态：0.上架, 1.下架
+
+- 响应:
+
+```
+{
+	"status": 0,
+	"message": "保存成功"
+}
+
+{
+	"status": -1,
+	"message": "信息不能为空！"
+}
+```
+
+### 删除产品
+- `DELETE /product/delete`
+- 参数：
+
+参数         |  类型    |   可选    |    备注
+----------- |  ------  |  ------- |  --------
+id          |  integer | 	 必须  |  产品id
+
+- 响应:
+
+ ```
+{
+	"status": 0,
+	"message": "删除成功"
+}
+
+{
+	"status": -1,
+	"message": "id不能为空！"
+}
+```
+
+### 获得某产品
+
+- `GET /product/${id}`
+- 参数：无
+
+- 响应：
+
+ ```
+{
+	"status": 0,
+	"data": {
+		"id": 123456,
+		"name": "测试名称",
+		"info": "测试信息",
+		"price": 1234.31,
+		"classify": "分类1",
+		"color": "款色",
+		"collect_num": 765,  //收藏数
+		"sell_num": 5,       //销量
+		"status": 0,         //0上架, 1下架
+		"created_at": "2018-02-16 11:10:56",
+		"updated_at": "2018-02-16 12:00:51"
+	}
+}
+```
+
+
+### 分页查询活动
+- `GET /campaigns`
+- 参数： 无
+- 响应:
+
+```
+{
+   "total": 50,
+   "per_page": 15,
+   "current_page": 1,
+   "last_page": 4,
+   "first_page_url": "http://laravel.app?page=1",
+   "last_page_url": "http://laravel.app?page=4",
+   "next_page_url": "http://laravel.app?page=2",
+   "prev_page_url": null,
+   "path": "http://laravel.app",
+   "from": 1,
+   "to": 15,
+   "data":[ {
+			"id": 123456,
+			"name": "测试名称",
+			"info": "测试信息",
+			"price": 1234.31,
+			"classify": "分类1",
+			"collect_num": 765,  //收藏数
+			"sell_num": 5,       //销量
+			"status": 0,         //0上架, 1下架
+			"created_at": "2018-02-16 11:10:56",
+			"updated_at": "2018-02-16 12:00:51"
+		}, {
+			"id": 123456,
+			"name": "测试名称",
+			"info": "测试信息",
+			"price": 1234.31,
+			"classify": "分类1",
+			"collect_num": 765,  //收藏数
+			"sell_num": 5,       //销量
+			"status": 0,         //0上架, 1下架
+			"created_at": "2018-02-16 11:10:56",
+			"updated_at": "2018-02-16 12:00:51"
+		}
+		...
+   ]
+}
+```
+
+## 家居清洁订单接口
+### 创建/修改家居清洁订单
+- `POST `

manage-server/routes/web.php

@@ -20,8 +20,10 @@ Route::post('/common/upload', 'CommonController@upload');
 
 Route::post('/campaign/store', 'CampaignController@store');
 Route::delete('/campaign/delete', 'CampaignController@delete');
-Route::get('/campaign/list', 'CampaignController@list');
+Route::get('/campaigns', 'CampaignController@list');
+Route::get('/campaign', 'CampaignController@get');
 
 Route::post('/product/store', 'ProductController@store');
 Route::delete('/product/delete', 'ProductController@delete');
-Route::get('/product/list', 'ProductController@list');
+Route::get('/products', 'ProductController@list');
+Route::get('/product', 'ProductController@get');