20221015提交

api/family.js

@@ -16,7 +16,7 @@ const getFamilyInfoDetails = async (data) => {
 }
 // 报备状态 
 const membersStatus = async (data) => {
-	const res = await request.get({ url: `/nat/members-status`, data });
+	const res = await request.post({ url: `/nat/members-status`, data });
 	return res.data;
 }
 // 当前任务
@@ -31,12 +31,17 @@ const filing = async (data) => {
 }
 // 获取家庭成员列表 待审核，含本人
 const getApplyUser = async (data) => {
-	const res = await request.get({ url: `/api/resident/req/list`, data });
+	const res = await request.get({ url: `/resident/req/list`, data });
 	return res.data;
 }
 // 获取待审核信息详情
 const getReqInfoDetails = async (data) => {
-	const res = await request.get({ url: `/api/resident/req/${data.residentReqId}` });
+	const res = await request.get({ url: `/resident/req/${data.residentReqId}` });
 	return res.data;
 }
-export default { familyInfo, getFamilyInfo, filing, membersStatus, runningTask, getFamilyInfoDetails, getApplyUser, getReqInfoDetails };
+// 所有待报备
+const getUserAll = async (data) => {
+	const res = await request.get({ url: `/wx/resident/members-for-reporting` });
+	return res.data;
+}
+export default { familyInfo, getFamilyInfo, filing, membersStatus, runningTask, getFamilyInfoDetails, getApplyUser, getReqInfoDetails, getUserAll };

api/resident.js

@@ -1,7 +1,7 @@
 import request from './request.js';
 // 查询地址下拉树结构 -- 到小区
 const addrTreeSelect = async (data) => {
-	const res = await request.get({ url: `/api/wx/addr/tree`, data });
+	const res = await request.get({ url: `/wx/addr/tree`, data });
 	return res.data;
 }
 // 楼栋查询

api/user.js

@@ -1,7 +1,7 @@
 import request from './request.js';
 // 查询地址下拉树结构 -- 到小区
 const addrTreeSelect = async (data) => {
-	const res = await request.get({ url: `/api/wx/addr/tree`, data });
+	const res = await request.get({ url: `/wx/addr/tree`, data });
 	return res.data;
 }
 // 楼栋查询
@@ -16,12 +16,12 @@ const houseList = async (data) => {
 }
 // 添加用户信息
 const addUser = async (data) => {
-	const res = await request.post({ url: `/api/user/register`, data });
+	const res = await request.post({ url: `/user/register`, data });
 	return res.data;
 }
 // 添加用户信息
 const updateUser = async (data) => {
-	const res = await request.post({ url: `/api/user/edit`, data });
+	const res = await request.post({ url: `/user/edit`, data });
 	return res.data;
 }
 // 获取用户信息

env.js

@@ -1,7 +1,7 @@
 const ENV_API_URL = {
 	development: {
-		// url: 'https://fuyu.scapp.cn/wx-api/api',
-		url: 'http://192.168.0.70:7070/api',
+		url: 'https://fuyu.scapp.cn/wx-api/api',
+		// url: 'http://192.168.0.70:7070/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/'
 	},
 	production: {

manifest.json

@@ -57,7 +57,7 @@
             "postcss" : true
         },
         "usingComponents" : true,
-		"lazyCodeLoading": "requiredComponents"
+        "lazyCodeLoading" : "requiredComponents"
     },
     "vueVersion" : "2"
 }

pages.json

