no message

manifest.json

@@ -1,80 +1,80 @@
 {
-	"name": "校车预约",
-	"appid": "__UNI__43F49FA",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"vueVersion": "3",
-	"h5": {
-		"title": "校车预约",
-		"devServer": {
-			"disableHostCheck": true,
-			"proxy": {
-				"/carstop/carbook": {
-					//目标接口域名
-					"target": "https://chtech.ncjti.edu.cn/carstop/carbook",
-					// "target": "http://192.168.161.170:8088/carBook",
-					//是否跨域
-					"changeOrigin": true,
-					// 设置支持https协议的代理
-					"secure": false
-				}
-			}
-		},
-		"router": {
-			"base": "/carstop/dist5/"
-		}
-	}
-}
+    "name" : "校车预约",
+    "appid" : "__UNI__43F49FA",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "title" : "校车预约",
+        "devServer" : {
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/carstop/carbook" : {
+                    //目标接口域名
+                    "target" : "https://chtech.ncjti.edu.cn/carstop/carbook",
+                    // "target": "http://192.168.161.170:8088/carBook",
+                    //是否跨域
+                    "changeOrigin" : true,
+                    // 设置支持https协议的代理
+                    "secure" : false
+                }
+            }
+        },
+        "router" : {
+            "base" : "/carstop/dist5/"
+        }
+    }
+}

pages/detail/detail.vue

@@ -5,10 +5,11 @@
 			<view class="left">车牌号</view>
 			<view class="right2">
 				<view class="item">
-					<view :class="['select', form.selectValue ? 'selected' : '']" @tap="handleMultiple(form.selectIndex)">
+					<view :class="['select', form.selectValue != 0 ? 'selected' : '']" @tap="handleMultiple(form.selectIndex)">
 						{{ form.selectValue != 0 ? form.selectValue : '请选择' }}
 					</view>
 				</view>
+				<view class="right-img"><img src="../../static/bottom.png" /></view>
 			</view>
 			<!-- 车牌号选项弹窗区域 -->
 			<transition>
@@ -39,8 +40,8 @@
 		<!-- 发车时间区域 -->
 		<view class="box">
 			<view class="left">发车时间</view>
