Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-tobacco-lims-web into dev

ecosystem.config.js

@@ -6,7 +6,7 @@
 module.exports = {
   apps: [
     {
-      name: 'pt-sys',
+      name: 'pt-tobacco',
       script: './node_modules/nuxt-start/bin/nuxt-start.js',
       instances: 2,
       max_memory_restart: '512M',

env/.env.devtest

-// 请求地址
-WEB_URL=http://sys.devtest.patzn.com
-BASE_URL=http://api.devtest.patzn.com
-SSO_URL=http://sso.devtest.patzn.com
-STATIC_URL=http://static.patzn.com
-NODE_ENV=devtest

env/.env.pertest

+// 请求地址
+WEB_URL=http://tobacco.pertest.patzn.com
+BASE_URL=http://api.pertest.patzn.com
+SSO_URL=http://sso.pertest.patzn.com
+STATIC_URL=http://static.patzn.com
+NODE_ENV=pertest

package.json

@@ -9,7 +9,7 @@
     "build": "nuxt build",
     "start": "cross-env NODE_ENV=production node server/index.js",
     "test": "cross-env NODE_ENV=testing node server/index.js",
-    "devtest": "cross-env NODE_ENV=devtest node server/index.js",
+    "pertest": "cross-env NODE_ENV=pertest node server/index.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "precommit": "npm run lint"
@@ -49,7 +49,7 @@
     "vue-runtime-helpers": "^1.1.2",
     "vue-server-renderer": "2.6.11",
     "vue-signature-pad": "^1.1.18",
-    "vue-template-compiler": "^2.6.11",
+    "vue-template-compiler": "2.6.11",
     "vuedraggable": "^2.23.2",
     "webstomp-client": "^1.2.6",
     "xlsx": "^0.15.6"