diff --git a/README.md b/README.md
index 72697c92451b9e308db7045d11e567d7149a491c..8c15e2be871282d0508d4575fd11287ae7560fb4 100644
--- a/README.md
+++ b/README.md
@@ -38,11 +38,11 @@ npm run dev
 
 # 功能列表
 
-- [ ] 登陆/注销
+- [x] 登陆/注销
+- [x] 添加商铺
+- [x] 添加商品
 - [ ] 权限验证
 - [ ] 总体数据展示
-- [ ] 添加商铺
-- [ ] 添加商品
 - [ ] 管理用户
 - [ ] 管理商铺
 - [ ] 地区管理
@@ -66,6 +66,9 @@ npm run dev
 ## 添加商店
 ![](http://cangdu.org/files/images/addshop.png)
 
+## 添加食品
+![](http://cangdu.org/files/images/addfood.png)
+
 
 ### License
 
diff --git a/src/api/getData.js b/src/api/getData.js
index 588db12571668273b10586140a1f8955d8b71f50..c8ec294433450f38743a2308abbfdda90cc8d840 100644
--- a/src/api/getData.js
+++ b/src/api/getData.js
@@ -13,7 +13,7 @@ const cityGuess = () => fetch('/v1/cities', {
  * 添加商铺
  */
 
-const addShop = data => fetch('/shopping/addShop', {...data}, 'POST');
+const addShop = data => fetch('/shopping/addShop', data, 'POST');
 
 /**
  * 获取搜索地址
@@ -35,8 +35,13 @@ const getCategory = restaurant_id => fetch('/shopping/getcategory/' + restaurant
  * 添加食品种类
  */
 
-const addCategory = data => fetch('/shopping/addcategory', {...data}, 'POST');
+const addCategory = data => fetch('/shopping/addcategory', data, 'POST');
+/**
+ * 添加食品
+ */
+
+const addFood = data => fetch('/shopping/addfood', data, 'POST');
 
 
-export { cityGuess, addShop, searchplace, getCategory, addCategory }
+export { cityGuess, addShop, searchplace, getCategory, addCategory, addFood }
 
diff --git a/src/page/addGoods.vue b/src/page/addGoods.vue
index d39ca200026cf2e50c5be04ad2feb63a10f965ae..3d69a1c5498353aed43e43119b203a214538f269 100644
--- a/src/page/addGoods.vue
+++ b/src/page/addGoods.vue
@@ -2,11 +2,12 @@
     <div>
      	<head-top></head-top>
         <el-row style="margin-top: 20px;">
-  			<el-col :span="12" :offset="4">
-	  			<el-form :model="categoryForm" :rules="categoryrules" ref="categoryForm" label-width="110px" class="category_form">
+  			<el-col :span="14" :offset="4">
+  				<header class="form_header">选择食品种类</header>
+	  			<el-form :model="categoryForm" ref="categoryForm" label-width="110px" class="form">
 		  			<el-row class="category_select">
 		  				<el-form-item label="食品种类">
-			  				<el-select v-model="categoryForm.categorySelect" :placeholder="categoryForm.categorySelect" style="width:100%;">
+			  				<el-select v-model="categoryForm.categorySelect" :placeholder="selectValue.label" style="width:100%;">
 							    <el-option
 							      	v-for="item in categoryForm.categoryList"
 							      	:key="item.value"
@@ -34,8 +35,100 @@
 						<i class="el-icon-caret-bottom edit_icon" v-else slot="icon"></i>
 						<span>添加食品种类</span>
 					</div>
-					
 	  			</el-form>
+	  			<header class="form_header">添加食品</header>
+	  			<el-form :model="foodForm" :rules="foodrules" ref="foodForm" label-width="110px" class="form food_form">
+	  				<el-form-item label="食品名称" prop="name">
+						<el-input v-model="foodForm.name"></el-input>
+					</el-form-item>
+					<el-form-item label="食品活动" prop="activity">
+						<el-input v-model="foodForm.activity"></el-input>
+					</el-form-item>
+					<el-form-item label="食品详情" prop="description">
+						<el-input v-model="foodForm.description"></el-input>
+					</el-form-item>
+					<el-form-item label="上传店铺头像">
+						<el-upload
+						  class="avatar-uploader"
+						  :action="baseUrl + '/shopping/addimg/food'"
+						  :show-file-list="false"
+						  :on-success="uploadImg"
+						  :before-upload="beforeImgUpload">
+						  <img v-if="foodForm.image_path" :src="baseUrl + foodForm.image_path" class="avatar">
+						  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+						</el-upload>
+					</el-form-item>
+					<el-form-item label="食品特点">
+						<el-select v-model="foodForm.attributes" multiple placeholder="请选择">
+						    <el-option
+						      	v-for="item in attributes"
+						      	:key="item.value"
+						      	:label="item.label"
+						      	:value="item.value">
+						    </el-option>
+					 	</el-select>
+					</el-form-item>
+					<el-form-item label="食品规格">
+						<el-radio class="radio" v-model="foodSpecs" label="one">单规格</el-radio>
+  						<el-radio class="radio" v-model="foodSpecs" label="more">多规格</el-radio>
+					</el-form-item>
+					<el-row v-if="foodSpecs == 'one'">
+						<el-form-item label="包装费">
+							<el-input-number v-model="foodForm.specs[0].packing_fee" :min="0" :max="100"></el-input-number>
+						</el-form-item>
+						<el-form-item label="价格">
+							<el-input-number v-model="foodForm.specs[0].price" :min="0" :max="10000"></el-input-number>
+						</el-form-item>
+					</el-row>
+					<el-row v-else style="overflow: auto; text-align: center;">
+						<el-button type="primary" @click="dialogFormVisible = true" style="margin-bottom: 10px;">添加规格</el-button>
+						<el-table
+					    :data="foodForm.specs"
+					    style="margin-bottom: 20px;"
+					    :row-class-name="tableRowClassName">
+						    <el-table-column
+						      prop="specs"
+						      label="规格">
+						    </el-table-column>
+						    <el-table-column
+						      prop="packing_fee"
+						      label="包装费">
+						    </el-table-column>
+						    <el-table-column
+						      prop="price"
+						      label="价格">
+						    </el-table-column>
+						    <el-table-column label="操作" >
+						    <template scope="scope"> 
+						        <el-button
+						          size="small"
+						          type="danger"
+						          @click="handleDelete(scope.$index)">删除</el-button>
+						    </template>
+						    </el-table-column>
+						</el-table>
+					</el-row>
+					<el-form-item>
+						<el-button type="primary" @click="addFood('foodForm')">确认添加食品</el-button>
+					</el-form-item>
+	  			</el-form>
+	  			<el-dialog title="添加规格" v-model="dialogFormVisible">
+				  	<el-form :rules="specsFormrules" :model="specsForm">
+					    <el-form-item label="规格" label-width="100px" prop="specs">
+					     	<el-input v-model="specsForm.specs" auto-complete="off"></el-input>
+					    </el-form-item>
+					    <el-form-item label="包装费" label-width="100px">
+							<el-input-number v-model="specsForm.packing_fee" :min="0" :max="100"></el-input-number>
+						</el-form-item>
+						<el-form-item label="价格" label-width="100px">
+							<el-input-number v-model="specsForm.price" :min="0" :max="10000"></el-input-number>
+						</el-form-item>
+				  	</el-form>
+				  <div slot="footer" class="dialog-footer">
+				    <el-button @click="dialogFormVisible = false">取 消</el-button>
+				    <el-button type="primary" @click="addspecs">确 定</el-button>
+				  </div>
+				</el-dialog>
   			</el-col>
   		</el-row>
     </div>
@@ -43,23 +136,56 @@
 
 <script>
  	import headTop from '@/components/headTop'
-    import {getCategory, addCategory} from '@/api/getData'
+    import {getCategory, addCategory, addFood} from '@/api/getData'
     import {baseUrl} from '@/config/env'
     export default {
     	data(){
     		return {
+    			baseUrl,
     			restaurant_id: 3,
     			categoryForm: {
-    				category: '',
     				categoryList: [],
     				categorySelect: '',
     				name: '',
     				description: '',
     			},
-    			categoryrules: {
-    				
+    			foodForm: {
+    				name: '',
+    				description: '',
+    				image_path: '',
+    				activity: '',
+    				attributes: [],
+    				specs: [{
+    					specs: '默认',
+			          	packing_fee: 0,
+			          	price: 20,
+    				}],
+    			},
+    			foodrules: {
+    				name: [
+						{ required: true, message: '请输入食品名称', trigger: 'blur' },
+					],
     			},
+    			attributes: [{
+		          	value: '新',
+		          	label: '新品'
+		        }, {
+		          	value: '招牌',
+		          	label: '招牌'
+		        },],
     			showAddCategory: false,
+    			foodSpecs: 'one',
+    			dialogFormVisible: false,
+		        specsForm: {
+		          	specs: '',
+		          	packing_fee: 0,
+		          	price: 20,
+		        },
+		        specsFormrules: {
+		        	specs: [
+						{ required: true, message: '请输入规格', trigger: 'blur' },
+					],
+		        }
     		}
     	},
     	components: {
@@ -68,14 +194,18 @@
     	mounted(){
     		this.initData();
     	},
+    	computed: {
+    		selectValue: function (){
+    			return this.categoryForm.categoryList[this.categoryForm.categorySelect]||{}
+    		}
+    	},
     	methods: {
     		async initData(){
     			try{
     				const result = await getCategory(this.restaurant_id);
-    				console.log(result)
 	    			if (result.status == 1) {
-	    				result.category_list.map(item => {
-	    					item.value = item.name;
+	    				result.category_list.map((item, index) => {
+	    					item.value = index;
 	    					item.label = item.name;
 	    				})
 	    				this.categoryForm.categoryList = result.category_list;
@@ -91,7 +221,6 @@
 		    },
 		    submitcategoryForm(categoryForm) {
 				this.$refs[categoryForm].validate(async (valid) => {
-					console.log(categoryForm)
 					if (valid) {
 						const params = {
 							name: this.categoryForm.name,
@@ -123,19 +252,96 @@
 					}
 				});
 			},
+			uploadImg(res, file) {
+				if (res.status == 1) {
+					this.foodForm.image_path = res.image_path;
+				}else{
+					this.$message.error('上传图片失败！');
+				}
+			},
+			beforeImgUpload(file) {
+				const isRightType = (file.type === 'image/jpeg') || (file.type === 'image/png');
+				const isLt2M = file.size / 1024 / 1024 < 2;
+
+				if (!isRightType) {
+					this.$message.error('上传头像图片只能是 JPG 格式!');
+				}
+				if (!isLt2M) {
+					this.$message.error('上传头像图片大小不能超过 2MB!');
+				}
+				return isRightType && isLt2M;
+			},
+			addspecs(){
+				this.foodForm.specs.push({...this.specsForm});
+				this.specsForm.specs = '';
+				this.specsForm.packing_fee = 0;
+				this.specsForm.price = 20;
+				this.dialogFormVisible = false;
+			},
+			handleDelete(index){
+				this.foodForm.specs.splice(index, 1);
+			},
+			tableRowClassName(row, index) {
+		        if (index === 1) {
+		        	return 'info-row';
+		        } else if (index === 3) {
+		        	return 'positive-row';
+		        }
+		        return '';
+		    },
+		    addFood(foodForm){
+		    	this.$refs[foodForm].validate(async (valid) => {
+					if (valid) {
+						const params = {
+							...this.foodForm,
+							category_id: this.selectValue.id,
+							restaurant_id: this.restaurant_id,
+						}
+						try{
+							const result = await addFood(params);
+							if (result.status == 1) {
+								console.log(result)
+								this.$message({
+					            	type: 'success',
+					            	message: '添加成功'
+					          	});
+							}
+						}catch(err){
+							console.log(err)
+						}
+					} else {
+						this.$notify.error({
+							title: '错误',
+							message: '请检查输入是否正确',
+							offset: 100
+						});
+						return false;
+					}
+				});
+		    }
 		}
     }
 </script>
 
 <style lang="less">
 	@import '../style/mixin';
-	.category_form{
+	.form{
+		min-width: 400px;
+		margin-bottom: 30px;
 		&:hover{
 			box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
 			border-radius: 6px;
 			transition: all 400ms;
 		}
 	}
+	.food_form{
+		border: 1px solid #eaeefb;
+		padding: 10px 10px 0;
+	}
+	.form_header{
+		text-align: center;
+		margin-bottom: 10px;
+	}
 	.category_select{
 		border: 1px solid #eaeefb;
 		padding: 10px 30px 10px 10px;
@@ -180,4 +386,30 @@
 			transition: all 400ms;
 		}
 	}
+	.avatar-uploader .el-upload {
+	    border: 1px dashed #d9d9d9;
+	    border-radius: 6px;
+	    cursor: pointer;
+	    position: relative;
+	    overflow: hidden;
+	}
+	.avatar-uploader .el-upload:hover {
+	    border-color: #20a0ff;
+	}
+	.avatar-uploader-icon {
+	    font-size: 28px;
+	    color: #8c939d;
+	    width: 120px;
+	    height: 120px;
+	    line-height: 120px;
+	    text-align: center;
+	}
+	.avatar {
+	    width: 120px;
+	    height: 120px;
+	    display: block;
+	}
+	.cell{
+		text-align: center;
+	}
 </style>
diff --git a/src/page/addShop.vue b/src/page/addShop.vue
index 432840ccb3e893f82ef44cb81840ae2b89c5c0d4..9d86736c076405ef02deefa7f4d9c228d2f90fc6 100644
--- a/src/page/addShop.vue
+++ b/src/page/addShop.vue
@@ -72,7 +72,7 @@
 					<el-form-item label="上传店铺头像">
 						<el-upload
 						  class="avatar-uploader"
-						  :action="baseUrl + '/shopping/addimg'"
+						  :action="baseUrl + '/shopping/addimg/shop'"
 						  :show-file-list="false"
 						  :on-success="handleShopAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
@@ -83,7 +83,7 @@
 					<el-form-item label="上传营业执照">
 						<el-upload
 						  class="avatar-uploader"
-						  :action="baseUrl + '/shopping/addimg'"
+						  :action="baseUrl + '/shopping/addimg/shop'"
 						  :show-file-list="false"
 						  :on-success="handleBusinessAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
@@ -94,7 +94,7 @@
 					<el-form-item label="上传餐饮服务许可证">
 						<el-upload
 						  class="avatar-uploader"
-						  :action="baseUrl + '/shopping/addimg'"
+						  :action="baseUrl + '/shopping/addimg/shop'"
 						  :show-file-list="false"
 						  :on-success="handleServiceAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
diff --git a/src/page/manage.vue b/src/page/manage.vue
index 0dfb65dd68ef2efba8f88889dc7da7da799c318b..3114451098b200254c1d55188cb359effebeef15 100644
--- a/src/page/manage.vue
+++ b/src/page/manage.vue
@@ -37,7 +37,7 @@
 					</el-submenu>
 				</el-menu>
 			</el-col>
-			<el-col :span="20" style="height: 100%;overflow-y: auto;">
+			<el-col :span="20" style="height: 100%;overflow: auto;">
 				<router-view></router-view>
 			</el-col>
 		</el-row>