1

config.js

@@ -21,7 +21,10 @@ module.exports = {
 			}, {
 				title: "会员协议",
 				code: "member_agreement"
-			},
+			}, {
+				title: "新人手册",
+				code: "new_people_text"
+			}
 		]
 	}
 }

pages/common/richview/index.vue

@@ -1,62 +1,74 @@
 <template>
-  <view class="container">
+	<view class="container">
-    <div class="body">
+		<navigation-bar-vue :title="title" style="width: 100%;" background-color="#ffffff"
-      <rich-text style="width: 100%" :nodes="richTextHtml" />
+			title-color="#000000"></navigation-bar-vue>
-    </div>
+		<div class="body">
-  </view>
+			<rich-text style="width: 100%" :nodes="richTextHtml" />
+		</div>
+	</view>
 </template>
 
 <script>
-import { getSiteConfig } from '@/api/system/config'
+	import navigationBarVue from '@/components/navigation/navigationBar.vue';
-import parser from 'rich-text-parser'
+	import {
-  export default {
+		getSiteConfig
-    filters: {
+	} from '@/api/system/config'
-      formatRichText(html) { // 控制小程序中图片大小
+	import parser from 'rich-text-parser'
-        // console.log(html)
+	export default {
-        const nodes = parser.getRichTextJson(html)
+		components: {
-        return nodes.children
+			navigationBarVue
-      }
+		},
-    },
+		filters: {
-    data() {
+			formatRichText(html) { // 控制小程序中图片大小
-      return {
+				// console.log(html)
-        richTextHtml: '',
+				const nodes = parser.getRichTextJson(html)
-      }
+				return nodes.children
-    },
+			}
-    onLoad(options) {
+		},
-      uni.setNavigationBarTitle({
+		data() {
-        title: options.title
+			return {
-      })
+				title: "",
-      this.getRichTextHtml(options.code)
+				richTextHtml: '',
-    },
+			}
-    methods:{
+		},
-      async getRichTextHtml(code){
+		onLoad(options) {
-        let that = this
+			this.title = options.title
-        getSiteConfig({code:code}).then(res => {
+			this.getRichTextHtml(options.code)
-          let json = JSON.parse(res.data)
+		},
-          that.richTextHtml = json[0].value
+		methods: {
-        }).catch((e) => {
+			async getRichTextHtml(code) {
-          uni.showToast({
+				let that = this
-            icon: 'error',
+				getSiteConfig({
-            duration: 2000,
+					code: code
-            title: e
+				}).then(res => {
-          });
+					let json = JSON.parse(res.data)
-        })
+					that.richTextHtml = json[0].value
-      },
+				}).catch((e) => {
-    }
+					uni.showToast({
-  }
+						icon: 'error',
+						duration: 2000,
+						title: e
+					});
+				})
+			},
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.container {
+	.container {
-  height: 100%;
+		padding-top: calc(90rpx + var(--status-bar-height));
-  padding: 20rpx;
+		height: 100%;
-  background: white;
+		padding-left: 20rpx;
-  display: flex;
+		padding-right: 20rpx;
-  flex-direction: column;
+		background: white;
-  .body{
+		display: flex;
-    flex: 1;
+		flex-direction: column;
-    height: 0;
+
-    overflow: auto;
+		.body {
-  }
+			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 95rpx);
-}
+			overflow-y: scroll;
+			overflow: auto;
+		}
+	}
 </style>

pages/mine/mine-index.vue

@@ -122,12 +122,6 @@
 						<view class="text-dom">名片</view>
 						<uni-icons type="right" color="#623109" size="12"></uni-icons>
 					</view>
-					<view class="menu-item" v-if="'02'==localUserType" @click="goBlackList()">
-						<!-- <image src="@/static/mine/mingpian.png" mode="aspectFit"></image> -->
-						<image src="@/static/mine/caise/mingpian.png" mode="aspectFit"></image>
-						<view class="text-dom">名片</view>
-						<uni-icons type="right" color="#623109" size="12"></uni-icons>
-					</view>
 				</view>
 			</view>
 		</view>
@@ -135,22 +129,22 @@
 			<view class="box-room">
 				<view class="detail-title">其他信息</view>
 				<view class="menu-box">
-					<view class="menu-item">
+					<view class="menu-item" @click="viewNewPeople()">
 						<!-- <image src="@/static/mine/xinrenshouce.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/shouce.png" mode="aspectFit"></image>
 						<view>新人手册</view>
 					</view>
-					<view class="menu-item">
+					<view class="menu-item" @click="toggle('center')">
 						<!-- <image src="@/static/mine/kefu.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/kefu.png" mode="aspectFit"></image>
 						<view>联系客服</view>
 					</view>
-					<view class="menu-item">
+					<view class="menu-item" @click="toggle('center')">
 						<!-- <image src="@/static/mine/gognzhonghao.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/weixin.png" mode="aspectFit"></image>
 						<view>公众号</view>
 					</view>
-					<view class="menu-item">
+					<view class="menu-item" @click="toggle('center')">
 						<!-- <image src="@/static/mine/jairushequ.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/shequ.png" mode="aspectFit"></image>
 						<view>加入社区</view>
@@ -163,6 +157,12 @@
 				</view>
 			</view>
 		</view>
+		<!-- 普通弹窗 -->
+		<uni-popup ref="popup" background-color="#fff">
+			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+				<image src="@/static/mine/erweima.jpg" mode="aspectFit"></image>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -200,6 +200,7 @@
 		data() {
 			return {
 				localUserType: this.nowUserType,
+				globalConfig: getApp().globalData.config,
 				//是否已开通会员
 				ifHasCard: false,
 				userInfo: {}
@@ -224,6 +225,11 @@
 			}
 		},
 		methods: {
+			toggle(type) {
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
 			getBloggerDetail() {
 				bloggerDetail(this.userInfo.userId).then(res => {
 					this.userInfo.tfansNum = res.data.tfansNum.toString()
@@ -249,12 +255,6 @@
 			goMyCard() {
 				this.$tab.navigateTo('/pages/mine/card/my-card')
 			},
-			/**
-			 * 跳转黑名单列表
-			 */
-			goBlackList() {
-				this.$tab.navigateTo('/pages/mine/set/black-list')
-			},
 			/**
 			 * 跳转建议列表
 			 */
@@ -275,12 +275,29 @@
 			 */
 			goEdit() {
 				this.$tab.navigateTo('/pages/mine/set/my-info')
+			},
+			viewNewPeople() {
+				this.$tab.navigateTo(
+					`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[3].title}&code=${this.globalConfig.appInfo.agreements[3].code}`
+				)
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.uni-popup {
+		top: 0 !important;
+	}
+
+	.vue-ref {
+		top: 0 !important;
+	}
+
+	.popup-content {
+		height: 100% !important;
+	}
+
 	.mine-container {
 		width: 100%;
 		color: #363636;