feat: 增加详情介绍链接

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 = "https://api.nuttyreading.com/"; // 线上正式
-	baseUrl = "http://192.168.110.131:9200/pb/"; // 后端本地
+	// baseUrl = "http://192.168.110.131:9200/pb/"; // 后端本地
 } else if (process.env.NODE_ENV === 'production') {
 	//生产环境
 	  baseUrl = "https://api.nuttyreading.com/";

manifest.json

@@ -13,8 +13,8 @@
         }
     ],
     "sassImplementationName" : "node-sass",
-    "versionName" : "1.2.89",
+    "versionName" : "1.2.91",
-    "versionCode" : 1289,
+    "versionCode" : 1291,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true

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",
+			"version": "1.0.14",
-			"resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#b5ece8b8abfeba98428f6e2191efae3312b5036f",
+			"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",
+					"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.13"
+					"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",
+			"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.13"
+			"from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.14"
 		},
 		"epubjs": {
 			"version": "0.3.93",

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",

pages.json

@@ -612,6 +612,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/medicaldes/medurl",
+			"style": {
+				"navigationBarTitleText": "详细介绍",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/medicaldes/recordDetail",
 			"style": {

pages/medicaldes/medicaldesDetail.vue

@@ -26,11 +26,14 @@
 					<view class="item" v-html="prescriptDetail.city_name">
 					</view>
 				</uni-section>
-				<uni-section class="mb-10" titleFontSize="18px" title="详细介绍" type="line"
+				<uni-section class="mb-10" titleFontSize="18px" title="说明" type="line"
 					v-if="prescriptDetail.content && prescriptDetail.content != ''">
 					<view class="item" v-html="prescriptDetail.content">
 					</view>
 				</uni-section>
+				<div class="detail-link-wrap" v-if="prescriptDetail.url && prescriptDetail.url != ''">
+					<text class="detail-link" @click="openDetailUrl">详细介绍&gt;&gt;</text>
+				</div>
 
 				<!-- <uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
 					<view class="item" v-if="prescriptDetail.compatibility && prescriptDetail.compatibility != ''" v-html="prescriptDetail.compatibility">
@@ -92,6 +95,11 @@
 					}
 				});
 			},
+			openDetailUrl() {
+				uni.navigateTo({
+					url: '/pages/medicaldes/medurl?url=' + encodeURIComponent(this.prescriptDetail.url)
+				})
+			},
 			// 方剂详情
 			getDetail() {
 				$http.request({
@@ -168,6 +176,18 @@
 		display: flex;
 	}
 
+	.detail-link-wrap {
+		padding: 10rpx 20rpx;
+		padding-bottom: 20rpx;
+
+		.detail-link {
+			font-size: 14px;
+			font-weight: bold;
+			color: #007aff;
+			text-decoration: none;
+		}
+	}
+
 	/deep/ .uni-section-header__decoration.line {
 		background-color: #18bc37;
 	}

pages/medicaldes/medurl.vue

@@ -23,7 +23,25 @@
 			};
 		},
 		onLoad(e) {
-			this.id = uni.getStorageSync('prescriptUrl')
+			this.id = e.url ? decodeURIComponent(e.url) : uni.getStorageSync('prescriptUrl')
+			// #ifdef APP-PLUS
+			const pages = getCurrentPages()
+			 const page = pages[pages.length - 1];
+			 const currentWebview = page.$getAppWebview()
+			 currentWebview.setStyle({
+			 	titleNView: {
+			 		buttons: [{
+			 			float: 'right',
+			 			type: 'close',
+			 			onclick: function() {				
+							uni.navigateBack({
+								delta: 1
+							});				
+			 			}
+			 		}]
+			 	}
+			 })
+			// #endif
 		},
 		computed: {