-			<picker style="width: 40%;" @change="bindPickerChange($event, 1)" mode="time" :value="info.ci_time">
-				<view class="right">
+			<picker style="width: 40%;" @change="bindPickerChange($event, 1)" mode="time" :value="info.ci_time" :start="getCurrentTime()">
+				<view :class="['right', info.ci_time != 0 ? '' : 'unSelect']">
 					{{ info.ci_time != 0 ? info.ci_time : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
 				</view>
@@ -51,7 +52,7 @@
 		<view class="box">
 			<view class="left">扫码开始时间</view>
 			<picker style="width: 40%;" @change="bindPickerChange($event, 4)" mode="time" :value="info.sm_start">
-				<view class="right">
+				<view :class="['right', info.sm_start != 0 ? '' : 'unSelect']">
 					{{ info.sm_start != 0 ? info.sm_start : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
 				</view>
@@ -62,7 +63,7 @@
 		<view class="box">
 			<view class="left">扫码结束时间</view>
 			<picker style="width: 40%;" @change="bindPickerChange($event, 5)" mode="time" :value="info.sm_end">
-				<view class="right">
+				<view :class="['right', info.sm_end != 0 ? '' : 'unSelect']">
 					{{ info.sm_end != 0 ? info.sm_end : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
 				</view>
@@ -74,8 +75,8 @@
 			<view class="left">路线</view>
 
 			<picker style="width: 60%;" @change="bindPickerChange($event, 2)" :range="pathList" range-key="route">
-				<view class="right">
-					{{ info.route }}
+				<view :class="['right', info.route ? '' : 'unSelect']">
+					{{ info.route ? info.route : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
 				</view>
 			</picker>
@@ -86,7 +87,7 @@
 			<view class="left">终点站</view>
 
 			<picker style="width: 60%;" @change="bindPickerChange($event, 3)" :range="endList" range-key="route_end">
-				<view class="right">
+				<view :class="['right', info.route_end ? '' : 'unSelect']">
 					{{ info.route_end ? info.route_end : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
 				</view>
@@ -140,28 +141,35 @@ import { time_to_sec } from '@/util/formatTime.js'
 
 onLoad(options => {
 	if (isWeixin()) {
-		info.value = JSON.parse(options.info)
-		// console.log(info.value)
-		// 获取人员列表
-		getData(info.value)
-		// 获取路线数组
-		getPathList()
-		// 获取终点站列表
-		getEndList()
-		// 获取车牌号列表
-		getBusList()
-		// 处理车牌号数据
-		form.value.selectValue = info.value.car_number
-
-		setTimeout(() => {
-			let temList = []
-			selectMultiple.value.columns.forEach(item => {
-				if (item.label == form.value.selectValue) {
-					temList.push(item.value)
-				}
+		let userInfo = JSON.parse(uni.getStorageSync('bus-userInfo'))
+		if (userInfo.user_zz !== '车队长') {
+			uni.redirectTo({
+				url: '/pages/404/404?message=暂无权限'
 			})
-			form.value.selectIndex = temList
-		}, 500)
+		} else {
+			info.value = JSON.parse(options.info)
+			// console.log(info.value)
+			// 获取人员列表
+			getData(info.value)
+			// 获取路线数组
+			getPathList()
+			// 获取终点站列表
+			getEndList()
+			// 获取车牌号列表
+			getBusList()
+			// 处理车牌号数据
+			form.value.selectValue = info.value.car_number
+
+			setTimeout(() => {
+				let temList = []
+				selectMultiple.value.columns.forEach(item => {
+					if (item.label == form.value.selectValue) {
+						temList.push(item.value)
+					}
+				})
+				form.value.selectIndex = temList
+			}, 500)
+		}
 	} else {
 		uni.redirectTo({
 			url: '/pages/404/404?message=请在微信客户端打开链接'
@@ -416,6 +424,13 @@ const bindPickerChange = (e, type) => {
 		info.value.sm_end = e.detail.value
 	}
 }
+// 获取当前时间  hh:mm
+const getCurrentTime = () => {
+	const date = new Date()
+	let H = (date.getHours() + '').padStart(2, '0')
+	let M = (date.getMinutes() + '').padStart(2, '0')
+	return `${H}:${M}`
+}
 </script>
 
 <style lang="scss" scoped>
@@ -458,9 +473,10 @@ const bindPickerChange = (e, type) => {
 			flex: 2;
 			display: flex;
 			justify-content: flex-end;
+			align-items: center;
 
 			.item {
-				width: 100%;
+				flex: 1;
 				padding: 20rpx 0;
 
 				.select {
@@ -480,6 +496,22 @@ const bindPickerChange = (e, type) => {
 					}
 				}
 			}
+
+			.right-img {
+				margin-left: 27rpx;
+				margin-top: -30rpx;
+				width: 17rpx;
+				height: 12rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.unSelect {
+			color: #ccc;
 		}
 	}
 

pages/home/home.vue

@@ -66,7 +66,7 @@
 					<view class="btn-info-time">{{ currentPath == '墨轩湖校区-黄家湖校区' ? mxh_end : hjh_end }}</view>
 				</view>
 
-				<view class="btn-button" @click="handleSub">{{ status ? '立即预约' : dateType == '今天' ? '候补预约' : '立即预约' }}</view>
+				<view class="btn-button" @click="handleSub">{{ status ? '立即预约' : '候补预约' }}</view>
 			</view>
 		</view>
 
@@ -76,6 +76,8 @@
 			<view class="info-detail">
 				预约截止时间为发车前{{ yy_end }}分钟，如当月爽约{{ black_count }}次，账号会被锁定，锁定后联系车队长解锁。车队长联系方式：
 				<span @click="handlePhone(13576937506)">13576937506</span>
+				，技术支持联系方式：
+				<span @click="handlePhone(`0791 - 82293574`)">0791-82293574</span>
 				，候补功能仅当日开放。
 			</view>
 		</view>
@@ -103,7 +105,7 @@ onLoad(() => {
 })
 
 onShow(() => {
-	getTimeFormat()
+	dateType.value == '今天' ? getTimeFormat() : getTimeFormat(1)
 	getPathList()
 	getOrderConfig()
 	currentIndex1.value = 0
@@ -113,7 +115,7 @@ onShow(() => {
 	setTimeout(() => {
 		currentPath.value = pathList.value[0].route
 		getBusList(pathList.value[0].route)
-	}, 200)
+	}, 300)
 })
 
 // 页面下拉触发刷新回调
@@ -171,12 +173,21 @@ const black_count = ref('')
 const status = ref(true)
 
 // 监听车辆列表更改候补预约状态
-// watch(
-// 	() => busList.value,
-// 	newValue => {
-// 		status.value = newValue.some(item => item.can_order == 1)
-// 	}
-// )
+watch(
+	() => busList.value,
+	newValue => {
+		if (newValue.length) {
+			let flag = newValue.some(item => item.can_order == 1)
+			let count = newValue.length
+			let LastObj = newValue[count - 1]
+			if (LastObj.boarde_num == LastObj.contain && !flag) {
+				status.value = false
+			} else {
+				status.value = true
+			}
+		}
+	}
+)
 
 // 获取用户信息
 const getUserInfo = async () => {
@@ -220,13 +231,6 @@ const getBusList = async route => {
 	})
 	// console.log(res)
 	busList.value = res.data || []
-	if (res.data.length) {
-		const count = res.data.length
-		const LastObj = res.data[count - 1]
-		if (LastObj.boarde_num == LastObj.contain) {
-			status.value = false
-		}
-	}
 }
 
 // 获取预约时间段数据

pages/index/index.vue

@@ -10,9 +10,9 @@ import { getQueryString } from '../../util/getParams.js'
 const APPKEY = '4AA7B3944BDF3739'
 const ocode = '1015730314'
 // 线上地址
-// const URL = 'https://chtech.ncjti.edu.cn/carstop/carbook/appopenid.action'
+const URL = 'https://chtech.ncjti.edu.cn/carstop/carbook/appopenid.action'
 // 本地地址
-const URL = 'http://192.168.161.170:8088/carBook/appopenid.action'
+// const URL = 'http://192.168.161.170:8088/carBook/appopenid.action'
 
 onLoad(() => {
 	loginFilter()

pages/my/my.vue

@@ -12,33 +12,39 @@
 					<img v-if="item.state === 2" src="../../static/pass.png" />
 					<img v-if="item.state === 3" src="../../static/waiting.png" />
 					<img v-if="item.state === 4" src="../../static/cancel.png" />
+					<img v-if="item.state === 5" src="../../static/unAppoint.png" />
 				</view>
 			</view>
 			<view class="list-info">
 				<view class="list-info-item">
 					<span>预约号：</span>
-					{{ item.row_num }}
+					{{ item.row_num.toString().padStart(2, '0') }}
 				</view>
-				<view class="list-info-item">
-					<span>下单时间：</span>
-					{{ item.yy_time }}
-				</view>
-				<view class="list-info-item" v-if="item.state === 1">
-					<span>发车时间：</span>
-					{{ item.yy_date }}
-				</view>
-				<view class="list-info-item" v-if="item.state === 1 || item.state === 2">
+				<view :class="['list-info-item', item.state == 1 ? 'highlight' : '']" v-if="item.state !== 3">
 					<span>车牌号：</span>
 					{{ item.car_number }}
 				</view>
+				<view class="list-info-item" v-if="item.state === 1 || item.state === 2">
+					<span>容 量：</span>
+					{{ item.contain }}人
+				</view>
 				<view class="list-info-item">
 					<span>终点站：</span>
 					{{ item.route_end }}
 				</view>
-				<view class="list-info-item" v-if="item.state === 1 || item.state === 2">
-					<span>容 量：</span>
-					{{ item.contain }}人
+				<view class="list-info-item highlight" v-if="item.state === 1">
+					<span>发车时间：</span>
+					{{ item.yy_date }}
+				</view>
+				<view class="list-info-item highlight" v-if="item.state === 1">
+					<span>扫码时间段：</span>
+					{{ item.sm_time }}
+				</view>
+				<view class="list-info-item">
+					<span>下单时间：</span>
+					{{ item.yy_time }}
 				</view>
+
 				<view class="list-info-item2" v-if="item.state === 1 || item.state === 2">
 					<span>变更信息：</span>
 					{{ item.remark != '' ? item.remark : '无' }}
@@ -64,7 +70,7 @@
 <script setup>
 import { ref } from 'vue'
 
-import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app'
+import { onLoad, onShow, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 
 import { myRequest } from '../../util/api.js'
 
@@ -84,16 +90,34 @@ onLoad(() => {
 onShow(() => {
 	result_state.value = 0
 	date_state.value = 1
+	currentPage.value = 1
+	listData.value = []
 	getMyData()
 })
 
+// 下拉刷新回调
 onPullDownRefresh(() => {
+	currentPage.value = 1
+	listData.value = []
 	getMyData()
 	setTimeout(function() {
 		uni.stopPullDownRefresh()
 	}, 500)
 })
 
+// 页面拉到底部触发函数
+onReachBottom(() => {
+	if (listData.value.length < total.value) {
+		currentPage.value++
+		getMyData()
+	} else {
+		uni.showToast({
+			title: '没有更多数据了',
+			icon: 'none'
+		})
+	}
+})
+
 // 用户card_number
 const card_number = ref('')
 // 筛选条件状态列表
@@ -117,6 +141,10 @@ const typeList = ref([
 	{
 		text: '已取消',
 		value: 4
+	},
+	{
+		text: '已爽约',
+		value: 5
 	}
 ])
 // 筛选条件时间列表
@@ -139,28 +167,34 @@ const timeList = ref([
 	}
 ])
 
-// 预约状态 0:全部 1:预约成功 2:已乘车 3:候补中 4:已取消
+// 预约状态 0:全部 1:预约成功 2:已乘车 3:候补中 4:已取消 5:已爽约
 const result_state = ref(0)
 // 时间状态 1:全部 2:当天 3:本周 4:本月
 const date_state = ref(1)
-
+// 每页多少条数据
+const pageSize = ref(5)
+// 当前是第几页
+const currentPage = ref(1)
+// 总共多少条数据
+const total = ref(null)
 // 预约记录数据
-// 1代表成功,2代表已乘车,3代表已分配,4代表候补中,5代表已取消
 const listData = ref([])
 
 // 获取用户预约数据
 const getMyData = async () => {
-	listData.value = []
 	const res = await myRequest({
 		url: '/appqueryUserOrders.action',
 		data: {
 			result_state: result_state.value,
 			date_state: date_state.value,
-			card_number: card_number.value
+			card_number: card_number.value,
+			rows: pageSize.value,
+			page: currentPage.value
 		}
 	})
-	// console.log(res);
-	listData.value = res.data
+	// console.log(res)
+	total.value = res.data.totalCount
+	listData.value = [...listData.value, ...res.data.list]
 }
 
 // 更换车次按钮回调
@@ -199,6 +233,8 @@ const handleOnCarRequest = async id => {
 			title: res.message
 		})
 		setTimeout(() => {
+			currentPage.value = 1
+			listData.value = []
 			getMyData()
 		}, 1500)
 	}
@@ -232,6 +268,8 @@ const handleCancelRequest = async id => {
 			title: res.message
 		})
 		setTimeout(() => {
+			currentPage.value = 1
+			listData.value = []
 			getMyData()
 		}, 1500)
 	}
@@ -242,6 +280,8 @@ const getConveyData = Obj => {
 	// console.log(Obj)
 	result_state.value = Obj.typeIndex
 	date_state.value = Obj.timeIndex - 0 + 1
+	currentPage.value = 1
+	listData.value = []
 	getMyData()
 }
 </script>
@@ -297,12 +337,16 @@ const getConveyData = Obj => {
 
 				span {
 					display: inline-block;
-					width: 160rpx;
+					width: 200rpx;
 					text-align-last: justify;
 					color: #999999;
 				}
 			}
 
+			.highlight {
+				color: #5c60f3;
+			}
+
 			.list-info-item {
 				height: 60rpx;
 			}

pages/record/record.vue

@@ -64,7 +64,21 @@ import Search from '../../components/search'
 
 onLoad(() => {
 	if (isWeixin()) {
-		getData()
+		let userInfo = uni.getStorageSync('bus-userInfo')
+		if (!userInfo) {
+			uni.redirectTo({
+				url: '/pages/index/index'
+			})
+		} else {
+			let info = JSON.parse(userInfo)
+			if (info.user_zz !== '车队长') {
+				uni.redirectTo({
+					url: '/pages/404/404?message=暂无权限'
+				})
+			} else {
+				getData()
+			}
+		}
 	} else {
 		uni.redirectTo({
 			url: '/pages/404/404?message=请在微信客户端打开链接'
@@ -206,7 +220,7 @@ const getConveyData = Obj => {
 			}
 
 			.list-item-type {
-				color: #00baad;
+				color: #3d51e8;
 			}
 
 			.list-item-progress {

unpackage/dist/build/h5/assets/uni-app.es.1945295c.js

@@ -0,0 +1 @@
+import{a6 as a,a7 as s,a8 as o,a9 as r,aa as n,ab as t,ac as c,ad as e}from"./index-e5409a79.js";function i(a,s){return c(a)?s:a}const b=o=>(r,n=s())=>{!e&&a(o,r,n)},d=b(o),f=b(r),m=b(n),p=b(t);export{d as a,p as b,m as c,f as o,i as r};

unpackage/dist/build/h5/assets/uni-app.es.fb9b0d80.js

@@ -1 +0,0 @@
-import{a5 as a,a6 as s,a7 as o,a8 as r,a9 as n,aa as t,ab as e}from"./index-c03fdd25.js";function i(a,s){return t(a)?s:a}const b=o=>(r,n=s())=>{!e&&a(o,r,n)},c=b(o),f=b(r),m=b(n);export{c as a,m as b,f as o,i as r};

unpackage/dist/build/h5/index.html

@@ -14,7 +14,7 @@
     <title>校车预约</title>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/carstop/dist5/assets/index-c03fdd25.js"></script>
+    <script type="module" crossorigin src="/carstop/dist5/assets/index-e5409a79.js"></script>
     <link rel="stylesheet" href="/carstop/dist5/assets/index-88c6c4d6.css">
   </head>
   <body>