Merge pull request 'gdpaoup' (#238) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/238

pageE/mine/ArticleDetails.vue

@@ -16,8 +16,10 @@
 				<text class="tips">已是最新版本</text>
 			</view>
 		</view>
-        <u-popup v-model="show" v-if="type == 2">
-            <view>出淤泥而不染，濯清涟而不妖</view>
+        <u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
+            <view class="u-content">
+                <rich-text :nodes="nodes"></rich-text>
+            </view>
         </u-popup>
 	</view>
 </template>
@@ -26,11 +28,11 @@ import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
-			version: "",
-			phone_type: "",
 			type: 1,
 			nodes: "",
-            show: false,
+			version: "",
+			show: false,
+			phone_type: "",
 		}
 	},
 	onLoad(option) {
@@ -43,6 +45,17 @@ export default {
 		this.getVersion();
 		this.phone_type = this.$u.os();
 	},
+	onBackPress() {
+		if (this.show) {
+				this.show = !this.show;
+		} else {
+				return false;
+		}
+		return true;
+	},
+	onNavigationBarButtonTap(e) {
+		console.log(e);
+	},
 	methods: {
 		setTitle(title){
 			uni.setNavigationBarTitle({
@@ -129,4 +142,10 @@ page {
 		font-size: 22rpx;
 	}
 }
+.u-content {
+    padding: 20rpx;
+    font-size: 30rpx;
+    text-indent: 1rem;
+    line-height: 1.2;
+}
 </style>