Merge remote-tracking branch 'origin/dev' into dev

0f99154a · zhuxiaomei · ed06803b · ed870571 · 0f99154a · 0f99154a
Commit 0f99154a authored Nov 13, 2020 by zhuxiaomei
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.env.production .env.production +1 -1

config.js src/api/config.js +1 -1

No files found.
--- a/.env.production
+++ b/.env.production
 NODE_ENV=production
-VUE_APP_BASE_URL=http://192.168.0.155:7000
+VUE_APP_BASE_URL=http://api.patzn.com

--- a/src/api/config.js
+++ b/src/api/config.js
@@ -26,7 +26,7 @@ export default {
  baseURL: process.env.VUE_APP_BASE_URL,
  //version
  version: function () {
-    return '0.0.0'
+    return '1.0.0'
  },
 }