20221114提交

api/activity.js

@@ -27,4 +27,8 @@ const getPhotos = async ({ activityId }) => {
 	const res = await request.get({ url: `/activity/log-details/${activityId}` });
 	return res.data;
 }
-export default { getActivity, getdetails, getstatus, report, offReport, uploadImgs, getPhotos };
+const getTypeList = async ({ alias }) => {
+	const res = await request.get({ url: `/cms/type/sublist/${alias}` });
+	return res.data;
+}
+export default { getActivity, getdetails, getstatus, report, offReport, uploadImgs, getPhotos, getTypeList };

pages.json

@@ -49,6 +49,12 @@
 				"navigationBarTitleText": "检测点查询"
 			}
 		},
+		{
+			"path": "pages/illness/testingRoomList",
+			"style": {
+				"navigationBarTitleText": "检测点列表"
+			}
+		},
 		{
 			"path": "pages/details/index",
 			"style": {

pages/activity/details.vue

@@ -5,6 +5,7 @@
 			<uni-list>
 				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[0]" title="报名时间" :rightText="`${info.regStartTime}至${info.regEndTime}`"></uni-list-item>
 				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[0]" title="活动时间" :rightText="`${info.startTime}至${info.endTime}`"></uni-list-item>
+				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[1]" title="招募人数" :rightText="info.regMaxCount + '人'"></uni-list-item>
 				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[1]" title="负责人" :rightText="info.sponsorName"></uni-list-item>
 				<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon[2]" title="联系电话" :rightText="info.sponsorPhone"></uni-list-item>
 			</uni-list>
@@ -71,12 +72,13 @@
 				this.info = res.data;
 				this.statusInfo = statusInfo.status
 				const newDateTime = new Date().getTime();
-				const isTime = Date.parse(res.data.regEndTime);
+				const endTime = Date.parse(res.data.regEndTime);
 				const startTime = Date.parse(res.data.regStartTime);
 				const startActiveTime = Date.parse(res.data.startTime);
+				const endActiveTime = Date.parse(res.data.endTime);
 
 				// 报名按钮状态设置
-				if (!statusInfo.status) {
+				if (!statusInfo.status && newDateTime > startTime && newDateTime < endTime && newDateTime > startActiveTime && newDateTime < endActiveTime) {
 					this.buttonGroup[0].backgroundColor = '#ff0000';
 					this.buttonGroup[0].text = '报名活动';
 					delete this.buttonGroup[0].status
@@ -84,19 +86,19 @@
 					this.buttonGroup[1].disable = true;
 					this.buttonGroup[1].backgroundColor = '#999';
 				}
-				if (statusInfo.status) {
+				if (statusInfo.status && newDateTime > startTime && newDateTime < endTime && newDateTime > startActiveTime && newDateTime < endActiveTime) {
 					this.buttonGroup[0].backgroundColor = '#999';
 					this.buttonGroup[0].text = '取消报名';
 					this.buttonGroup[0].status = true;
 					delete this.buttonGroup[1].disable;
 					this.buttonGroup[1].backgroundColor = '#ffa200';
 				}
-				if (newDateTime < startTime) {
+				if (newDateTime < startTime || newDateTime < startActiveTime) {
 					this.buttonGroup[0].backgroundColor = '#999';
 					this.buttonGroup[0].text = '报名未开始';
 					this.buttonGroup[0].disable = true;
 				}
-				if (newDateTime > isTime) {
+				if (newDateTime > endTime || newDateTime > endActiveTime) {
 					this.buttonGroup[0].backgroundColor = '#999';
 					this.buttonGroup[0].text = '报名已结束';
 					this.buttonGroup[0].disable = true;
@@ -111,22 +113,28 @@
 					this.buttonGroup[0].text = '报名已结束';
 					this.buttonGroup[0].disable = true;
 
-				}else if(res.data.status == 0) {
+				}
+				if(res.data.status == 0) {
 					if(newDateTime < startActiveTime){
 						this.buttonGroup[1].text = '活动未开始';
 						this.buttonGroup[1].backgroundColor = '#999';
 						this.buttonGroup[1].disable = true;		
-					}else{
-						if(statusInfo.status){
-							this.buttonGroup[1].text = '获取积分';
-							this.buttonGroup[1].backgroundColor = '#ffa200';
-							delete this.buttonGroup[1].disable;
-						}else{
-							this.buttonGroup[1].text = '活动进行中';
-							this.buttonGroup[1].backgroundColor = '#999';
-							this.buttonGroup[1].disable = true;	
-						}						
 					}
+					if(newDateTime > endActiveTime){
+						this.buttonGroup[1].text = '活动已结束';
+						this.buttonGroup[1].backgroundColor = '#999';
+						this.buttonGroup[1].disable = true;		
+					}
+					if(statusInfo.status && newDateTime < endActiveTime && newDateTime > startActiveTime){
+						this.buttonGroup[1].text = '获取积分';
+						this.buttonGroup[1].backgroundColor = '#ffa200';
+						delete this.buttonGroup[1].disable;
+					}
+					if (!statusInfo.status && newDateTime < endActiveTime && newDateTime > startActiveTime){
+						this.buttonGroup[1].text = '活动进行中';
+						this.buttonGroup[1].backgroundColor = '#999';
+						this.buttonGroup[1].disable = true;	
+					}	
 				}
 			},
 			buttonClick(e) {

pages/activity/index.vue

@@ -13,13 +13,13 @@
 				<template v-slot:body>
 					<view class="slot-body" @click="btn(item)">
 						<view class="slot-box slot-title">{{ item.topic }}</view>
-						<view class="slot-box slot-text">人数限制: {{ item.regMaxCount }}人</view>
+						<!-- <view class="slot-box slot-text">人数限制: {{ item.regMaxCount }}人</view> -->
 					</view>
 				</template>
 				<!-- 自定义 footer-->
 				<template v-slot:footer>
 					<view class="slot-footer" @click="btn(item)">
-						<uni-icons class="footerIcon" type="forward" size="35"></uni-icons>
+						<uni-icons class="footerIcon" type="forward" size="25"></uni-icons>
 					</view>
 				</template>
 			</uni-list-item>
@@ -56,9 +56,9 @@
 				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 == 0 || isDateTime < startTime) e.statusText = '未开始';
 					if (e.status !== 3 && isDateTime < endTime && isDateTime > startTime) e.statusText = '进行中';
-					if (e.status == 3) e.statusText = '已结束';
+					if (e.status == 3 || isDateTime > endTime) e.statusText = '已结束';
 					e.image = BASE_URL.fileUrl + e.image;
 					return e;
 				})
@@ -85,8 +85,8 @@
 	position: relative;
 }
 .slot-image {
-	width: 70px;
-	height: 70px;
+	width: 50px;
+	height: 50px;
 }
 .status {
 	position: absolute;
@@ -104,7 +104,7 @@
 	font-size: 1.2em;
 	font-weight: 600;
 	color: #000;
-	line-height: 1.5em;
+	line-height: 2em;
 }
 .slot-text {
 	font-size: 14px;
@@ -112,6 +112,6 @@
 	line-height: 3em;
 }
 .footerIcon {
-	line-height: 4em;
+	line-height: 3em;
 }
 </style>

pages/illness/testingRoom.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="container">
-		<uni-card :title="istitle" class="cardBox">
-			<uni-list border class="list">
-				<uni-list-item v-for="(item, index) in dataList" :key="index" :note="item.note" :ellipsis="1" :title="item.title" link clickable  @click="listItemBtn(item)" ></uni-list-item>
-			</uni-list>
-			<uni-load-more :status="more" />
+		<uni-card>
+			<uni-section v-for="(item, index) in dataList" :title="item.typeName" :key="index" type="line">
+				<uni-list border class="list">
+					<uni-list-item v-for="(i, idx) in item.children" :key="idx" :ellipsis="1" :title="i.typeName" link clickable  @click="listItemBtn(i)" ></uni-list-item>
+				</uni-list>
+			</uni-section>
+			<!-- <uni-load-more :status="more" /> -->
 		</uni-card>
 	</view>
 </template>
@@ -13,14 +15,14 @@
 	import request from '../../api/cms.js';
 	export default {
 		onLoad: function (option) {
-			
 		},
 		data() {
 			return {
 				dataList: [],
-				more: 'more',
+				// more: 'more',
 				page: 0,
-				size: 20
+				size: 20,
+				type: ''
 			}
 		},
 		async mounted() {
@@ -28,25 +30,41 @@
 		},
 		methods: {
 			listItemBtn(e) {
-				uni.navigateTo({ url: `/pages/details/cmsinfo?id=${e.id}` });
+				console.log(e)
+				uni.navigateTo({ url: `/pages/illness/testingRoomList?alias=${e.alias}` });
 			},
 			// 查询列表函数
 			async getList() {
 				this.page += 1;
 				this.more = 'loading';
-				const res = await request.getArticleList({ pageNum: this.page, pageSize: this.size, typeName: 'hsjc' });
-				this.dataList.push(...res.rows)
+				const res = await request.getTypeList({ alias: 'hsjc' });
+				const data = res.data.map(e => {
+					const list = e.ancestors.split(',')
+					if (list.length <= 2) e.parent = true;
+					return e;
+				})
+				const list = data.filter(j => j.parent).map(e => this.children(e, data))
+				this.dataList = list;
 				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
-				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+				// this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
 			},
+			children(item, list) {
+				const childrenList = list.filter(j => j.parentId == item.typeId).map(e => this.children(e, list));
+				// 如果当前子菜单项存在 就添加children属性
+				if (childrenList.length > 0) {
+				  return { ...item, children: childrenList };
+				}
+				// 不存在就不添加
+				return { ...item };
+			}
 		},
 		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
-		onReachBottom() {
-			if(this.more != 'noMore') {
-				this.more = 'more';
-				this.getList();
-			}
-		}
+		// onReachBottom() {
+		// 	if(this.more != 'noMore') {
+		// 		this.more = 'more';
+		// 		this.getList();
+		// 	}
+		// }
 	}
 </script>
 

pages/illness/testingRoomList.vue

@@ -0,0 +1,55 @@
+<template>
+	<view class="container">
+		<uni-card :title="istitle" class="cardBox">
+			<uni-list border class="list">
+				<uni-list-item v-for="(item, index) in dataList" :key="index" :note="item.note" :ellipsis="1" :title="item.title" link clickable  @click="listItemBtn(item)" ></uni-list-item>
+			</uni-list>
+			<uni-load-more :status="more" />
+		</uni-card>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/cms.js';
+	export default {
+		onLoad: function (option) {
+			this.alias = option.alias;
+		},
+		data() {
+			return {
+				dataList: [],
+				more: 'more',
+				page: 0,
+				size: 20,
+				alias: ''
+			}
+		},
+		async mounted() {
+			await this.getList();
+		},
+		methods: {
+			listItemBtn(e) {
+				uni.navigateTo({ url: `/pages/details/cmsinfo?id=${e.id}` });
+			},
+			// 查询列表函数
+			async getList() {
+				this.page += 1;
+				this.more = 'loading';
+				const res = await request.getArticleList({ pageNum: this.page, pageSize: this.size, typeName: this.alias });
+				this.dataList.push(...res.rows)
+				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
+				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+			},
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {
+			if(this.more != 'noMore') {
+				this.more = 'more';
+				this.getList();
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

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

@@ -8,6 +8,7 @@
     "pages/illness/vaccines",
     "pages/illness/receive",
     "pages/illness/testingRoom",
+    "pages/illness/testingRoomList",
     "pages/details/index",
     "pages/details/cmsinfo",
     "pages/notice/index",

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

@@ -3,8 +3,8 @@
 	position: relative;
 }
 .slot-image {
-	width: 70px;
-	height: 70px;
+	width: 50px;
+	height: 50px;
 }
 .status {
 	position: absolute;
@@ -22,7 +22,7 @@
 	font-size: 1.2em;
 	font-weight: 600;
 	color: #000;
-	line-height: 1.5em;
+	line-height: 2em;
 }
 .slot-text {
 	font-size: 14px;
@@ -30,6 +30,6 @@
 	line-height: 3em;
 }
 .footerIcon {
-	line-height: 4em;
+	line-height: 3em;
 }
 

unpackage/dist/dev/mp-weixin/pages/details/cmsinfo.wxss

@@ -1,26 +0,0 @@
-
-.parse {
-	display: block;
-}
-.title {
-	position: fixed;
-	color: #fff;
-	background-color: #c60814;
-	top: 0;
-	width: 100%;
-}
-.back {
-	margin: 0 15px 0 5px;
-}
-.time {
-	width: 100%;
-	text-align: center;
-	display: block;
-	font-size: 12px;
-}
-.content {
-	display: block;
-	width: 90%;
-	margin: 10px auto;
-}
-

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

@@ -2,8 +2,8 @@
   "navigationBarTitleText": "检测点查询",
   "usingComponents": {
     "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "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-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
   }
 }

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

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "检测点列表",
+  "usingComponents": {
+    "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-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

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

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": true,
     "postcss": true,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {