Merge branch 'dev' of http://git.dgtis.com/sunlupeng/pointsMall-admin

src/main.js

@@ -17,9 +17,11 @@ import './permission' // permission control
 Vue.use(Element, {
   size: 'medium' // set element-ui default size
 })
-const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//正式地址
+// const prodUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';//正式地址
 
-const devUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云地址
+const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云测试地址
+
+const devUrl = 'http://47.103.79.143:9085/admin/storage/create';//本地测试地址
 
 const baseUrl = process.env.NODE_ENV === 'production' ? prodUrl : devUrl;
 Vue.prototype.upLoadUrl = baseUrl;