Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

2 years ago · 29dd34df75
1 changed files with 4 additions and 0 deletions
--- a/FrontEnd/nuxt.config.js
+++ b/FrontEnd/nuxt.config.js
@ -143,6 +143,10 @@ export default {
      // target: 'http://www.origtek.com:3002',// 服務地址
      target: 'https://showeasy.com:5000',// API 正式機
      // target: 'http://showeasy.com:3001',// API 測式機 (無SSL)
+<<<<<<< Updated upstream
+=======
+      // target: 'http://localhost:3466',// API 本機 (無SSL)
+>>>>>>> Stashed changes
      pathRewrite: {
        '^/trending': '/'
      },