@@ -58,7 +58,8 @@
 		{
 			"path": "pages/details/cmsinfo",
 			"style": {
-				"navigationBarTitleText": "详情"
+				"navigationBarTitleText": "详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/details/cmsinfo.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="container">
-		<!-- <uni-title type="h1" align="center" :title="info.title || info.noticeTitle"></uni-title>
-		<text class="time">创建时间：{{ info.createTime }}</text> -->
+		<view class="title" :style="{ height: height + 'px', lineHeight: height + 'px', paddingTop: top + 'px' }">
+			<uni-icons @click="back" class="back" color="#fff" type="back" size="25"></uni-icons>
+			<text>{{ info.title }}</text>
+		</view>
+		<!-- <text class="time">创建时间：{{ info.createTime }}</text> -->
 		<rich-text image-menu-prevent="true" :nodes="info.content || info.noticeContent" class="content"></rich-text>
 		<!-- <view class="content" v-html="info.content || info.noticeContent"> -->
 		</view>
@@ -19,18 +22,35 @@
 			return {
 				id: '',
 				info: null,
+				height: 60,
+				top: 25,
 			}
 		},
 		async mounted() {
 			const res = await request.getArticleDetail({ id: this.id });
 			this.info = res.data;
 			await request.addBlogViews({ id: this.id });
+			const client = wx.getMenuButtonBoundingClientRect();
+			this.height = client.height;
+			this.top = client.top;
 		},
-		methods: {}
+		methods: {
+			back() {
+				uni.navigateBack();
+			}
+		}
 	}
 </script>
 
 <style>
+	.title {
+		display: flex;
+		color: #fff;
+		background-color: #fd6b18;
+	}
+	.back {
+		margin: 0 15px 0 5px;
+	}
 	.time {
 		width: 100%;
 		text-align: center;

pages/details/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<uni-title type="h1" align="center" :title="info.title || info.noticeTitle"></uni-title>
+		<uni-title type="h1" class="title" align="center" :title="info.title || info.noticeTitle"></uni-title>
 		<text class="time">创建时间：{{ info.createTime }}</text>
 		<rich-text image-menu-prevent="true" :nodes="info.content || info.noticeContent" class="content"></rich-text>
 		<!-- <view class="content" v-html="info.content || info.noticeContent"> -->
@@ -50,4 +50,12 @@
 		width: 90%;
 		margin: 10px auto;
 	}
+	.title {
+		width: 90%;
+		margin: 0 auto;
+		display: block;
+	}
+	.uni-title__base {
+		line-height: 1.2em !important;
+	}
 </style>

pages/illness/index.vue

