diff --git a/config/baseUrl.js b/config/baseUrl.js index 0571763..a670303 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -3,8 +3,8 @@ let socketUrl = ""; if (process.env.NODE_ENV === 'development') { //开发环境 // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试 - // baseUrl = "https://api.nuttyreading.com/"; // 线上正式 - baseUrl = "http://192.168.110.131:9200/pb/"; // 后端本地 + baseUrl = "https://api.nuttyreading.com/"; // 线上正式 + // baseUrl = "http://192.168.110.131:9200/pb/"; // 后端本地 } else if (process.env.NODE_ENV === 'production') { //生产环境 baseUrl = "https://api.nuttyreading.com/"; diff --git a/manifest.json b/manifest.json index 3ec64bd..37d72a2 100644 --- a/manifest.json +++ b/manifest.json @@ -13,8 +13,8 @@ } ], "sassImplementationName" : "node-sass", - "versionName" : "1.2.89", - "versionCode" : 1289, + "versionName" : "1.2.91", + "versionCode" : 1291, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/package-lock.json b/package-lock.json index 1e69e36..cb9e2ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14", "epubjs": "^0.3.93", "jquery": "^2.2.4", "qs": "^6.11.0", @@ -138,8 +138,8 @@ "link": true }, "node_modules/edu-core": { - "version": "1.0.13", - "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f", + "version": "1.0.14", + "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#eb9eccdc3d281fe84127a93e019650512859ff0c", "license": "ISC" }, "node_modules/epubjs": { @@ -730,7 +730,7 @@ "requires": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14", "epubjs": "^0.3.93", "jquery": "^2.2.4", "qs": "^6.11.0", @@ -823,8 +823,8 @@ } }, "edu-core": { - "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f", - "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13" + "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#eb9eccdc3d281fe84127a93e019650512859ff0c", + "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14" }, "epubjs": { "version": "0.3.93", @@ -1236,8 +1236,8 @@ } }, "edu-core": { - "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f", - "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13" + "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#eb9eccdc3d281fe84127a93e019650512859ff0c", + "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14" }, "epubjs": { "version": "0.3.93", diff --git a/package.json b/package.json index a0d650b..1b37625 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.13", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14", "epubjs": "^0.3.93", "jquery": "^2.2.4", "qs": "^6.11.0", diff --git a/pages.json b/pages.json index 9da58de..dc14700 100644 --- a/pages.json +++ b/pages.json @@ -612,6 +612,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/medicaldes/medurl", + "style": { + "navigationBarTitleText": "详细介绍", + "enablePullDownRefresh": false + } + }, { "path": "pages/medicaldes/recordDetail", "style": { diff --git a/pages/medicaldes/medicaldesDetail.vue b/pages/medicaldes/medicaldesDetail.vue index 5fcb0ff..b1c1761 100644 --- a/pages/medicaldes/medicaldesDetail.vue +++ b/pages/medicaldes/medicaldesDetail.vue @@ -26,11 +26,14 @@ - +