From df24ad9a5d480f49807796810b397aaf460181d1 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 24 Jun 2022 21:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/guide/index.vue | 351 +++++++++++++++++++++---------------------
 pages/index/index.vue |  13 +-
 pages/visit/book.vue  |  18 +--
 3 files changed, 192 insertions(+), 190 deletions(-)

diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index dd1c0c3..2de5a15 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -1,193 +1,188 @@
-<template>
-	<view class="content">
-		<view class="contentlist">
-			<view class="content_box">
-				<view class="content_title" @click="showwhat('shownotice')">
-					
-					<view class="infoicon">
-						<u-icon size="16" color="#42b983" name="info-circle-fill"></u-icon>
-						<text>参观须知</text>
+<template>
+	<view class="content">
+		<view class="contentlist">
+			<block v-for="(item,index) in noticeList" :key="index">
+				<view class="content_box">
+					<view class="content_title" @click="showwhat(index)">
+
+						<view class="infoicon">
+							<u-icon size="16" color="#42b983" name="info-circle-fill"></u-icon>
+							<text>{{item.name}}</text>
+						</view>
+						<u-icon v-if="!item.shownotice" size="16" name="arrow-down"></u-icon>
+						<u-icon v-if="item.shownotice" size="16" name="arrow-up"></u-icon>
 					</view>
-					<u-icon v-if="!show.shownotice" size="16" name="arrow-down"></u-icon>
-					<u-icon v-if="show.shownotice" size="16" name="arrow-up"></u-icon>
-				</view>
-				<view class="content_info" v-if="show.shownotice">
-					<rich-text style="text-indent: 2em;" :nodes="notice.content"></rich-text>
-				</view>
-			</view>
-			<view class="content_box">
-				<view class="content_title" @click="showwhat('showask')">
-					<view class="infoicon">
-						<u-icon size="16" color="#42b983" name="info-circle-fill"></u-icon>
-						<text>常见问题</text>
+					<view class="content_info" v-if="item.shownotice">
+						<rich-text style="text-indent: 2em;" :nodes="item.content"></rich-text>
 					</view>
-					<u-icon v-if="!show.showask" size="16" name="arrow-down"></u-icon>
-					<u-icon v-if="show.showask" size="16" name="arrow-up"></u-icon>
-					
-				</view>
-				<view class="content_info" v-if="show.showask">
-					<rich-text style="text-indent: 2em;" :nodes="ask.content"></rich-text>
-				</view>
-			</view>
-			<view class="content_box">
-				<view class="content_title"  @click="showwhat('showform')">
-					
+				</view>
+			</block>
+			<view class="content_box">
+				<view class="content_title" @click="showwhat('showform')">
+
 					<view class="infoicon">
 						<u-icon size="16" color="#42b983" name="info-circle-fill"></u-icon>
 						<text>意见建议</text>
 					</view>
 					<u-icon v-if="!show.showform" size="16" name="arrow-down"></u-icon>
 					<u-icon v-if="show.showform" size="16" name="arrow-up"></u-icon>