@@ -46,10 +46,11 @@
 		},
 		methods: {
 			async query() {
-				// const { userId } = uni.getStorageSync('userinfo');
-				const familyInfo = await requestFamily.getFamilyInfo();
+				const residentIds = [];
+				const familyInfo = await requestFamily.getUserAll();
+				familyInfo.rows.forEach(e => residentIds.push(e.residentId))
 				if (familyInfo.code == 200) {
-					const membersStatus = await requestFamily.membersStatus({ natTaskId: this.natTaskId });
+					const membersStatus = await requestFamily.membersStatus({ residentIds, natTaskId: this.natTaskId });
 					familyInfo.rows = familyInfo.rows.map(e => {
 						const resident = membersStatus.data.find(j => j.residentId == e.residentId);
 						return { ...e, status: resident?.status || 0 };

pages/illness/receive.vue

@@ -1,36 +1,26 @@
 <template>
 	<view class="container">
-		<view class="uni-padding-wrap uni-common-mt">
-			<uni-segmented-control :current="current" :values="items" :style-type="styleType" :active-color="activeColor" @clickItem="onClickItem" />
-		</view>
-		<view v-if="current == 0">
-			<uni-card class="addUser">
-				<uni-list :border="false">
-					<uni-list-item :showExtraIcon="true" :extra-icon="extraIcon" title="添加成员" clickable @click="onClick"></uni-list-item>
-				</uni-list>
-			</uni-card>
-			<uni-list :border="true">
-				<view :id="item && item.residentId" class="delBox" @touchstart="touchStart" @touchend="touchEnd" v-for="(item, index) in list" :key="index" >
-					<uni-list-chat :class="{ left: isId == item.residentId }" class="item" :avatar="item.avatar || '/static/user1.png'" :title="item.name" :note="item.phone" badge-positon="left">
-					</uni-list-chat>
-					<uni-icons @click="userbtn(item)"  color="#fff" class="del compose" type="compose" size="28"></uni-icons>
-					<uni-icons :class="{ left: isId !== item.residentId }" @click="delbtn(item)" color="#fff" class="del" type="trash-filled" size="28"></uni-icons>
-				</view>
+		<uni-card class="addUser">
+			<uni-list :border="false">
+				<uni-list-item :showExtraIcon="true" :extra-icon="extraIcon" title="添加成员(代领)" clickable @click="onClick"></uni-list-item>
 			</uni-list>
-		</view>
-		<!-- 居民审核信息 -->
-		<view v-if="current == 1">
-			<uni-list :border="true">
-				<view :id="item && item.residentReqId" class="delBox" v-for="(item, index) in list" :key="index" >
-					<uni-list-chat :class="{ left: isId == item.residentReqId }" class="item" :avatar="item.avatar || '/static/user1.png'" :title="item.name" :note="item.phone" badge-positon="left">
-						<uni-tag v-if="item.reqStatus == 0" :text="item.reqStatusText" :circle="true" type="primary" />
-						<uni-tag v-if="item.reqStatus == 1" :text="item.reqStatusText" :circle="true" type="success" />
-						<uni-tag v-if="item.reqStatus == 2" :text="item.reqStatusText" :circle="true" type="error" />
-						<text class="chat-custom-text" v-if="item.rejectReason !== null">{{ item.rejectReason }}</text>
-					</uni-list-chat>
-				</view>
-			</uni-list>
-		</view>
+		</uni-card>
+		<text class="notes">注：代领富裕街道家庭成员</text>
+		<uni-list :border="true">
+			<view :id="item && item.residentId" :name="item.reqStatus" class="delBox" @touchstart="touchStart" @touchend="touchEnd" v-for="(item, index) in list" :key="index" >
+				<uni-list-chat
+					:class="{ left: isId == item.residentId, is0: item.reqStatus == 0, is1: item.reqStatus == 1, is2: item.reqStatus == 2, }"
+					class="item"
+					:avatar="item.avatar || '/static/user1.png'"
+					:title="item.name"
+					:note="item.reqStatusText"
+					badge-positon="left">
+					<button type="primary" size="mini" @click="userbtn(item)">详情</button>
+				</uni-list-chat>
+				<!-- <uni-icons @click="userbtn(item)"  color="#fff" class="del compose" type="compose" size="28"></uni-icons> -->
+				<uni-icons :class="{ left: isId !== item.residentId }" @click="delbtn(item)" color="#fff" class="del" type="trash-filled" size="28"></uni-icons>
+			</view>
+		</uni-list>
 	</view>
 </template>
 
@@ -47,48 +37,41 @@
 					type: 'plusempty'
 				},
 				list: [],
+				// applylist: [],
 				natTaskId: '',
 				membersStatus: [],
-				// 选项卡参数
-				items: ['成员信息', '成员审核状态'],
-				activeColor: '#dd524d',
-				styleType: 'text',
-				current: 0
 			}
 		},
-		async mounted() {
-			this.query();
-		},
-		onShow() {
+		mounted() {},
+		async onShow() {
 			this.isId = '';
+			this.query();
 		},
 		methods: {
-			// 标签页点击
-			async onClickItem(e) {
-				if (this.current !== e.currentIndex) {
-					this.current = e.currentIndex
-				}
-				if (e.currentIndex == 1) {
-					const res = await requestFamily.getApplyUser();
-					this.list = res.data.map(e => {
-						if (e.reqStatus == 0) e.reqStatusText = '审核中';
-						if (e.reqStatus == 1) e.reqStatusText = '已通过';
-						if (e.reqStatus == 2) e.reqStatusText = '已拒绝';
-						return e;
-					});
-					return;
-				}
-				this.query();
-			},
 			async query() {
 				const familyInfo = await requestFamily.getFamilyInfo();
-				if (familyInfo.code == 200) {
-					this.list = familyInfo.rows;
-				}
+				const res = await requestFamily.getApplyUser();
+				res.data.forEach(e => {
+					 const isTrue = familyInfo.rows.find(k => e.residentReqId == k.residentId);
+					 if (isTrue) {
+						familyInfo.rows.map(j => {
+							const data = e.residentReqId == j.residentId
+							if (data) return { ...j, reqStatus: data.reqStatus };
+							return j;
+						})
+						return;
+					}
+					familyInfo.rows.push({ ...e, residentId: e.residentReqId }) 
+				})
+				this.list = familyInfo.rows.map(e => {
+					if (e.reqStatus == 0) e.reqStatusText = '待审核';
+					if (e.reqStatus == 1) e.reqStatusText = '已通过';
+					if (e.reqStatus == 2) e.reqStatusText = '已拒绝';
+					return e;
+				});
 			},
 			// 滑动开始
 			touchStart(e) {
-				console.log(e)
 				if (e.touches.length == 1) {
 					//设置触摸起始点水平方向位置
 					this.startX=e.touches[0].clientX;
@@ -96,6 +79,8 @@
 			},
 			// 滑动结束
 			touchEnd(e) {
+				const data = this.list.find(j => j.residentId == e.currentTarget.id);
+				if (data.reqStatus !== '1') return;
 				if (e.changedTouches.length == 1) {
 					//手指移动结束后水平位置
 					var endX = e.changedTouches[0].clientX;
@@ -120,6 +105,7 @@
 						duration: 2000,
 					});
 				}
+				this.query();
 			},
 			// 添加
 			onClick() {
@@ -129,8 +115,14 @@
 			},
 			// 修改
 			userbtn(e) {
+				if (e.reqStatus == '1') {
+					uni.navigateTo({
+						url: `/pages/user/familyInfo?residentId=${e.residentId}`
+					})
+					return;
+				}
 				uni.navigateTo({
-					url: `/pages/user/familyInfo?residentId=${e.residentId}`
+					url: `/pages/user/familyInfo?residentReqId=${e.residentReqId}`
 				})
 			}
 		}
@@ -170,11 +162,11 @@
 	}
 	.del {
 		display: block;
-		width: 50px;
+		width: 70px;
 		background: red;
 	}
 	.right {
-		margin-right: -100px;
+		margin-right: -70px;
 	}
 	.uni-icons {
 		display: block;
@@ -183,9 +175,25 @@
 		line-height: 2.3em;
 	}
 	.left {
-		margin-left: -100px;
+		margin-left: -70px;
 	}
 	.compose {
 		background: #1aad19;
 	}
+	.notes {
+		width: 90%;
+		display: block;
+		margin: 5px auto;
+		color: #ff8319;
+		font-size: 12px;
+	}
+	.is0 .uni-list-chat__content-note{
+		color: #1aad19;
+	}
+	.is1 .uni-list-chat__content-note{
+		color: #2979ff;
+	}
+	.is2 .uni-list-chat__content-note{
+		color: red;
+	}
 </style>

pages/index/index.vue

@@ -102,7 +102,7 @@
 
 <style>
 	.swiper {
-		height: 150px;
+		height: 30vw;
 		overflow: hidden;
 	}
 	.uni-section-content {

pages/user/familyInfo.vue

@@ -19,8 +19,8 @@
 				<uni-forms-item label="小区选择">
 					<uni-data-picker v-model="formData.estateId" :map="pickerMap" :localdata="items" placeholder="请选择地址" popup-title="请选择地址" @change="onchange"></uni-data-picker>
 				</uni-forms-item>
-				<uni-forms-item label="楼栋选择">
-					<uni-data-picker v-model="formData.buildingId" :localdata="range" placeholder="请选择小区" popup-title="请选择小区" @change="selectChange"></uni-data-picker>
+				<uni-forms-item label="楼栋选择" v-if="house.range && house.range.length > 0">
+					<uni-data-picker v-model="formData.buildingId" :localdata="house.range" placeholder="请选择小区" popup-title="请选择小区" @change="selectChange"></uni-data-picker>
 				</uni-forms-item>
 				<uni-forms-item label="单元选择" v-if="house.unit && house.unit.length > 0">
 					<uni-data-picker v-model="formData.unit" :localdata="house.unit" placeholder="请选择单元" popup-title="请选择单元" @change="unitChange"></uni-data-picker>
@@ -28,7 +28,7 @@
 				<uni-forms-item label="楼层选择" v-if="house.floor && house.unit.length > 0">
 					<uni-data-picker v-model="formData.floor" :localdata="house.floor" placeholder="请选择楼层" popup-title="请选择楼层" @change="floorChange"></uni-data-picker>
 				</uni-forms-item>
-				<uni-forms-item label="门牌选择" v-if="house.number && house.number !== ''">
+				<uni-forms-item label="门牌选择" v-if="house.number && house.number.length > 0">
 					<uni-data-picker v-model="formData.houseId" :localdata="house.number" placeholder="请选择门牌" popup-title="请选择门牌" @change="houseChange"></uni-data-picker>
 				</uni-forms-item>
 			</uni-forms>
@@ -46,8 +46,8 @@
 			return {
 				formData: {},
 				sexs: [
-					{ text: '男', value: 0 },
-					{ text: '女', value: 1},
+					{ text: '男', value: 1 },
+					{ text: '女', value: 0 },
 				],
 				items: [],
 				pickerMap: {
@@ -90,6 +90,10 @@
 				this.queryInfo();
 				return;
 			}
+			if (option.residentReqId) {
+				this.queryReqInfo();
+				return;
+			}
 			// 设置默认地址信息
 			const userinfo = uni.getStorageSync('userinfo');
 			const { estateId, buildingId, unit, floor, houseId } = userinfo;
@@ -102,6 +106,11 @@
 			this.items = res.data;
 		},
 		methods: {
+			async queryReqInfo() {
+				const userinfo = await requestFamily.getReqInfoDetails({ residentReqId: this.residentReqId });
+				this.formData = userinfo.data;
+				this.setAddr(userinfo.data);
+			},
 			async queryInfo() {
 				const userinfo = await requestFamily.getFamilyInfoDetails({ residentId: this.residentId });
 				this.formData = userinfo.data;
@@ -111,8 +120,9 @@
 			async setAddr(data) {
 				// 小区存在
 				if (data.estateId && data.estateId !== null) {
-					const res = await request.buildingList({ estateId: data.estateId });
-					this.range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+					// const res = await request.buildingList({ estateId: data.estateId });
+					// this.range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+					await this.onchange({ detail: { value: [{ value: data.estateId }] } });
 				}
 				// 楼栋存在
 				if(data.buildingId && data.buildingId !== null) {
@@ -131,14 +141,30 @@
 					await this.houseChange({ detail: { value: [{ value: data.houseId }] } });
 				}
 			},
+			// 初始化选择器
+			initPicker(e) {
+				if (e.includes('range')) this.$set(this.house, 'range', []);
+				if (e.includes('unit')) this.$set(this.house, 'unit', []);
+				if (e.includes('floor')) this.$set(this.house, 'floor', []);
+				if (e.includes('number')) this.$set(this.house, 'number', []);
+			},
+			// 小区选择
 			async onchange(e) {
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker(['range', 'unit', 'floor', 'number']);
+					return;
+				}
 				const val = e.detail.value[e.detail.value.length - 1].value;
 				const res = await request.buildingList({ estateId: val });
-				this.range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+				const range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+				this.$set(this.house, 'range', range);
 			},
 			// 楼栋选择
 			async selectChange(e) {
-				if (!e || e == '' || e.detail.value.length <= 0) return;
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker(['unit', 'floor', 'number']);
+					return;
+				};
 				const res = await request.houseList({ buildingId: e.detail.value[0].value });
 				this.building = res.rows;
 				const list = [];
@@ -159,7 +185,10 @@
 			},
 			// 单元选择
 			unitChange(e) {
-				if (!e || e == '' || e.detail.value.length <= 0) return;
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker([ 'floor', 'number']);
+					return;
+				}
 				this.unit = e.detail.value[0].value;
 				const list = [];
 				const floor = this.building.filter(j => j.unit == e.detail.value[0].value).map(j => ({ ...j, text: `${j.floor}层`, value: j.floor }));
@@ -190,15 +219,17 @@
 			async submit(ref) {
 				this.$refs[ref].validate(async (err, formdata) => {
 					if (!err) {
-						if (!this.formData.houseId || this.formData.houseId == '') {
+						// 判断勾选后是否添加地址
+						if (!this.formData.estateId || !this.formData.buildingId || !this.formData.houseId == null) {
 							uni.showToast({
-								title: '请选择地址信息',
+								title: '请填写完整地址信息',
+								icon: 'error',
 								duration: 2000,
 							});
 							return;
 						}
 						// 居民修改
-						this.formData.reqType = this.formData.residentId ? 1 : 0;
+						this.formData.reqType = this.formData.residentId || this.formData.residentReqId ? 1 : 0;
 						const res = await requestFamily.familyInfo(this.formData);
 						if (res.code == 200) {
 							uni.showToast({

pages/user/index.vue

@@ -19,13 +19,14 @@
 				</uni-forms-item>
 			</uni-forms>
 		</uni-section>
-		<uni-section title="地址信息" type="line">
+		<uni-data-checkbox class="isShowAddr" v-model="isShowAddr" multiple :localdata="isShowArr" />
+		<uni-section title="地址信息" type="line" v-if="isShowAddr.length > 0">
 			<uni-forms ref="addrForm" :modelValue="formData" :label-width="90">
 				<uni-forms-item label="小区选择">
 					<uni-data-picker v-model="formData.estateId" :map="pickerMap" :localdata="items" placeholder="请选择地址" popup-title="请选择地址" @change="onchange"></uni-data-picker>
 				</uni-forms-item>
-				<uni-forms-item label="楼栋选择">
-					<uni-data-picker v-model="formData.buildingId" :localdata="range" placeholder="请选择小区" popup-title="请选择小区" @change="selectChange"></uni-data-picker>
+				<uni-forms-item label="楼栋选择" v-if="house.range && house.range.length > 0">
+					<uni-data-picker v-model="formData.buildingId" :localdata="house.range" placeholder="请选择小区" popup-title="请选择小区" @change="selectChange"></uni-data-picker>
 				</uni-forms-item>
 				<uni-forms-item label="单元选择" v-if="house.unit && house.unit.length > 0">
 					<uni-data-picker v-model="formData.unit" :localdata="house.unit" placeholder="请选择单元" popup-title="请选择单元" @change="unitChange"></uni-data-picker>
@@ -33,7 +34,7 @@
 				<uni-forms-item label="楼层选择" v-if="house.floor && house.unit.length > 0">
 					<uni-data-picker v-model="formData.floor" :localdata="house.floor" placeholder="请选择楼层" popup-title="请选择楼层" @change="floorChange"></uni-data-picker>
 				</uni-forms-item>
-				<uni-forms-item label="门牌选择" v-if="house.number && house.number !== ''">
+				<uni-forms-item label="门牌选择" v-if="house.number && house.number.length > 0">
 					<uni-data-picker v-model="formData.houseId" :localdata="house.number" placeholder="请选择门牌" popup-title="请选择门牌" @change="houseChange"></uni-data-picker>
 				</uni-forms-item>
 			</uni-forms>
@@ -61,7 +62,7 @@
 					text: 'label',
 					value: 'interId'
 				},
-				range: [],
+				// range: [],
 				house: {},
 				building: [],
 				unit: '',
@@ -86,6 +87,9 @@
 						}]
 					},
 				},
+				// 勾选成为居民
+				isShowAddr: 0,
+				isShowArr: [{ text: '是否富裕街道居民', value: 1 }],
 			}
 		},
 		async mounted() {
@@ -100,13 +104,13 @@
 				const userinfo = uni.getStorageSync('userinfo');
 				this.formData = userinfo;
 				this.setAddr(userinfo);
+				this.isShowAddr = [1];
 			},
 			// 设置地址
 			async setAddr(data) {
 				// 小区存在
 				if (data.estateId && data.estateId !== null) {
-					const res = await request.buildingList({ estateId: data.estateId });
-					this.range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+					await this.onchange({ detail: { value: [{ value: data.estateId }] } });
 				}
 				// 楼栋存在
 				if(data.buildingId && data.buildingId !== null) {
@@ -125,6 +129,13 @@
 					await this.houseChange({ detail: { value: [{ value: data.houseId }] } });
 				}
 			},
+			// 初始化选择器
+			initPicker(e) {
+				if (e.includes('range')) this.$set(this.house, 'range', []);
+				if (e.includes('unit')) this.$set(this.house, 'unit', []);
+				if (e.includes('floor')) this.$set(this.house, 'floor', []);
+				if (e.includes('number')) this.$set(this.house, 'number', []);
+			},
 			// 获取手机号
 			async decryptPhoneNumber(e) {
 				const res = await requestLogin.getPhone({ code: e.detail.code, appid: appid });
@@ -132,14 +143,21 @@
 			},
 			// 小区选择
 			async onchange(e) {
-				if (!e || e == '' || e.detail.value.length <= 0) return;
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker(['range', 'unit', 'floor', 'number']);
+					return;
+				}
 				const val = e.detail.value[e.detail.value.length - 1].value;
 				const res = await request.buildingList({ estateId: val });
-				this.range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+				const range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
+				this.$set(this.house, 'range', range);
 			},
 			// 楼栋选择
 			async selectChange(e) {
-				if (!e || e == '' || e.detail.value.length <= 0) return;
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker(['unit', 'floor', 'number']);
+					return;
+				};
 				const res = await request.houseList({ buildingId: e.detail.value[0].value });
 				this.building = res.rows;
 				const list = [];
@@ -160,7 +178,10 @@
 			},
 			// 单元选择
 			unitChange(e) {
-				if (!e || e == '' || e.detail.value.length <= 0) return;
+				if (!e || e == '' || e.detail.value.length <= 0) {
+					this.initPicker([ 'floor', 'number']);
+					return;
+				}
 				this.unit = e.detail.value[0].value;
 				const list = [];
 				const floor = this.building.filter(j => j.unit == e.detail.value[0].value).map(j => ({ ...j, text: `${j.floor}层`, value: j.floor }));
@@ -191,6 +212,17 @@
 			async submit(ref) {
 				this.$refs[ref].validate(async (err, formdata) => {
 					if (!err) {
+						// 判断勾选后是否添加地址
+						if (this.isShowAddr.length > 0) {
+							if (!this.formData.estateId || !this.formData.buildingId || !this.formData.houseId == null) {
+								uni.showToast({
+									title: '请填写完整地址信息',
+									icon: 'error',
+									duration: 2000,
+								});
+								return;
+							}
+						}
 						if (this.role == 'guest') {
 							// 添加用户
 							const res = await request.addUser(this.formData);
@@ -199,22 +231,20 @@
 							uni.setStorageSync('role', res.data.role);
 							uni.showToast({
 								title: '添加成功',
-								duration: 2000,
+								duration: 2000
 							});
-							if (this.path && this.path !== null) {
-								uni.redirectTo({
-									url: this.path
-								})
-							}
 						} else {
+							console.log(132)
 							// 修改用户
 							const res = await request.updateUser(this.formData);
 							uni.showToast({
 								title: '修改成功',
-								duration: 2000,
+								duration: 2000
 							});
 						}
-						uni.navigateBack()
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1000)
 					}
 				})
 			},
@@ -240,4 +270,9 @@
 	.phoneBox {
 		display: flex;
 	}
+	.isShowAddr {
+		width: 90%;
+		margin: 0 auto;
+		display: block;
+	}
 </style>

unpackage/dist/build/mp-weixin/app.json

@@ -2,34 +2,20 @@
   "pages": [
     "pages/index/index",
     "pages/my/index",
-    "pages/login/index",
     "pages/service/index",
-    "pages/policy/index"
-  ],
-  "subPackages": [
-    {
-      "root": "pagescms",
-      "pages": [
-        "/details/index",
-        "/notice/index"
-      ]
-    },
-    {
-      "root": "pagesinfo",
-      "pages": [
-        "/user/index",
-        "/user/familyInfo"
-      ]
-    },
-    {
-      "root": "pagesillness",
-      "pages": [
-        "/illness/index",
-        "/illness/come",
-        "/illness/testingRoom"
-      ]
-    }
+    "pages/policy/index",
+    "pages/illness/index",
+    "pages/illness/come",
+    "pages/illness/receive",
+    "pages/illness/testingRoom",
+    "pages/details/index",
+    "pages/details/cmsinfo",
+    "pages/notice/index",
+    "pages/user/index",
+    "pages/user/familyInfo",
+    "pages/register/index"
   ],
+  "subPackages": [],
   "window": {
     "navigationBarTextStyle": "white",
     "navigationBarTitleText": "uni-app",
@@ -68,5 +54,6 @@
       }
     ]
   },
