From 86cf1605d3b75e885e824e46efc68ea1225c935b Mon Sep 17 00:00:00 2001
From: maguohua1 <1264889788@qq.com>
Date: Thu, 19 Jul 2018 18:06:40 +0800
Subject: [PATCH] bug fixed

---
 src/components/headTop.vue |  2 +-
 src/page/addGoods.vue      |  4 ++--
 src/page/addShop.vue       | 18 +++++++++---------
 src/page/foodList.vue      | 14 +++++++-------
 src/page/orderList.vue     |  8 ++++----
 src/page/shopList.vue      |  4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/headTop.vue b/src/components/headTop.vue
index 24ca968..43cb344 100644
--- a/src/components/headTop.vue
+++ b/src/components/headTop.vue
@@ -3,7 +3,7 @@
 
 		<el-breadcrumb separator="/">
 			<el-breadcrumb-item :to="{ path: '/manage' }">首页</el-breadcrumb-item>
-			<el-breadcrumb-item v-for="(item, index) in $route.meta" key="index">{{item}}</el-breadcrumb-item>
+			<el-breadcrumb-item v-for="(item, index) in $route.meta" :key="index">{{item}}</el-breadcrumb-item>
 		</el-breadcrumb>
 		<el-dropdown @command="handleCommand" menu-align='start'>
 			<img :src="baseImgPath + adminInfo.avatar" class="avator">
diff --git a/src/page/addGoods.vue b/src/page/addGoods.vue
index 00c65ff..f7c1026 100644
--- a/src/page/addGoods.vue
+++ b/src/page/addGoods.vue
@@ -99,7 +99,7 @@
 						      label="价格">
 						    </el-table-column>
 						    <el-table-column label="操作" >
-						    <template scope="scope"> 
+						    <template slot-scope="scope">
 						        <el-button
 						          size="small"
 						          type="danger"
@@ -421,7 +421,7 @@
 		}
 		span{
 			.sc(14px, #999);
-			transition: all 400ms;	
+			transition: all 400ms;
 		}
 		.edit_icon{
 			color: #ccc;
diff --git a/src/page/addShop.vue b/src/page/addShop.vue
index 28d14a2..f9ec245 100644
--- a/src/page/addShop.vue
+++ b/src/page/addShop.vue
@@ -76,7 +76,7 @@
 							}">
 						</el-time-select>
 					</el-form-item>
-					
+
 					<el-form-item label="上传店铺头像">
 						<el-upload
 						  class="avatar-uploader"
@@ -142,10 +142,10 @@
 					      align="cneter"
 					      label="活动详情">
 					    </el-table-column>
-					    <el-table-column 
-					    	label="操作" 
+					    <el-table-column
+					    	label="操作"
 					    	width="120">
-					    <template scope="scope">
+					    <template slot-scope="scope">
 					        <el-button
 					          size="small"
 					          type="danger"
@@ -191,7 +191,7 @@
        	 			image_path: '',
        	 			business_license_image: '',
        	 			catering_service_license_image: '',
-       	 			
+
 		        },
 		        rules: {
 					name: [
@@ -336,7 +336,7 @@
 		        		this.$message({
 				            type: 'info',
 				            message: '请输入活动详情'
-				        }); 
+				        });
 		        		return
 		        	}
 		          	let newObj = {};
@@ -368,14 +368,14 @@
 					        	name: '进店领券',
 					        	description: value,
 		          			}
