no message

components/listView.vue

@@ -1,15 +1,17 @@
 <template>
 	<view class="box">
-		<view class="box_item" v-for="item in list" :key="item.id" @click="goPage(item.id)">
-			{{ item.name }}（{{ item.number }}）
+		<view class="box_item" v-for="item in list" :key="item.id" @click="goPage(item)">
+			{{ item.name }}（{{ item.cardNo }}）
 			<img class="item_img" src="../../static/images/right.png" />
 		</view>
-		<view class="no_data" v-if="!list.length">暂无数据</view>
+
+		<NoData v-if="!list.length" />
 	</view>
 </template>
 
 <script setup>
 import { onLoad } from '@dcloudio/uni-app'
+import NoData from '@/components/noData.vue'
 
 const props = defineProps({
 	list: Array,
@@ -19,16 +21,16 @@ const props = defineProps({
 onLoad(() => {})
 
 // 点击每一个学生回调
-const goPage = (id) => {
-	// console.log(id)
+const goPage = (item) => {
+	// console.log(item)
 
 	if (props.appType == '学生轨迹') {
 		uni.navigateTo({
-			url: `/pages/track/track?id=${id}`
+			url: `/pages/track/track?id=${item.id}`
 		})
 	} else {
 		uni.navigateTo({
-			url: '/pages/student/student'
+			url: `/pages/student/student?msg=${JSON.stringify(item)}`
 		})
 	}
 }
@@ -37,7 +39,7 @@ const goPage = (id) => {
 <style lang="scss" scoped>
 .box {
 	margin-top: 22rpx;
-	padding: 0 20rpx 60rpx 30rpx;
+	padding: 0 20rpx 30rpx 30rpx;
 	box-sizing: border-box;
 	width: 710rpx;
 	background-color: #fff;
@@ -56,11 +58,5 @@ const goPage = (id) => {
 			height: 31rpx;
 		}
 	}
-
-	.no_data {
-		margin-top: 20rpx;
-		text-align: center;
-		font-size: 28rpx;
-	}
 }
 </style>

components/tabber.vue

@@ -57,7 +57,7 @@ onLoad(() => {
 		allList.value = tabList2.value
 	} else if (userType == 2) {
 		allList.value = tabList2.value
-	} else if (userType == 3) {
+	} else {
 		allList.value = tabList.value
 	}
 	const i = uni.getStorageSync('Tab-activeIndex')

manifest.json

@@ -57,7 +57,8 @@
 			"minified": true,
 			"postcss": true
 		},
-		"usingComponents": true
+		"usingComponents": true,
+		"libVersion": "latest"
 	},
 	"vueVersion": "3"
 }

pages.json

@@ -71,7 +71,7 @@
 		{
 			"path": "pages/grade/grade",
 			"style": {
-				"navigationBarTitleText": "三年二班",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -88,6 +88,13 @@
 				"navigationBarTitleText": "二维码",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/web/web",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"subPackages": [{

pages/grade/grade.vue

@@ -5,7 +5,7 @@
 		<!-- input组件区域 -->
 		<headerInput @changeInputValue="changeInputValue" />
 		<!-- 学校年级班级区域 -->
-		<view class="school">万载三中/七年级/3班</view>
+		<view class="school">万载三中/{{ gradeName }}/{{ className }}</view>
 
 		<!-- 学生列表区域 -->
 		<listView :list="list" :appType="appType" />
@@ -17,40 +17,64 @@ import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import headerInput from '@/components/headerInput.vue'
 import listView from '@/components/listView.vue'
+import { myRequest } from '@/utils/api.js'
 
 // 学生列表数组
-const list = ref([
-	{
-		id: 1,
-		name: '李商隐',
-		number: 6262662
-	},
-	{
-		id: 2,
-		name: '张三',
-		number: 6266662
-	},
-	{
-		id: 3,
-		name: '李四',
-		number: 6862662
-	},
-	{
-		id: 4,
-		name: '王五',
-		number: 8262662
-	}
-])
+const list = ref([])
+// 年级信息
+const gradeName = ref('')
+// 班级信息
+const className = ref('')
 
 const appType = ref('')
 
 onLoad((options) => {
 	appType.value = options.type || ''
+	getData()
 })
 
 // 输入框组件自定义事件
-const changeInputValue = (data) => {
-	console.log(data)
+const changeInputValue = (value) => {
+	if (value.trim()) {
+		let temList = []
+		list.value.forEach((ele) => {
+			if (ele.name.indexOf(value.trim()) != -1) {
+				temList.push(ele)
+			}
+		})
+		list.value = temList
+	} else {
+		getData()
+	}
+}
+
+const getData = async () => {
+	const res = await myRequest({
+		url: '/wanzai/api/wechat/queryPhoneBook',
+		data: {
+			id: uni.getStorageSync('userInfo').id
+		}
+	})
+	// console.log(res.data)
+
+	res.data.forEach((ele) => {
+		let temlist
+		ele.classBookList.forEach((item, index, arr) => {
+			if (item.bookUserList.length) {
+				// 所在年级学生的数据
+				list.value = item.bookUserList
+				// 班级信息
+				className.value = arr[index].className
+				temlist = arr
+			}
+		})
+		if (ele.classBookList == temlist) {
+			gradeName.value = ele.gradeName
+		}
+	})
+	uni.setNavigationBarTitle({
+		title: gradeName.value + className.value
+	})
 }
 </script>
 

pages/home/home.vue

@@ -54,9 +54,11 @@
 			<!-- 应用列表区域 -->
 			<view class="body_list" v-if="useAppList.length">
 				<!-- 每一个应用区域 -->
-				<view class="list_box" v-for="item in useAppList" :key="item.id" @click="goPage(item.path)">
+				<view class="list_box" v-for="item in useAppList" :key="item.id" @click="goPage(item.path, item)">
 					<img class="box_img" :src="item.url" />
-					{{ item.title }}
+					<view class="box_text">
+						{{ item.title }}
+					</view>
 				</view>
 			</view>
 
@@ -225,15 +227,27 @@ const getUseAppList = async () => {
 }
 
 // 跳转页面函数
-const goPage = (url) => {
+const goPage = (url, item) => {
+	if (item && item.category == '其他小程序') {
+		uni.navigateToMiniProgram({
+			appId: item.appid,
+			path: item.path
+		})
+		return
+	}
+	if (item && item.category == '移动端H5') {
+		uni.navigateTo({
+			url: `/pages/web/web?url=${item.path}`
+		})
+		return
+	}
 	if (url === '/pages/track/track') {
 		if (userInfo.value.identityId == 1) {
 			uni.navigateTo({
 				url: `/pages/track/track?id=${currentChild.value.id}`
 			})
 			return
-		}
-		if (userInfo.value.identityId == 3) {
+		} else {
 			uni.navigateTo({
 				url: '/pages/grade/grade?type=学生轨迹'
 			})
@@ -450,12 +464,21 @@ const updateObj = (data) => {
 				justify-content: space-evenly;
 				align-items: center;
 				font-size: 28rpx;
+				overflow: hidden;
 
 				.box_img {
 					width: 120rpx;
 					height: 120rpx;
 					border-radius: 32rpx;
 				}
+
+				.box_text {
+					width: 100%;
+					text-align: center;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
 			}
 		}
 	}

pages/index/index.vue

@@ -24,7 +24,9 @@ const vertify = async (code) => {
 	// console.log(res)
 	if (res.code == 200) {
 		uni.setStorageSync('token', JSON.parse(res.message).token)
+		uni.setStorageSync('userhead', JSON.parse(res.message).userhead)
 		uni.setStorageSync('userInfo', JSON.parse(res.message).user[0])
+
 		uni.redirectTo({
 			url: '/pages/home/home'
 		})

pages/msgWarn/msgWarn.vue

@@ -1,66 +1,107 @@
 <template>
 	<view class="container">
 		<!-- 顶部筛选框区域 -->
-		<picker @change="bindPickerChange" :value="index" :range="array">
+		<picker @change="bindPickerChange" :value="currentIndex" :range="array">
 			<view class="search">
-				{{ array[index] }}
+				{{ array[currentIndex] }}
 				<img class="search_icon" src="../../static/images/bottom.png" />
 			</view>
 		</picker>
 
 		<!-- 每一条信息区域 -->
 		<view class="box" v-for="item in list" :key="item.id">
-			<view class="box_time">{{ item.time }}</view>
+			<view class="box_time">{{ item.dateTime }}</view>
 			<view class="box_card">
 				<view class="card_title">
-					<view class="title_read" v-if="item.isRead === 0"></view>
-					{{ item.title }}
+					<!-- <view class="title_read" v-if="item.isRead === 0"></view> -->
+					{{ item.type == 1 ? '预警推送' : '学生轨迹' }}
+				</view>
+				<view class="card_msg" v-if="item.userName">姓名：{{ item.userName }}</view>
+				<view class="card_msg" v-if="item.typeName">类型：{{ item.typeName }}</view>
+				<view class="card_msg" v-if="item.location">地点：{{ item.location }}</view>
+				<view class="card_msg" v-if="item.image">
+					图片：
+					<img mode="aspectFill" class="img" :src="item.image" @click="previewImage(item.image)" />
 				</view>
-				<view class="card_msg">姓名：{{ item.name }}</view>
-				<view class="card_msg" v-if="item.type">类型：{{ item.type }}</view>
-				<view class="card_msg" v-if="item.content">内容：{{ item.content }}</view>
-				<view class="card_msg" v-if="item.warn">{{ item.warn }}</view>
 			</view>
 		</view>
+
+		<NoData v-if="!list.length" />
 	</view>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onReachBottom } from '@dcloudio/uni-app'
+import NoData from '@/components/noData.vue'
+import { myRequest } from '@/utils/api.js'
+import { previewImage } from '@/utils/previewImage.js'
+
+onLoad(() => {
+	let token = uni.getStorageSync('token')
+	if (token) {
+		getData()
+	} else {
+		uni.reLaunch({
+			url: '/pages/index/index'
+		})
+	}
+})
+
+onReachBottom(() => {
+	if (list.value.length < total.value) {
+		currentPage.value++
+		getData()
+	} else {
+		uni.showToast({
+			title: '没有更多数据了',
+			icon: 'none'
+		})
+	}
+})
+
+// 当前页
+const currentPage = ref(1)
+
+// 一页多少条数据
+const pageCount = ref(5)
 
-onLoad(() => {})
+// 总条数
+const total = ref(0)
 
 // 筛选框当前索引
-const index = ref(0)
+const currentIndex = ref(0)
 
 // 筛选框类型数组
-const array = ref(['全部通知', '预警推送', '课表提醒'])
+const array = ref(['全部通知', '预警推送', '学生轨迹'])
 
 // 信息列表
-const list = ref([
-	{
-		id: 1,
-		title: '预警推送',
-		name: '张三',
-		type: '越界',
-		content: '实验室越界',
-		isRead: 1,
-		time: '2023-11-30 14:20:20'
-	},
-	{
-		id: 2,
-		title: '课表提醒',
-		name: '李四',
-		warn: '小宝明天（08月09日，星期五有课，请做好准备）',
-		isRead: 0,
-		time: '2023-11-30 12:20:20'
+const list = ref([])
+
+// 获取消息提醒列表数据
+const getData = async () => {
+	const res = await myRequest({
+		url: '/wanzai/api/smart-notification/remindingList',
+		data: {
+			id: uni.getStorageSync('userInfo').id,
+			currentPage: currentPage.value,
+			pageCount: pageCount.value,
+			type: currentIndex.value == 0 ? '' : currentIndex.value
+		}
+	})
+	// console.log(res)
+	if (res.code == 200) {
+		list.value = [...list.value, ...res.data.list]
+		total.value = res.data.totalCount
 	}
-])
+}
 
 // 切换筛选框回调
 const bindPickerChange = (e) => {
-	index.value = e.detail.value
+	currentIndex.value = e.detail.value
+	list.value = []
+	currentPage.value = 1
+	getData()
 }
 </script>
 
@@ -68,7 +109,7 @@ const bindPickerChange = (e) => {
 .container {
 	display: flex;
 	flex-direction: column;
-	padding: 0 20rpx;
+	padding: 0 20rpx 20rpx 20rpx;
 	min-height: 100vh;
 	background-color: #f1f6fe;
 
@@ -92,8 +133,6 @@ const bindPickerChange = (e) => {
 	}
 
 	.box {
-		// height: 326rpx;
-
 		.box_time {
 			display: flex;
 			justify-content: center;
@@ -130,6 +169,15 @@ const bindPickerChange = (e) => {
 					background-color: #d43030;
 				}
 			}
+
+			.card_msg {
+				display: flex;
+				.img {
+					margin-top: 10rpx;
+					width: 100rpx;
+					height: 160rpx;
+				}
+			}
 		}
 	}
 }

pages/student/student.vue

@@ -6,19 +6,27 @@
 		<!-- 学生信息区域 -->
 		<view class="identity">学生</view>
 		<view class="box">
-			<img class="box_img" src="../../static/images/user-photo.png" />
+			<img
+				class="box_img"
+				mode="aspectFill"
+				:src="msg.headImage || '../../static/images/user-photo.png'"
+				@click="previewImage(msg.headImage || '../../static/images/user-photo.png')"
+			/>
 			<view class="box_info">
-				<view class="info_name">李商隐</view>
-				<view class="info_phone">13677985689</view>
+				<view class="info_name">{{ msg.name }}</view>
+				<view class="info_phone">{{ msg.cardNo }}</view>
 			</view>
-
-			<!-- <view class="box_btn" @click="callPhone">呼叫</view> -->
 		</view>
 
 		<!-- 家长信息区域 -->
 		<view class="identity">家长</view>
-		<view class="box mb-50" v-for="item in familyList" :key="item.id">
-			<img class="box_img" src="../../static/images/user-photo.png" />
+		<view class="box mb-50" v-for="item in msg.userParents" :key="item.id">
+			<img
+				class="box_img"
+				mode="aspectFill"
+				:src="item.headImage || '../../static/images/user-photo.png'"
+				@click="previewImage(item.headImage || '../../static/images/user-photo.png')"
+			/>
 			<view class="box_info">
 				<view class="info_name">
 					{{ item.name }}
@@ -27,41 +35,30 @@
 				<view class="info_phone">{{ item.phone }}</view>
 			</view>
 
-			<view class="box_btn" @click="callPhone">呼叫</view>
+			<view class="box_btn" @click="callPhone(item.phone)">呼叫</view>
 		</view>
+
+		<NoData v-if="!msg.userParents?.length" />
 	</view>
 </template>
 
 <script setup>
 import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
+import { previewImage } from '@/utils/previewImage.js'
+import NoData from '@/components/noData.vue'
+
+onLoad((options) => {
+	msg.value = JSON.parse(options.msg)
+})
+
+const msg = ref({})
 
-const familyList = ref([
-	{
-		id: 1,
-		url: '',
-		name: '李白',
-		phone: '13677985689',
-		identity: '父亲'
-	},
-	{
-		id: 2,
-		url: '',
-		name: '李白白',
-		phone: '13677985689',
-		identity: '母亲'
-	},
-	{
-		id: 3,
-		url: '',
-		name: '李桃桃',
-		phone: '13677985689',
-		identity: '叔叔'
-	}
-])
 // 点击呼叫按钮回调
-const callPhone = () => {
-	console.log(666)
+const callPhone = (phoneNumber) => {
+	uni.makePhoneCall({
+		phoneNumber
+	})
 }
 </script>
 

pages/web/web.vue

@@ -0,0 +1,16 @@
+<template>
+	<web-view :src="url"></web-view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+
+const url = ref('')
+
+onLoad((options) => {
+	url.value = options.url
+})
+</script>
+
+<style lang="scss"></style>

pagesReservation/register/register.vue

@@ -8,7 +8,7 @@
 					访客姓名
 				</view>
 				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入访客姓名" placeholder-style="color:#CCCCCC;" v-model="visName" />
+					<input :disabled="type == 1" class="value_input" type="text" placeholder="请输入访客姓名" placeholder-style="color:#CCCCCC;" v-model="visName" />
 				</view>
 			</view>
 
@@ -19,7 +19,7 @@
 					访客手机号
 				</view>
 				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入访客手机号" placeholder-style="color:#CCCCCC;" v-model="visPhone" />
+					<input :disabled="type == 1" class="value_input" type="text" placeholder="请输入访客手机号" placeholder-style="color:#CCCCCC;" v-model="visPhone" />
 				</view>
 			</view>
 
@@ -55,7 +55,7 @@
 					证件号
 				</view>
 				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入访客证件号" placeholder-style="color:#CCCCCC;" v-model="visIdNumber" />
+					<input :disabled="type == 1" class="value_input" type="text" placeholder="请输入访客证件号" placeholder-style="color:#CCCCCC;" v-model="visIdNumber" />
 				</view>
 			</view>
 
@@ -94,7 +94,7 @@
 					受访者姓名
 				</view>
 				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入受访者姓名" placeholder-style="color:#CCCCCC;" v-model="passiveName" />
+					<input :disabled="type == 2" class="value_input" type="text" placeholder="请输入受访者姓名" placeholder-style="color:#CCCCCC;" v-model="passiveName" />
 				</view>
 			</view>
 
@@ -105,7 +105,7 @@
 					受访者手机号
 				</view>
 				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入受访者手机号" placeholder-style="color:#CCCCCC;" v-model="passivePhone" />
+					<input :disabled="type == 2" class="value_input" type="text" placeholder="请输入受访者手机号" placeholder-style="color:#CCCCCC;" v-model="passivePhone" />
 				</view>
 			</view>
 
@@ -206,7 +206,13 @@ const btnFlag = computed(() => {
 onLoad((options) => {
 	type.value = options.type
 	if (type.value === '1') {
+		visName.value = uni.getStorageSync('userInfo').name
+		visPhone.value = uni.getStorageSync('userInfo').phone
+		visIdNumber.value = uni.getStorageSync('userInfo').idCard
 		getList()
+	} else {
+		passiveName.value = uni.getStorageSync('userInfo').name
+		passivePhone.value = uni.getStorageSync('userInfo').phone
 	}
 })
 
@@ -263,7 +269,7 @@ const parentAppointment = async () => {
 	})
 	setTimeout(() => {
 		uni.setStorageSync('Tab-activeIndex', 1)
-		uni.redirectTo({
+		uni.reLaunch({
 			url: '/pagesReservation/record/record'
 		})
 	}, 2000)
@@ -276,6 +282,9 @@ const otherAppointment = async () => {
 		method: 'post',
 		data: {
 			userId: uni.getStorageSync('userInfo').id,
+			userName: visName.value,
+			userPhone: visPhone.value,
+			userCard: visIdNumber.value,
 			visitorTime: visStartTime.value,
 			visitReason: visReason.value,
 			carNum: visCarNumber.value,
@@ -292,7 +301,7 @@ const otherAppointment = async () => {
 	})
 	setTimeout(() => {
 		uni.setStorageSync('Tab-activeIndex', 2)
-		uni.redirectTo({
+		uni.reLaunch({
 			url: '/pagesReservation/record/record'
 		})
 	}, 2000)
@@ -480,7 +489,7 @@ const handleAuth = () => {
 				width: 50%;
 
 				.value_input {
-					text-align: end;
+					text-align: right;
 				}
 
 				.value_text {

pagesReservation/reservation/reservation.vue

@@ -19,7 +19,7 @@
 			</view>
 
 			<!-- 其他访客预约选项区域 -->
-			<view class="body_box" @click="goPage('/pagesReservation/register/register?type=2')" v-if="userInfo.identityId == 3">
+			<view class="body_box" @click="goPage('/pagesReservation/register/register?type=2')" v-if="userInfo.identityId != 1">
 				<img class="box_img" src="../../static/images/reservation2.png" />
 				<view class="box_text">其他访客预约</view>
 				<img class="box_icon" src="../../static/images/right-blue.png" />

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

@@ -15,6 +15,7 @@ if (!Math) {
   "./pages/grade/grade.js";
   "./pages/student/student.js";
   "./pages/quickMark/quickMark.js";
+  "./pages/web/web.js";
   "./pagesReservation/reservation/reservation.js";
   "./pagesReservation/register/register.js";
   "./pagesReservation/record/record.js";

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

@@ -12,7 +12,8 @@
     "pages/addressBook/addressBook",
     "pages/grade/grade",
     "pages/student/student",
-    "pages/quickMark/quickMark"
+    "pages/quickMark/quickMark",
+    "pages/web/web"
   ],
   "subPackages": [
     {

unpackage/dist/dev/mp-weixin/components/listView.js

@@ -1,5 +1,9 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
+if (!Math) {
+  NoData();
+}
+const NoData = () => "./noData.js";
 const _sfc_main = {
   __name: "listView",
   props: {
@@ -10,14 +14,14 @@ const _sfc_main = {
     const props = __props;
     common_vendor.onLoad(() => {
     });
-    const goPage = (id) => {
+    const goPage = (item) => {
       if (props.appType == "学生轨迹") {
         common_vendor.index.navigateTo({
-          url: `/pages/track/track?id=${id}`
+          url: `/pages/track/track?id=${item.id}`
         });
       } else {
         common_vendor.index.navigateTo({
-          url: "/pages/student/student"
+          url: `/pages/student/student?msg=${JSON.stringify(item)}`
         });
       }
     };
@@ -26,9 +30,9 @@ const _sfc_main = {
         a: common_vendor.f(__props.list, (item, k0, i0) => {
           return {
             a: common_vendor.t(item.name),
-            b: common_vendor.t(item.number),
+            b: common_vendor.t(item.cardNo),
             c: item.id,
-            d: common_vendor.o(($event) => goPage(item.id), item.id)
+            d: common_vendor.o(($event) => goPage(item), item.id)
           };
         }),
         b: !__props.list.length

unpackage/dist/dev/mp-weixin/components/listView.json

@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "no-data": "./noData"
+  }
 }

unpackage/dist/dev/mp-weixin/components/listView.wxml

@@ -1 +1 @@
-<view class="box data-v-e6db6be6"><view wx:for="{{a}}" wx:for-item="item" wx:key="c" class="box_item data-v-e6db6be6" bindtap="{{item.d}}">{{item.a}}（{{item.b}}） <image class="item_img data-v-e6db6be6" src="/static/images/right.png"/></view><view wx:if="{{b}}" class="no_data data-v-e6db6be6">暂无数据</view></view>
+<view class="box data-v-e6db6be6"><view wx:for="{{a}}" wx:for-item="item" wx:key="c" class="box_item data-v-e6db6be6" bindtap="{{item.d}}">{{item.a}}（{{item.b}}） <image class="item_img data-v-e6db6be6" src="/static/images/right.png"/></view><no-data wx:if="{{b}}" class="data-v-e6db6be6" u-i="e6db6be6-0" bind:__l="__l"/></view>

unpackage/dist/dev/mp-weixin/components/listView.wxss

@@ -2,7 +2,7 @@
 /* 水平间距 */
 .box.data-v-e6db6be6 {
   margin-top: 22rpx;
-  padding: 0 20rpx 60rpx 30rpx;
+  padding: 0 20rpx 30rpx 30rpx;
   box-sizing: border-box;
   width: 710rpx;
   background-color: #fff;
@@ -19,9 +19,4 @@
 .box .box_item .item_img.data-v-e6db6be6 {
   width: 31rpx;
   height: 31rpx;
-}
-.box .no_data.data-v-e6db6be6 {
-  margin-top: 20rpx;
-  text-align: center;
-  font-size: 28rpx;
 }

unpackage/dist/dev/mp-weixin/components/tabber.js

@@ -53,7 +53,7 @@ const _sfc_main = {
         allList.value = tabList2.value;
       } else if (userType == 2) {
         allList.value = tabList2.value;
-      } else if (userType == 3) {
+      } else {
         allList.value = tabList.value;
       }
       const i = common_vendor.index.getStorageSync("Tab-activeIndex");

unpackage/dist/dev/mp-weixin/pages/grade/grade.js

@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const utils_api = require("../../utils/api.js");
 if (!Math) {
   (headerInput + listView)();
 }
@@ -8,39 +9,57 @@ const listView = () => "../../components/listView.js";
 const _sfc_main = {
   __name: "grade",
   setup(__props) {
-    const list = common_vendor.ref([
-      {
-        id: 1,
-        name: "李商隐",
-        number: 6262662
-      },
-      {
-        id: 2,
-        name: "张三",
-        number: 6266662
-      },
-      {
-        id: 3,
-        name: "李四",
-        number: 6862662
-      },
-      {
-        id: 4,
-        name: "王五",
-        number: 8262662
-      }
-    ]);
+    const list = common_vendor.ref([]);
+    const gradeName = common_vendor.ref("");
+    const className = common_vendor.ref("");
     const appType = common_vendor.ref("");
     common_vendor.onLoad((options) => {
       appType.value = options.type || "";
+      getData();
     });
-    const changeInputValue = (data) => {
-      console.log(data);
+    const changeInputValue = (value) => {
+      if (value.trim()) {
+        let temList = [];
+        list.value.forEach((ele) => {
+          if (ele.name.indexOf(value.trim()) != -1) {
+            temList.push(ele);
+          }
+        });
+        list.value = temList;
+      } else {
+        getData();
+      }
+    };
+    const getData = async () => {
+      const res = await utils_api.myRequest({
+        url: "/wanzai/api/wechat/queryPhoneBook",
+        data: {
+          id: common_vendor.index.getStorageSync("userInfo").id
+        }
+      });
+      res.data.forEach((ele) => {
+        let temlist;
+        ele.classBookList.forEach((item, index, arr) => {
+          if (item.bookUserList.length) {
+            list.value = item.bookUserList;
+            className.value = arr[index].className;
+            temlist = arr;
+          }
+        });
+        if (ele.classBookList == temlist) {
+          gradeName.value = ele.gradeName;
+        }
+      });
+      common_vendor.index.setNavigationBarTitle({
+        title: gradeName.value + className.value
+      });
     };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.o(changeInputValue),
-        b: common_vendor.p({
+        b: common_vendor.t(gradeName.value),
+        c: common_vendor.t(className.value),
+        d: common_vendor.p({
           list: list.value,
           appType: appType.value
         })

unpackage/dist/dev/mp-weixin/pages/grade/grade.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "三年二班",
+  "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "header-input": "../../components/headerInput",

unpackage/dist/dev/mp-weixin/pages/grade/grade.wxml

@@ -1 +1 @@
-<view class="container data-v-7d1a7ab2"><image class="img_bg data-v-7d1a7ab2" src="/static/images/center-bg.png"/><header-input class="data-v-7d1a7ab2" bindchangeInputValue="{{a}}" u-i="7d1a7ab2-0" bind:__l="__l"/><view class="school data-v-7d1a7ab2">万载三中/七年级/3班</view><list-view wx:if="{{b}}" class="data-v-7d1a7ab2" u-i="7d1a7ab2-1" bind:__l="__l" u-p="{{b}}"/></view>
+<view class="container data-v-7d1a7ab2"><image class="img_bg data-v-7d1a7ab2" src="/static/images/center-bg.png"/><header-input class="data-v-7d1a7ab2" bindchangeInputValue="{{a}}" u-i="7d1a7ab2-0" bind:__l="__l"/><view class="school data-v-7d1a7ab2">万载三中/{{b}}/{{c}}</view><list-view wx:if="{{d}}" class="data-v-7d1a7ab2" u-i="7d1a7ab2-1" bind:__l="__l" u-p="{{d}}"/></view>

unpackage/dist/dev/mp-weixin/pages/home/home.js

@@ -123,15 +123,27 @@ const _sfc_main = {
       });
       useAppList.value = res.data;
     };
-    const goPage = (url) => {
+    const goPage = (url, item) => {
+      if (item && item.category == "其他小程序") {
+        common_vendor.index.navigateToMiniProgram({
+          appId: item.appid,
+          path: item.path
+        });
+        return;
+      }
+      if (item && item.category == "移动端H5") {
+        common_vendor.index.navigateTo({
+          url: `/pages/web/web?url=${item.path}`
+        });
+        return;
+      }
       if (url === "/pages/track/track") {
         if (userInfo.value.identityId == 1) {
           common_vendor.index.navigateTo({
             url: `/pages/track/track?id=${currentChild.value.id}`
           });
           return;
-        }
-        if (userInfo.value.identityId == 3) {
+        } else {
           common_vendor.index.navigateTo({
             url: "/pages/grade/grade?type=学生轨迹"
           });
@@ -206,7 +218,7 @@ const _sfc_main = {
             a: item.url,
             b: common_vendor.t(item.title),
             c: item.id,
-            d: common_vendor.o(($event) => goPage(item.path), item.id)
+            d: common_vendor.o(($event) => goPage(item.path, item), item.id)
           };
         })
       } : {}, {

unpackage/dist/dev/mp-weixin/pages/home/home.wxss

@@ -168,9 +168,17 @@
   justify-content: space-evenly;
   align-items: center;
   font-size: 28rpx;
+  overflow: hidden;
 }
 .container .body .body_list .list_box .box_img.data-v-07e72d3c {
   width: 120rpx;
   height: 120rpx;
   border-radius: 32rpx;
+}
+.container .body .body_list .list_box .box_text.data-v-07e72d3c {
+  width: 100%;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -20,6 +20,7 @@ const _sfc_main = {
       });
       if (res.code == 200) {
         common_vendor.index.setStorageSync("token", JSON.parse(res.message).token);
+        common_vendor.index.setStorageSync("userhead", JSON.parse(res.message).userhead);
         common_vendor.index.setStorageSync("userInfo", JSON.parse(res.message).user[0]);
         common_vendor.index.redirectTo({
           url: "/pages/home/home"

unpackage/dist/dev/mp-weixin/pages/msgWarn/msgWarn.js

@@ -1,63 +1,94 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const utils_api = require("../../utils/api.js");
+const utils_previewImage = require("../../utils/previewImage.js");
+if (!Math) {
+  NoData();
+}
+const NoData = () => "../../components/noData.js";
 const _sfc_main = {
   __name: "msgWarn",
   setup(__props) {
     common_vendor.onLoad(() => {
+      let token = common_vendor.index.getStorageSync("token");
+      if (token) {
+        getData();
+      } else {
+        common_vendor.index.reLaunch({
+          url: "/pages/index/index"
+        });
+      }
+    });
+    common_vendor.onReachBottom(() => {
+      if (list.value.length < total.value) {
+        currentPage.value++;
+        getData();
+      } else {
+        common_vendor.index.showToast({
+          title: "没有更多数据了",
+          icon: "none"
+        });
+      }
     });
-    const index = common_vendor.ref(0);
-    const array = common_vendor.ref(["全部通知", "预警推送", "课表提醒"]);
-    const list = common_vendor.ref([
-      {
-        id: 1,
-        title: "预警推送",
-        name: "张三",
-        type: "越界",
-        content: "实验室越界",
-        isRead: 1,
-        time: "2023-11-30 14:20:20"
-      },
-      {
-        id: 2,
-        title: "课表提醒",
-        name: "李四",
-        warn: "小宝明天（08月09日，星期五有课，请做好准备）",
-        isRead: 0,
-        time: "2023-11-30 12:20:20"
+    const currentPage = common_vendor.ref(1);
+    const pageCount = common_vendor.ref(5);
+    const total = common_vendor.ref(0);
+    const currentIndex = common_vendor.ref(0);
+    const array = common_vendor.ref(["全部通知", "预警推送", "学生轨迹"]);
+    const list = common_vendor.ref([]);
+    const getData = async () => {
+      const res = await utils_api.myRequest({
+        url: "/wanzai/api/smart-notification/remindingList",
+        data: {
+          id: common_vendor.index.getStorageSync("userInfo").id,
+          currentPage: currentPage.value,
+          pageCount: pageCount.value,
+          type: currentIndex.value == 0 ? "" : currentIndex.value
+        }
+      });
+      if (res.code == 200) {
+        list.value = [...list.value, ...res.data.list];
+        total.value = res.data.totalCount;
       }
-    ]);
+    };
     const bindPickerChange = (e) => {
-      index.value = e.detail.value;
+      currentIndex.value = e.detail.value;
+      list.value = [];
+      currentPage.value = 1;
+      getData();
     };
     return (_ctx, _cache) => {
-      return {
-        a: common_vendor.t(array.value[index.value]),
+      return common_vendor.e({
+        a: common_vendor.t(array.value[currentIndex.value]),
         b: common_vendor.o(bindPickerChange),
-        c: index.value,
+        c: currentIndex.value,
         d: array.value,
         e: common_vendor.f(list.value, (item, k0, i0) => {
           return common_vendor.e({
-            a: common_vendor.t(item.time),
-            b: item.isRead === 0
-          }, item.isRead === 0 ? {} : {}, {
-            c: common_vendor.t(item.title),
-            d: common_vendor.t(item.name),
-            e: item.type
-          }, item.type ? {
-            f: common_vendor.t(item.type)
+            a: common_vendor.t(item.dateTime),
+            b: common_vendor.t(item.type == 1 ? "预警推送" : "学生轨迹"),
+            c: item.userName
+          }, item.userName ? {
+            d: common_vendor.t(item.userName)
+          } : {}, {
+            e: item.typeName
+          }, item.typeName ? {
+            f: common_vendor.t(item.typeName)
           } : {}, {
-            g: item.content
-          }, item.content ? {
-            h: common_vendor.t(item.content)
+            g: item.location
+          }, item.location ? {
+            h: common_vendor.t(item.location)
           } : {}, {
-            i: item.warn
-          }, item.warn ? {
-            j: common_vendor.t(item.warn)
+            i: item.image
+          }, item.image ? {
+            j: item.image,
+            k: common_vendor.o(($event) => common_vendor.unref(utils_previewImage.previewImage)(item.image), item.id)
           } : {}, {
-            k: item.id
+            l: item.id
           });
-        })
-      };
+        }),
+        f: !list.value.length
+      }, !list.value.length ? {} : {});
     };
   }
 };

unpackage/dist/dev/mp-weixin/pages/msgWarn/msgWarn.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "消息提醒",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "no-data": "../../components/noData"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/msgWarn/msgWarn.wxss

@@ -3,7 +3,7 @@
 .container.data-v-b8003fe3 {
   display: flex;
   flex-direction: column;
-  padding: 0 20rpx;
+  padding: 0 20rpx 20rpx 20rpx;
   min-height: 100vh;
   background-color: #f1f6fe;
 }
@@ -56,4 +56,12 @@
   height: 12rpx;
   border-radius: 50%;
   background-color: #d43030;
+}
+.container .box .box_card .card_msg.data-v-b8003fe3 {
+  display: flex;
+}
+.container .box .box_card .card_msg .img.data-v-b8003fe3 {
+  margin-top: 10rpx;
+  width: 100rpx;
+  height: 160rpx;
 }

unpackage/dist/dev/mp-weixin/pages/student/student.js

@@ -1,45 +1,41 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const utils_previewImage = require("../../utils/previewImage.js");
+if (!Math) {
+  NoData();
+}
+const NoData = () => "../../components/noData.js";
 const _sfc_main = {
   __name: "student",
   setup(__props) {
-    const familyList = common_vendor.ref([
-      {
-        id: 1,
-        url: "",
-        name: "李白",
-        phone: "13677985689",
-        identity: "父亲"
-      },
-      {
-        id: 2,
-        url: "",
-        name: "李白白",
-        phone: "13677985689",
-        identity: "母亲"
-      },
-      {
-        id: 3,
-        url: "",
-        name: "李桃桃",
-        phone: "13677985689",
-        identity: "叔叔"
-      }
-    ]);
-    const callPhone = () => {
-      console.log(666);
+    common_vendor.onLoad((options) => {
+      msg.value = JSON.parse(options.msg);
+    });
+    const msg = common_vendor.ref({});
+    const callPhone = (phoneNumber) => {
+      common_vendor.index.makePhoneCall({
+        phoneNumber
+      });
     };
     return (_ctx, _cache) => {
-      return {
-        a: common_vendor.f(familyList.value, (item, k0, i0) => {
+      var _a, _b;
+      return common_vendor.e({
+        a: msg.value.headImage || "../../static/images/user-photo.png",
+        b: common_vendor.o(($event) => common_vendor.unref(utils_previewImage.previewImage)(msg.value.headImage || "../../static/images/user-photo.png")),
+        c: common_vendor.t(msg.value.name),
+        d: common_vendor.t(msg.value.cardNo),
+        e: common_vendor.f(msg.value.userParents, (item, k0, i0) => {
           return {
-            a: common_vendor.t(item.name),
-            b: common_vendor.t(item.phone),
-            c: common_vendor.o(callPhone, item.id),
-            d: item.id
+            a: item.headImage || "../../static/images/user-photo.png",
+            b: common_vendor.o(($event) => common_vendor.unref(utils_previewImage.previewImage)(item.headImage || "../../static/images/user-photo.png"), item.id),
+            c: common_vendor.t(item.name),
+            d: common_vendor.t(item.phone),
+            e: common_vendor.o(($event) => callPhone(item.phone), item.id),
+            f: item.id
           };
-        })
-      };
+        }),
+        f: !((_a = msg.value.userParents) == null ? void 0 : _a.length)
+      }, !((_b = msg.value.userParents) == null ? void 0 : _b.length) ? {} : {});
     };
   }
 };

unpackage/dist/dev/mp-weixin/pages/student/student.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "学生名",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "no-data": "../../components/noData"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesReservation/register/register.js

@@ -39,7 +39,13 @@ const _sfc_main = {
     common_vendor.onLoad((options) => {
       type.value = options.type;
       if (type.value === "1") {
+        visName.value = common_vendor.index.getStorageSync("userInfo").name;
+        visPhone.value = common_vendor.index.getStorageSync("userInfo").phone;
+        visIdNumber.value = common_vendor.index.getStorageSync("userInfo").idCard;
         getList();
+      } else {
+        passiveName.value = common_vendor.index.getStorageSync("userInfo").name;
+        passivePhone.value = common_vendor.index.getStorageSync("userInfo").phone;
       }
     });
     const getList = async () => {
@@ -87,7 +93,7 @@ const _sfc_main = {
       });
       setTimeout(() => {
         common_vendor.index.setStorageSync("Tab-activeIndex", 1);
-        common_vendor.index.redirectTo({
+        common_vendor.index.reLaunch({
           url: "/pagesReservation/record/record"
         });
       }, 2e3);
@@ -98,6 +104,9 @@ const _sfc_main = {
         method: "post",
         data: {
           userId: common_vendor.index.getStorageSync("userInfo").id,
+          userName: visName.value,
+          userPhone: visPhone.value,
+          userCard: visIdNumber.value,
           visitorTime: visStartTime.value,
           visitReason: visReason.value,
           carNum: visCarNumber.value,
@@ -113,7 +122,7 @@ const _sfc_main = {
       });
       setTimeout(() => {
         common_vendor.index.setStorageSync("Tab-activeIndex", 2);
-        common_vendor.index.redirectTo({
+        common_vendor.index.reLaunch({
           url: "/pagesReservation/record/record"
         });
       }, 2e3);
@@ -251,44 +260,49 @@ const _sfc_main = {
     };
     return (_ctx, _cache) => {
       return common_vendor.e({
-        a: visName.value,
-        b: common_vendor.o(($event) => visName.value = $event.detail.value),
-        c: visPhone.value,
-        d: common_vendor.o(($event) => visPhone.value = $event.detail.value),
-        e: common_vendor.t(visStartTime.value || "请选择来访时间 >"),
-        f: visStartTime.value ? 1 : "",
-        g: common_vendor.o(changeStart),
-        h: common_vendor.o(($event) => visStartTime.value = $event),
-        i: common_vendor.p({
+        a: type.value == 1,
+        b: visName.value,
+        c: common_vendor.o(($event) => visName.value = $event.detail.value),
+        d: type.value == 1,
+        e: visPhone.value,
+        f: common_vendor.o(($event) => visPhone.value = $event.detail.value),
+        g: common_vendor.t(visStartTime.value || "请选择来访时间 >"),
+        h: visStartTime.value ? 1 : "",
+        i: common_vendor.o(changeStart),
+        j: common_vendor.o(($event) => visStartTime.value = $event),
+        k: common_vendor.p({
           modelValue: visStartTime.value
         }),
-        j: common_vendor.t(visEndTime.value || "来访时间为4小时"),
-        k: visEndTime.value ? 1 : "",
-        l: visIdNumber.value,
-        m: common_vendor.o(($event) => visIdNumber.value = $event.detail.value),
-        n: visReason.value,
-        o: common_vendor.o(($event) => visReason.value = $event.detail.value),
-        p: visCarNumber.value,
-        q: common_vendor.o(($event) => visCarNumber.value = $event.detail.value),
-        r: visPeopleNum.value,
-        s: common_vendor.o(common_vendor.m(($event) => visPeopleNum.value = $event.detail.value, {
+        l: common_vendor.t(visEndTime.value || "来访时间为4小时"),
+        m: visEndTime.value ? 1 : "",
+        n: type.value == 1,
+        o: visIdNumber.value,
+        p: common_vendor.o(($event) => visIdNumber.value = $event.detail.value),
+        q: visReason.value,
+        r: common_vendor.o(($event) => visReason.value = $event.detail.value),
+        s: visCarNumber.value,
+        t: common_vendor.o(($event) => visCarNumber.value = $event.detail.value),
+        v: visPeopleNum.value,
+        w: common_vendor.o(common_vendor.m(($event) => visPeopleNum.value = $event.detail.value, {
           number: true
         })),
-        t: type.value == 2
+        x: type.value == 2
       }, type.value == 2 ? {
-        v: passiveName.value,
-        w: common_vendor.o(($event) => passiveName.value = $event.detail.value)
+        y: type.value == 2,
+        z: passiveName.value,
+        A: common_vendor.o(($event) => passiveName.value = $event.detail.value)
       } : {}, {
-        x: type.value == 2
+        B: type.value == 2
       }, type.value == 2 ? {
-        y: passivePhone.value,
-        z: common_vendor.o(($event) => passivePhone.value = $event.detail.value)
+        C: type.value == 2,
+        D: passivePhone.value,
+        E: common_vendor.o(($event) => passivePhone.value = $event.detail.value)
       } : {}, {
-        A: type.value == 1
+        F: type.value == 1
       }, type.value == 1 ? {} : {}, {
-        B: type.value == 1
+        G: type.value == 1
       }, type.value == 1 ? {
-        C: common_vendor.f(list.value, (item, k0, i0) => {
+        H: common_vendor.f(list.value, (item, k0, i0) => {
           return {
             a: item.isChecked,
             b: common_vendor.t(item.name),
@@ -298,10 +312,10 @@ const _sfc_main = {
           };
         })
       } : {}, {
-        D: authValue.value,
-        E: common_vendor.o(handleAuth),
-        F: common_vendor.unref(btnFlag) ? 1 : "",
-        G: common_vendor.o(handleSubmit)
+        I: authValue.value,
+        J: common_vendor.o(handleAuth),
+        K: common_vendor.unref(btnFlag) ? 1 : "",
+        L: common_vendor.o(handleSubmit)
       });
     };
   }

unpackage/dist/dev/mp-weixin/pagesReservation/register/register.wxss

@@ -30,7 +30,7 @@
   width: 50%;
 }
 .container .body .body_box .box_value .value_input.data-v-0b2c2ae2 {
-  text-align: end;
+  text-align: right;
 }
 .container .body .body_box .box_value .value_text.data-v-0b2c2ae2 {
   margin-left: 20rpx;

unpackage/dist/dev/mp-weixin/pagesReservation/reservation/reservation.js

@@ -22,8 +22,8 @@ const _sfc_main = {
       }, userInfo.value.identityId == 1 ? {
         b: common_vendor.o(($event) => goPage("/pagesReservation/register/register?type=1"))
       } : {}, {
-        c: userInfo.value.identityId == 3
-      }, userInfo.value.identityId == 3 ? {
+        c: userInfo.value.identityId != 1
+      }, userInfo.value.identityId != 1 ? {
         d: common_vendor.o(($event) => goPage("/pagesReservation/register/register?type=2"))
       } : {});
     };

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

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.2.4",
+  "libVersion": "latest",
   "appid": "wx2fc3f45732fae5d3",
   "projectname": "smartCampus-wanzai",
   "condition": {

utils/api.js

@@ -10,17 +10,17 @@ export const myRequest = (options) => {
 		uni.request({
 			url: BASE_URL + options.url,
 			method: options.method || "GET",
-			// header: options.header || {
-			// 	'userId': uni.getStorageSync('userInfo').id
-			// },
+			header: options.header || {
+				'token': uni.getStorageSync('token'),
+				'userhead': uni.getStorageSync('userhead')
+			},
 			data: options.data || {},
 			timeout: 10000,
 			success: (res) => {
-				if (res.data.code == 200 || res.data.code == 500) {
-					resolve(res.data)
-				} else {
-
-				}
+				// if (res.data.code == 200) {
+				// 	resolve(res.data)
+				// }
+				resolve(res.data)
 			},
 			fail: (err) => {
 				uni.showToast({
@@ -33,7 +33,7 @@ export const myRequest = (options) => {
 			complete: (res) => {
 				uni.hideLoading({
 					complete: (hide) => {
-						if (res.data.code == 200 || res.data.code == 500) {
+						if (res.data.code == 200) {
 
 						} else {
 							uni.showToast({