+  "lazyCodeLoading": "requiredComponents",
   "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "详情",
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/details/cmsinfo.wxml

@@ -0,0 +1 @@
+<view class="container"><rich-text class="content" image-menu-prevent="true" nodes="{{info.content||info.noticeContent}}"></rich-text></view>

unpackage/dist/build/mp-weixin/pages/details/index.wxml

@@ -0,0 +1 @@
+<view class="container"><uni-title class="title" vue-id="45983bea-1" type="h1" align="center" title="{{info.title||info.noticeTitle}}" bind:__l="__l"></uni-title><text class="time">{{"创建时间："+info.createTime}}</text><rich-text class="content" image-menu-prevent="true" nodes="{{info.content||info.noticeContent}}"></rich-text></view>

unpackage/dist/build/mp-weixin/pages/details/index.wxss

@@ -0,0 +1 @@
+.time{width:100%;text-align:center;display:block;font-size:12px}.content{display:block;width:90%;margin:10px auto}.title{width:90%;margin:0 auto;display:block}.uni-title__base{line-height:1.2em!important}

unpackage/dist/build/mp-weixin/pages/illness/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "核酸检测报备",
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-chat": "/uni_modules/uni-list/components/uni-list-chat/uni-list-chat"
+  }
+}

unpackage/dist/build/mp-weixin/pagesillness/illness/index.json

