From 7d93e01756ce7909c82c4c63fa22fbef8ccfe1a9 Mon Sep 17 00:00:00 2001
From: maguohua <1264889788@qq.com>
Date: Thu, 11 May 2017 00:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE              | 21 +++++++++++++++++++++
 README.md            |  2 +-
 src/page/addShop.vue | 36 +++++++++++++++++++++++++-----------
 3 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f955752
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 cangdu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index 8e3bcb6..853cd9c 100644
--- a/README.md
+++ b/README.md
@@ -66,4 +66,4 @@ npm run dev
 
 ### License
 
-[MIT](https://mit-license.org/)
+[MIT](https://github.com/bailicangdu/vue2-manage/blob/master/LICENSE)
diff --git a/src/page/addShop.vue b/src/page/addShop.vue
index 8b337b6..f13c3b2 100644
--- a/src/page/addShop.vue
+++ b/src/page/addShop.vue
@@ -72,33 +72,33 @@
 					<el-form-item label="上传店铺头像">
 						<el-upload
 						  class="avatar-uploader"
-						  action="//jsonplaceholder.typicode.com/posts/"
+						  :action="baseUrl + '/shopping/addimg'"
 						  :show-file-list="false"
 						  :on-success="handleShopAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
-						  <img v-if="formData.image_path" :src="formData.image_path" class="avatar">
+						  <img v-if="formData.image_path" :src="baseUrl + formData.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-upload
 						  class="avatar-uploader"
-						  action="//jsonplaceholder.typicode.com/posts/"
+						  :action="baseUrl + '/shopping/addimg'"
 						  :show-file-list="false"
 						  :on-success="handleBusinessAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
-						  <img v-if="formData.business_license_image" :src="formData.business_license_image" class="avatar">
+						  <img v-if="formData.business_license_image" :src="baseUrl + formData.business_license_image" class="avatar">
 						  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 						</el-upload>
 					</el-form-item>
 					<el-form-item label="上传餐饮服务许可证">
 						<el-upload
 						  class="avatar-uploader"
-						  action="//jsonplaceholder.typicode.com/posts/"
+						  :action="baseUrl + '/shopping/addimg'"
 						  :show-file-list="false"
 						  :on-success="handleServiceAvatarScucess"
 						  :before-upload="beforeAvatarUpload">
-						  <img v-if="formData.catering_service_license_image" :src="formData.catering_service_license_image" class="avatar">
+						  <img v-if="formData.catering_service_license_image" :src="baseUrl + formData.catering_service_license_image" class="avatar">
 						  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 						</el-upload>
 					</el-form-item>
@@ -157,6 +157,7 @@
 <script>
     import headTop from '@/components/headTop'
     import {cityGuess, addShop, searchplace} from '@/api/getData'
+    import {baseUrl} from '@/config/env'
     export default {
     	data(){
     		return {
@@ -213,7 +214,8 @@
 		        	icon_name: '减',
 		        	name: '满减优惠',
 		        	description: '满30减5，满60减8',
-			    }]
+			    }],
+			    baseUrl,
     		}
     	},
     	components: {
@@ -252,13 +254,25 @@
 		    	console.log(address)
 		    },
 			handleShopAvatarScucess(res, file) {
-				this.formData.image_path = URL.createObjectURL(file.raw);
+				if (res.status == 1) {
+					this.formData.image_path = res.image_path;
+				}else{
+					this.$message.error('上传图片失败！');
+				}
 			},
 			handleBusinessAvatarScucess(res, file) {
-				this.formData.business_license_image = URL.createObjectURL(file.raw);
+				if (res.status == 1) {
+					this.formData.business_license_image = res.image_path;
+				}else{
+					this.$message.error('上传图片失败！');
+				}
 			},
 			handleServiceAvatarScucess(res, file) {
-				this.formData.catering_service_license_image = URL.createObjectURL(file.raw);
+				if (res.status == 1) {
+					this.formData.catering_service_license_image = res.image_path;
+				}else{
+					this.$message.error('上传图片失败！');
+				}
 			},
 			beforeAvatarUpload(file) {
 				const isRightType = (file.type === 'image/jpeg') || (file.type === 'image/png');
@@ -270,7 +284,7 @@
 				if (!isLt2M) {
 					this.$message.error('上传头像图片大小不能超过 2MB!');
 				}
-				return isJPG && isLt2M;
+				return isRightType && isLt2M;
 			},
 			tableRowClassName(row, index) {
 		        if (index === 1) {
-- 
GitLab