20221031提交

api/request.js

@@ -11,6 +11,12 @@ const request = ({ url, method, data, header }) => {
 			},
 			dataType: 'json',
 			success: function(res) {
+				if (res.data.errcode) {
+					wx.showToast({
+						title: res.data.details,
+						icon: 'error'
+					})
+				}
 				if (res.data.code !== 200) {
 					wx.showToast({
 						title: res.data.msg

pages.json

@@ -28,7 +28,7 @@
 		{
 			"path": "pages/illness/index",
 			"style": {
-				"navigationBarTitleText": "核酸检测报备"
+				"navigationBarTitleText": "核酸检测登记"
 			}
 		},
 		{

pages/activity/details.vue

@@ -107,6 +107,9 @@
 					this.buttonGroup[1].text = '活动已结束';
 					this.buttonGroup[1].backgroundColor = '#999';
 					this.buttonGroup[1].disable = true;
+					this.buttonGroup[0].backgroundColor = '#999';
+					this.buttonGroup[0].text = '报名已结束';
+					this.buttonGroup[0].disable = true;
 
 				}else if(res.data.status == 0) {
 					if(newDateTime < startActiveTime){
@@ -114,7 +117,6 @@
 						this.buttonGroup[1].backgroundColor = '#999';
 						this.buttonGroup[1].disable = true;		
 					}else{
-						console.log(statusInfo.status, 'statusInfo.status')
 						if(statusInfo.status){
 							this.buttonGroup[1].text = '获取积分';
 							this.buttonGroup[1].backgroundColor = '#ffa200';
@@ -159,7 +161,6 @@
 				}
 			},
 			async submitPhoto() {
-				console.log('获取积分')
 				uni.navigateTo({ url: `/pages/activity/uploadFiel?activityId=${this.activityId}` })
 			}
 		}

pages/activity/index.vue

@@ -38,20 +38,27 @@
 				more: 'more',
 				page: 0,
 				size: 12,
+				type: null
 			}
 		},
 		mounted() {
 			this.query();
 		},
+		onLoad(option) {
+			this.type = option.type;
+		},
 		methods: {
 			async query() {
 				this.page += 1;
 				this.more = 'loading';
-				const res = await request.getActivity({ pageNum: this.page, pageSize: this.size });
+				const res = await request.getActivity({ pageNum: this.page, pageSize: this.size, types: this.type });
+				const isDateTime = new Date().getTime();
 				res.rows?.map(e => {
+					const endTime = Date.parse(e.endTime);
+					const startTime = Date.parse(e.startTime);
 					if (e.status == 0) e.statusText = '未开始';
-					// if (e.status == 1) e.statusText = '进行中';
-					if (e.status == 2) e.statusText = '已结束';
+					if (e.status !== 3 && isDateTime < endTime && isDateTime > startTime) e.statusText = '进行中';
+					if (e.status == 3) e.statusText = '已结束';
 					e.image = BASE_URL.fileUrl + e.image;
 					return e;
 				})

pages/activity/uploadFiel.vue

@@ -5,7 +5,7 @@
 				<image :src="item" class="uploadImg"></image>
 				<image src="../../static/cw2.png" class="imgx" @click="imgx({ url: item })"></image>
 			</view>
-			<view class="upload" @click="upload('retrofit_over')">
+			<view class="upload" @click="upload('retrofit_over')" v-if="form.length < 4">
 				<image src="../../static/xj.png" class="xiangji"></image>
 			</view>
 		</view>
@@ -106,8 +106,8 @@
 
 <style>
 	.upload {
-		width: 85px;
-		height: 85px;
+		width: 75px;
+		height: 75px;
 		border-radius: 12px;
 		border: 1px solid #999;
 		margin: 10px 0;

pages/register/index.vue

@@ -19,7 +19,8 @@
 				</uni-forms-item>
 			</uni-forms>
 		</uni-section>
-		<uni-section title="地址信息" sub-title="（富裕街道居民请填写地址信息）" type="line">
+		<uni-data-checkbox class="isShowAddr" v-model="isShowAddr" multiple :localdata="isShowArr" />
+		<uni-section title="地址信息" sub-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>
@@ -49,6 +50,9 @@
 	export default {
 		data() {
 			return {
+				// 勾选成为居民
+				isShowAddr: 0,
+				isShowArr: [{ text: '是否富裕街道居民', value: 1 }],
 				role: '',
 				path: null,
 				formData: {},
@@ -103,6 +107,12 @@
 				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 }));
+				// 删除选项
+				// if (e.isUpdate) return;
+				delete this.formData.buildingId
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼栋选择
 			async selectChange(e) {
@@ -123,7 +133,10 @@
 					if (!isunit) numList.push(k);
 				});
 				this.$set(this.house, 'number', numList);
-				
+				// delete this.formData.buildingId
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 单元选择
 			unitChange(e) {
@@ -136,6 +149,10 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'floor', list);
+				// delete this.formData.buildingId
+				// delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼层选择
 			floorChange(e) {
@@ -147,6 +164,10 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'number', list);
+				// delete this.formData.buildingId
+				// delete this.formData.unit
+				// delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 门牌选择
 			houseChange(e) {
@@ -158,6 +179,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;
+							}
+						}
 						// 添加用户
 						const res = await request.addUser(this.formData);
 						uni.setStorageSync('token', res.data.token);
@@ -198,4 +230,9 @@
 	.phoneBox {
 		display: flex;
 	}
+	.isShowAddr {
+		width: 90%;
+		margin: 0 auto;
+		display: block;
+	}
 </style>

pages/user/familyInfo.vue

@@ -120,19 +120,19 @@
 			async setAddr(data) {
 				// 小区存在
 				if (data.estateId && data.estateId !== null) {
-					await this.onchange({ detail: { value: [{ value: data.estateId }] } });
+					await this.onchange({ detail: { value: [{ value: data.estateId }] }, isUpdate: true });
 				}
 				// 楼栋存在
 				if(data.buildingId && data.buildingId !== null) {
-				 	await this.selectChange({ detail: { value: [{ value: data.buildingId }] } });
+				 	await this.selectChange({ detail: { value: [{ value: data.buildingId }] }, isUpdate: true });
 				}
 				// 单元存在
 				if(data.unit && data.unit !== null) {
-					await this.unitChange({ detail: { value: [{ value: data.unit }] } });
+					await this.unitChange({ detail: { value: [{ value: data.unit }] }, isUpdate: true });
 				}
 				// 楼层存在
 				if(data.floor && data.floor !== null) {
-					await this.floorChange({ detail: { value: [{ value: data.floor }] } });
+					await this.floorChange({ detail: { value: [{ value: data.floor }] }, isUpdate: true });
 				}
 				// 门牌存在
 				if(data.houseId && data.houseId !== null) {
@@ -156,6 +156,12 @@
 				const res = await request.buildingList({ estateId: val });
 				const range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
 				this.$set(this.house, 'range', range);
+				// 删除选项
+				if (e.isUpdate) return;
+				delete this.formData.buildingId
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼栋选择
 			async selectChange(e) {
@@ -179,7 +185,11 @@
 					if (!isunit) numList.push(k);
 				});
 				this.$set(this.house, 'number', numList);
-				
+				// 删除选项
+				if (e.isUpdate) return;
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 单元选择
 			unitChange(e) {
@@ -195,6 +205,11 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'floor', list);
+				// 删除选项
+				if (e.isUpdate) return;
+				// delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼层选择
 			floorChange(e) {
@@ -206,6 +221,11 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'number', list);
+				// 删除选项
+				if (e.isUpdate) return;
+				// delete this.formData.unit
+				// delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 门牌选择
 			houseChange(e) {

pages/user/index.vue

@@ -110,19 +110,19 @@
 			async setAddr(data) {
 				// 小区存在
 				if (data.estateId && data.estateId !== null) {
-					await this.onchange({ detail: { value: [{ value: data.estateId }] } });
+					await this.onchange({ detail: { value: [{ value: data.estateId }] }, isUpdate: true });
 				}
 				// 楼栋存在
 				if(data.buildingId && data.buildingId !== null) {
-				 	await this.selectChange({ detail: { value: [{ value: data.buildingId }] } });
+				 	await this.selectChange({ detail: { value: [{ value: data.buildingId }] }, isUpdate: true });
 				}
 				// 单元存在
 				if(data.unit && data.unit !== null) {
-					await this.unitChange({ detail: { value: [{ value: data.unit }] } });
+					await this.unitChange({ detail: { value: [{ value: data.unit }] }, isUpdate: true });
 				}
 				// 楼层存在
 				if(data.floor && data.floor !== null) {
-					await this.floorChange({ detail: { value: [{ value: data.floor }] } });
+					await this.floorChange({ detail: { value: [{ value: data.floor }] }, isUpdate: true });
 				}
 				// 门牌存在
 				if(data.houseId && data.houseId !== null) {
@@ -151,6 +151,12 @@
 				const res = await request.buildingList({ estateId: val });
 				const range = res.rows.map(e => ({ ...e, text: `${e.number}栋`, value: e.buildingId }));
 				this.$set(this.house, 'range', range);
+				// 删除选项
+				if (e.isUpdate) return;
+				delete this.formData.buildingId
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼栋选择
 			async selectChange(e) {
@@ -174,7 +180,11 @@
 					if (!isunit) numList.push(k);
 				});
 				this.$set(this.house, 'number', numList);
-				
+				// 删除选项
+				if (e.isUpdate) return;
+				delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 单元选择
 			unitChange(e) {
@@ -190,6 +200,11 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'floor', list);
+				// 删除选项
+				if (e.isUpdate) return;
+				// delete this.formData.unit
+				delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 楼层选择
 			floorChange(e) {
@@ -201,6 +216,11 @@
 					if (!isunit) list.push(k);
 				});
 				this.$set(this.house, 'number', list);
+				// 删除选项
+				if (e.isUpdate) return;
+				// delete this.formData.unit
+				// delete this.formData.floor
+				delete this.formData.houseId
 			},
 			// 门牌选择
 			houseChange(e) {
@@ -234,7 +254,6 @@
 								duration: 2000
 							});
 						} else {
-							console.log(132)
 							// 修改用户
 							const res = await request.updateUser(this.formData);
 							uni.showToast({

unpackage/dist/build/mp-weixin/pages/activity/uploadFiel.wxss

@@ -1 +1 @@
-.upload{width:85px;height:85px;border-radius:12px;border:1px solid #999;margin:10px 0;margin-right:5px;background:#dadada}.xiangji{display:block;width:40px;height:40px;margin:25px auto}.uploadItem{display:flex;position:relative}.uploadImg{width:100%;height:100%;display:block;border-radius:12px;overflow:hidden}.uploadBox{display:flex;width:90%;margin:5px auto;flex-wrap:wrap}.imgx{width:15px;height:15px;position:absolute;top:-5px;right:-5px}.submit{width:90%;margin:25px auto}
+.upload{width:75px;height:75px;border-radius:12px;border:1px solid #999;margin:10px 0;margin-right:5px;background:#dadada}.xiangji{display:block;width:40px;height:40px;margin:25px auto}.uploadItem{display:flex;position:relative}.uploadImg{width:100%;height:100%;display:block;border-radius:12px;overflow:hidden}.uploadBox{display:flex;width:90%;margin:5px auto;flex-wrap:wrap}.imgx{width:15px;height:15px;position:absolute;top:-5px;right:-5px}.submit{width:90%;margin:25px auto}

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "核酸检测报备",
+  "navigationBarTitleText": "核酸检测登记",
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",

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

@@ -1 +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}
+.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}.isShowAddr{width:90%;margin:0 auto;display:block}

unpackage/dist/dev/mp-weixin/pages/activity/uploadFiel.wxss

@@ -1,7 +1,7 @@
 
 .upload {
-	width: 85px;
-	height: 85px;
+	width: 75px;
+	height: 75px;
 	border-radius: 12px;
 	border: 1px solid #999;
 	margin: 10px 0;

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "核酸检测报备",
+  "navigationBarTitleText": "核酸检测登记",
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",

unpackage/dist/dev/mp-weixin/pages/register/index.wxss

@@ -13,4 +13,9 @@
 .phoneBox {
 	display: flex;
 }
+.isShowAddr {
+	width: 90%;
+	margin: 0 auto;
+	display: block;
+}