@@ -1,10 +1,12 @@
 {
-  "navigationBarTitleText": "核酸检测报备",
+  "navigationBarTitleText": "家庭成员",
   "usingComponents": {
+    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control",
     "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
     "uni-list-chat": "/uni_modules/uni-list/components/uni-list-chat/uni-list-chat",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-tag": "/uni_modules/uni-tag/components/uni-tag/uni-tag"
   }
 }

unpackage/dist/build/mp-weixin/pages/login/index.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "登录",
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/login/index.wxml

@@ -1 +0,0 @@
-<view class="container"><text class="intro">login</text></view>

unpackage/dist/build/mp-weixin/pages/register/index.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "注册用户",
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker"
+  }
+}

unpackage/dist/build/mp-weixin/pagesinfo/user/familyInfo.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "家人资料",
+  "navigationBarTitleText": "成员资料",
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
@@ -7,7 +7,6 @@
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
     "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
-    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker",
-    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker"
   }
 }

unpackage/dist/build/mp-weixin/pagesinfo/user/index.json

@@ -7,7 +7,6 @@
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
     "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
-    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker",
-    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker"
   }
 }

unpackage/dist/build/mp-weixin/pages/user/index.wxss

@@ -0,0 +1 @@
+.uni-section{padding-bottom:10px;margin-bottom:10px}.uni-select__selector{z-index:999!important}.uni-forms, .btn{width:90%;margin:10px auto}.phoneBox{display:flex}

unpackage/dist/build/mp-weixin/pagescms/details/index.wxml

@@ -1 +0,0 @@
-<view class="container"><uni-title vue-id="148b8f5d-1" type="h1" align="center" title="{{info.title||info.noticeTitle}}" bind:__l="__l"></uni-title><text class="time">{{"创建时间："+info.createTime}}</text><rich-text class="content" image-menu-prevent="true" nodes="{{info.content||info.noticeContent}}"></rich-text></view>

unpackage/dist/build/mp-weixin/project.config.json

@@ -1,36 +1,29 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
     "es6": true,
     "postcss": true,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx6cc481d94edbe039",
+  "libVersion": "2.27.0",
+  "appid": "wxfb8ee68c5e9a63e8",
   "projectname": "Applet",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
-}