-					
-				</view>
-				<view class="content_info" v-if="show.showform">
-					<u-form labelPosition="top" :model="form">
-						<u-form-item label="手机号" prop="mobile" labelWidth="60px" required>
-							<u-input v-model="form.mobile" placeholder="请输入手机号"></u-input>
-						</u-form-item>
-						<u-form-item label="内容" prop="content" labelWidth="60px" required>
-							<u-textarea v-model="form.content" placeholder="请输入内容"></u-textarea>
-						</u-form-item>
-					</u-form>
-					<u-button type="primary" @click="tosubmit">确认提交</u-button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				notice: {},
-				ask: {},
-				form: {
-					mobile: "",
-					content: ""
+
+				</view>
+				<view class="content_info" v-if="show.showform">
+					<u-form labelPosition="top" :model="form">
+						<u-form-item label="手机号" prop="mobile" labelWidth="60px" required>
+							<u-input v-model="form.mobile" placeholder="请输入手机号"></u-input>
+						</u-form-item>
+						<u-form-item label="内容" prop="content" labelWidth="60px" required>
+							<u-textarea v-model="form.content" placeholder="请输入内容"></u-textarea>
+						</u-form-item>
+					</u-form>
+					<u-button type="primary" @click="tosubmit">确认提交</u-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				notice: {},
+				ask: {},
+				form: {
+					mobile: "",
+					content: ""
+				},
+				show: {
+					shownotice: false,
+					showask: false,
+					showform: false
+				},
+				urls: {
+					1: '/api/mobile/other/visit-notice-index',
+					4: '/api/mobile/other/ask-index'
 				},
-				show:{
-					shownotice:false,
-					showask:false,
-					showform:false
-				},
-				urls: {
-					1: '/api/mobile/other/visit-notice-index',
-					4: '/api/mobile/other/ask-index'
-				}
-			}
-		},
-		onLoad() {
-			var that = this;
-			that.loadList(1, 1)
-			that.loadList(1, 4)
-		},
+				noticeList: []
+			}
+		},
+		onLoad() {
+			var that = this;
+			that.loadList(1, 1)
+			//that.loadList(1, 4)
+		},
 		methods: {
-			showwhat(type){
-				// for(var m in this.show){
-				// 	if(m==type){
-						this.show[type] = !this.show[type]
-				// 	}
-				// }
-			},
-			loadList(page, type) {
-				var that = this;
-				this.util.request({
-					api: this.urls[type],
-					data: {
-						page: page
-					},
-					utilSuccess: function(res) {
-						if (type == 1)
-							that.notice = res.data[0];
-						if (type == 4)
-							that.ask = res.data[0];
-					},
-					utilFail: function(res) {
-						uni.showToast({
-							icon: "none",
-							title: res
-						})
-					}
-				})
-			},
-			tosubmit() {
-				let that = this;
-				if (this.util.isNull(that.form.mobile)) {
-					this.util.toast("请填写手机号！");
-					return false;
-				} else {
-					if (!uni.$u.test.mobile(that.form.mobile)) {
-						this.util.toast("请填写正确的手机号！");
-						return false;
-					}
-				}
-				if (this.util.isNull(that.form.content)) {
-					this.util.toast("请填写内容！");
-					return false;
-				}
-				this.util.request({
-					api: '/api/mobile/other/tip-store',
-					data: this.form,
-					method: "POST",
-					utilSuccess: function(res) {
-						console.log(res)
-						uni.showToast({
-							icon: "none",
-							title: "投诉建议成功",
-							complete() {
-								uni.reLaunch({
-									url: "/pages/success/success?from=feed"
-								})
-							}
-						})
-					},
-					utilFail: function(res) {
-						that.util.toast(res);
-					}
-				})
-
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background: #f7f6f4;
-	}
-
-	.content {
-		padding:0 24rpx 60rpx 24rpx;
+			showwhat(type) {
+				if (type == "showform")
+					this.show[type] = !this.show[type];
+				else
+					this.noticeList[type].shownotice = !this.noticeList[type].shownotice;
+				this.$forceUpdate();
+			},
+			loadList(page, type) {
+				var that = this;
+				this.util.request({
+					api: this.urls[type],
+					data: {
+						page: page
+					},
+					utilSuccess: function(res) {
+						if (type == 1)
+							that.notice = res.data[0];
+						if (type == 4)
+							that.ask = res.data[0];
+						for (var mod of res.data) {
+							mod.shownotice = false;
+						}
+						that.noticeList = res.data
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							icon: "none",
+							title: res
+						})
+					}
+				})
+			},
+			tosubmit() {
+				let that = this;
+				if (this.util.isNull(that.form.mobile)) {
+					this.util.toast("请填写手机号！");
+					return false;
+				} else {
+					if (!uni.$u.test.mobile(that.form.mobile)) {
+						this.util.toast("请填写正确的手机号！");
+						return false;
+					}
+				}
+				if (this.util.isNull(that.form.content)) {
+					this.util.toast("请填写内容！");
+					return false;
+				}
+				this.util.request({
+					api: '/api/mobile/other/tip-store',
+					data: this.form,
+					method: "POST",
+					utilSuccess: function(res) {
+						console.log(res)
+						uni.showToast({
+							icon: "none",
+							title: "投诉建议成功",
+							complete() {
+								uni.reLaunch({
+									url: "/pages/success/success?from=feed"
+								})
+							}
+						})
+					},
+					utilFail: function(res) {
+						that.util.toast(res);
+					}
+				})
+
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: #f7f6f4;
+	}
+
+	.content {
+		padding: 0 24rpx 60rpx 24rpx;
 		min-height: 100vh;
-		background: #fff;
-	}
-
-	.content_box {
-		/* background: #FFFFFF;
-		border-radius: 16rpx;
-		padding: 30rpx 21rpx;
-		margin-bottom: 25rpx; */
-	}
-	.content_title {
-		padding: 26rpx 0;
-		border-bottom: #ddd 1rpx solid;
-		font-size: 32rpx;
+		background: #fff;
+	}
+
+	.content_box {
+		/* background: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 30rpx 21rpx;
+		margin-bottom: 25rpx; */
+	}
+
+	.content_title {
+		padding: 26rpx 0;
+		border-bottom: #ddd 1rpx solid;
+		font-size: 32rpx;
 		color: #351C1B;
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
+	}
+
+	.infoicon view {
+		display: inline-block !important;
+		margin-right: 20rpx
+	}
+
+	.content_info {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #828282;
+		line-height: 40rpx;
+		padding-top: 32rpx;
 	}
