Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx-new

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

pageE/setting/updateVersion.vue

@@ -1,7 +1,7 @@
 <template>
 	<u-modal v-model="show" :show-cancel-button="is_focus_upgrade" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
 		<view class="u-update-content">
-			<rich-text :nodes="content"></rich-text>
+			<!-- <rich-text :nodes="content"></rich-text> -->
 		</view>
 	</u-modal>
 </template>
@@ -31,7 +31,7 @@
 				this.closeModal();
 			},
 			confirm() {
-				// ifdef APP-PLUS
+				// #ifdef APP-PLUS
 				if (plus.os.name == "Android") {
 					const appurl = "market://details?id=com.tencent.mobileqq"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
 					plus.runtime.openURL(appurl);
@@ -42,7 +42,7 @@
 				// endif
 				// ifdef H5
 				this.closeModal();
-				// endif
+				// #endif
 			},
 			closeModal() {
 				uni.navigateBack();