Преглед изворни кода

Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

张松 пре 5 година
родитељ
комит
62aa3e1153
3 измењених фајлова са 15 додато и 14 уклоњено
  1. 9 4
      package-lock.json
  2. 1 1
      package.json
  3. 5 9
      src/util/appConst.js

+ 9 - 4
package-lock.json

@@ -4795,7 +4795,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5210,7 +5211,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5266,6 +5268,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5309,12 +5312,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

+ 1 - 1
package.json

@@ -2,7 +2,7 @@
   "name": "h5maker",
   "version": "1.0.0",
   "description": "h5编辑器",
-  "author": "郑国榕 <zhengguorong@bluemoon.com.cn>",
+  "author": "",
   "private": true,
   "scripts": {
     "dev": "cross-env NODE_ENV=development node build/dev-server.js",

+ 5 - 9
src/util/appConst.js

@@ -1,23 +1,19 @@
 console.log('process.env.NODE_ENV'+process.env.NODE_ENV)
-let BACKEND_DOMAIN = 'http://106.15.201.221:9998'
-let QINIU_DOMAIN = 'https://dm-api.elab-plus.cn'
-let TOUFANGBAO_PATH = 'http://h5test.elab-plus.com/touFangBao/#/pages/preview?mgid='
-let DIAOYANBAO_PATH = 'http://192.168.4.249:8080/#/preview?mgid='
+let BACKEND_DOMAIN = '';
+let QINIU_DOMAIN = '';
+let DIAOYANBAO_PATH = '';
 if (process.env.NODE_ENV === 'test') {
   //测试
   BACKEND_DOMAIN = 'http://gatewaytest.elab-plus.com/elab-diaoyanbao/'
   QINIU_DOMAIN = 'https://gatewaytest.elab-plus.com'
-  TOUFANGBAO_PATH = 'http://h5test.elab-plus.com/touFangBao/#/pages/preview?mgid='
-  DIAOYANBAO_PATH = 'https://dm-mng3.elab-plus.cn/diaoyanbao/#/preview?mgid='
+  DIAOYANBAO_PATH = 'http://h5test.elab-plus.com/diaoyanbao/#/preview?mgid='
 } else if (process.env.NODE_ENV === 'development') {//开发
   BACKEND_DOMAIN = 'http://192.168.0.16:5318'
   // QINIU_DOMAIN = 'http://139.196.5.59:5555'
-  TOUFANGBAO_PATH = 'http://192.168.4.240:9099/#/pages/preview?mgid='
   DIAOYANBAO_PATH = 'http://192.168.4.249:8080/#/preview?mgid='
 }else if (process.env.NODE_ENV === 'uat') {//UAT
   BACKEND_DOMAIN = 'http://192.168.0.16:5318'
   // QINIU_DOMAIN = 'http://139.196.5.59:5555'
-  TOUFANGBAO_PATH = 'http://192.168.4.240:9099/#/pages/preview?mgid='
   DIAOYANBAO_PATH = 'http://192.168.4.249:8080/#/preview?mgid='
 }else{//PROD
   //生产PROD
@@ -30,4 +26,4 @@ export default {
   QINIU_DOMAIN,
   TOUFANGBAO_PATH,
   DIAOYANBAO_PATH
-}
+}