-		          			break;			
+		          			break;
 		          	}
 		          	this.activities.push(newObj);
 		        }).catch(() => {
 		          	this.$message({
 		            	type: 'info',
 		            	message: '取消输入'
-		          	});       
+		          	});
 		        });
 		    },
 		    handleDelete(index){
@@ -414,7 +414,7 @@
 				       	 			endTime: '',
 				       	 			image_path: '',
 				       	 			business_license_image: '',
-				       	 			catering_service_license_image: '',	
+				       	 			catering_service_license_image: '',
 						        };
 						        this.selectedCategory = ['快餐便当', '简餐'];
 						        this.activities = [{
diff --git a/src/page/foodList.vue b/src/page/foodList.vue
index 40f34c5..4d16942 100644
--- a/src/page/foodList.vue
+++ b/src/page/foodList.vue
@@ -9,7 +9,7 @@
                 :row-key="row => row.index"
                 style="width: 100%">
                 <el-table-column type="expand">
-                  <template scope="props">
+                  <template slot-scope="props">
                     <el-form label-position="left" inline class="demo-table-expand">
                       <el-form-item label="食品名称">
                         <span>{{ props.row.name }}</span>
@@ -54,7 +54,7 @@
                   prop="rating">
                 </el-table-column>
                 <el-table-column label="操作" width="160">
-                  <template scope="scope">
+                  <template slot-scope="scope">
                     <el-button
                       size="small"
                       @click="handleEdit(scope.row)">编辑</el-button>
@@ -123,7 +123,7 @@
 					      label="价格">
 					    </el-table-column>
 					    <el-table-column label="操作" >
-					    <template scope="scope"> 
+					    <template slot-scope="scope">
 					        <el-button
 					          size="small"
 					          type="danger"
@@ -138,8 +138,8 @@
                 <el-button type="primary" @click="updateFood">确 定</el-button>
               </div>
             </el-dialog>
-			
-           
+
+
             <el-dialog title="添加规格" v-model="specsFormVisible">
 			  	<el-form :rules="specsFormrules" :model="specsForm">
 				    <el-form-item label="规格" label-width="100px" prop="specs">
@@ -309,10 +309,10 @@
                 this.selectTable = {...row, ...{restaurant_name: restaurant.name, restaurant_address: restaurant.address, category_name: category.name}};
 
                 this.selectMenu = {label: category.name, value: row.category_id}
-                this.tableData.splice(row.index, 1, {...this.selectTable}); 
+                this.tableData.splice(row.index, 1, {...this.selectTable});
                 this.$nextTick(() => {
                     this.expendRow.push(row.index);
-                })  
+                })
                 if (type == 'edit' && this.restaurant_id != row.restaurant_id) {
                 	this.getMenu();
                 }
diff --git a/src/page/orderList.vue b/src/page/orderList.vue
index ba7f0aa..0eb7315 100644
--- a/src/page/orderList.vue
+++ b/src/page/orderList.vue
@@ -9,7 +9,7 @@
                 :row-key="row => row.index"
 			    style="width: 100%">
 			    <el-table-column type="expand">
-			      <template scope="props">
+			      <template slot-scope="props">
 			        <el-form label-position="left" inline class="demo-table-expand">
 			          <el-form-item label="用户名" >
 			            <span>{{ props.row.user_name }}</span>
@@ -80,7 +80,7 @@
             this.initData();
         },
         mounted(){
-            
+
         },
         methods: {
             async initData(){
@@ -125,10 +125,10 @@
 	            	const userInfo = await getUserInfo(row.user_id);
 	            	const addressInfo = await getAddressById(row.address_id);
 
-	                this.tableData.splice(row.index, 1, {...row, ...{restaurant_name: restaurant.name, restaurant_address: restaurant.address, address: addressInfo.address, user_name: userInfo.username}}); 
+	                this.tableData.splice(row.index, 1, {...row, ...{restaurant_name: restaurant.name, restaurant_address: restaurant.address, address: addressInfo.address, user_name: userInfo.username}});
                     this.$nextTick(() => {
                         this.expendRow.push(row.index);
-                    })	
+                    })
 	            }else{
                     const index = this.expendRow.indexOf(row.index);
                     this.expendRow.splice(index, 1)
diff --git a/src/page/shopList.vue b/src/page/shopList.vue
index d815afa..4074dc1 100644
--- a/src/page/shopList.vue
+++ b/src/page/shopList.vue
@@ -6,7 +6,7 @@
                 :data="tableData"
                 style="width: 100%">
                 <el-table-column type="expand">
-                  <template scope="props">
+                  <template slot-scope="props">
                     <el-form label-position="left" inline class="demo-table-expand">
                       <el-form-item label="店铺名称">
                         <span>{{ props.row.name }}</span>
@@ -48,7 +48,7 @@
                   prop="description">
                 </el-table-column>
                 <el-table-column label="操作" width="200">
-                  <template scope="scope">
+                  <template slot-scope="scope">
                     <el-button
                       size="mini"
                       @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-- 
GitLab