-	.infoicon view{
-		display: inline-block!important;
-		margin-right:20rpx
-	}
-
-	.content_info {
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		color: #828282;
-		line-height: 40rpx;
-		padding-top: 32rpx;
-	}
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f4d86bd..1da595e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -126,8 +126,11 @@
 				<view class="mpopup-title">
 					{{currentNotice.name}}
 				</view>
-				<view class="mpopup-content" style="padding: 40rpx 20rpx;">
-					<rich-text :nodes="currentNotice.content"></rich-text>
+				<view class="mpopup-content" style="padding: 40rpx 20rpx;">
+					<view v-html="currentNotice.content" style="font-size:32rpx;line-height: 50rpx;text-indent: 2em;">
+						
+					</view>
+					<!-- <rich-text :nodes="currentNotice.content"></rich-text> -->
 				</view>
 			</view>
 		</u-popup>
@@ -313,7 +316,8 @@
 				})
 			},
 			openInfo(e) {
-				this.currentNotice = this.listNotice[e];
+				this.currentNotice = this.listNotice[e];
+				this.currentNotice.content = this.currentNotice.content.replace(/\<p/gi,"<p class='richp'");
 				this.showInfo = true;
 			},
 			closeInfo() {
@@ -573,5 +577,8 @@
 	.footer-img {
 		width: 421rpx;
 		height: 364rpx;
+	}
+	.richp{
+		margin-bottom:10rpx;
 	}
 </style>
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index a4fcedf..2c87570 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -160,21 +160,15 @@
 						</view>
 					</view>
 				</view>
-				<view class="box-card">
+				<!-- <view class="box-card">
 					<u-form-item label="特殊情况" labelWidth="80" prop="leader" ref="leader">
-							<!-- <u-radio-group v-model="specialtype">
-								<u-radio ref="specialradio" width="50%" @change="radioChange" activeColor="#EF9525"
-									 name='3' label="">
-								</u-radio>
-								
-							</u-radio-group> -->
 							<u-checkbox-group @change="radioChange">
 								<u-checkbox activeColor="#EF9525" label="乘坐轮椅等行动不便者" v-model="specialtype" name='1' shape="circle"></u-checkbox>
 							</u-checkbox-group>
 					</u-form-item>
 					
 					
-				</view>
+				</view> -->
 				<view class="box-card" v-if="type=='team'">
 					<view class="box-card-title">
 						{{type=="team"?"领队人信息":"联系人信息"}}
@@ -236,7 +230,13 @@
 						</u-form-item>
 						<u-form-item label="证件号码" labelWidth="80" prop="idcard" ref="idcard" required>
 							<u-input placeholder="请输入证件号码" v-model="formUser.idcard"></u-input>
-						</u-form-item>
+						</u-form-item>
+						<u-form-item label="特殊情况" labelWidth="80" prop="leader" ref="leader">
+							<u-checkbox-group @change="radioChange">
+								<u-checkbox activeColor="#EF9525" label="乘坐轮椅等行动不便者" v-model="specialtype" name='1' shape="circle"></u-checkbox>
+							</u-checkbox-group>
+						</u-form-item>
+						
 						<u-form-item label="手机号" labelWidth="80" prop="from.mobile" ref="mobile">
 							<u-input placeholder="请输入手机号" v-model="formUser.mobile"></u-input>
 						</u-form-item>