车队长司机详情页面添加身份筛选，区别教师和临时人员

manifest.json

@@ -1,82 +1,82 @@
 {
-	"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.220:8088/carBook",
-					// "target": "https://chtech.ncjti.edu.cn/testingServertomcat/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.220:8088/carBook",
+                    // "target": "https://chtech.ncjti.edu.cn/testingServertomcat/carbook/",
+                    //是否跨域
+                    "changeOrigin" : true,
+                    // 设置支持https协议的代理
+                    "secure" : false
+                }
+            }
+        },
+        "router" : {
+            // "base" : "/carstop/dist5/"
+            "base" : "/testingServertomcat/dist5/"
+        }
+    }
 }
-// "base" : "/testingServertomcat/dist5/"

pages/detail/detail.vue

@@ -122,11 +122,20 @@
 
 		<!-- 人员名单区域 -->
 		<view class="list">
-			<view class="list-title" v-if="info.user_num != 0">
-				<!-- 人员名单（{{ info.user_num }}/{{ info.contain }}） -->
-				<view class="list-title-left">人员名单（{{ typeList[result_state].text }}{{ listData.length }}人）</view>
-				<picker style="width: 38%;" :range="typeList" range-key="text" @change="bindPickerChange($event, 6)">
-					<view class="list-title-right">
+			<!-- 标题区域 -->
+			<view class="list-title" v-if="info.user_num != 0">人员名单（{{ listData.length }}人）</view>
+			<!-- 筛选区域 -->
+			<view class="list-search" v-if="info.user_num !== '0'">
+				<!-- 身份筛选区域 -->
+				<picker style="width: 50%;" :range="statusList" range-key="text" @change="bindPickerChange($event, 6)">
+					<view class="list-search-item">
+						{{ statusList[result_status].text }}
+						<view class="right-img"><img src="../../static/bottom.png" /></view>
+					</view>
+				</picker>
+				<!-- 上车状态筛选区域 -->
+				<picker style="width: 50%;" :range="typeList" range-key="text" @change="bindPickerChange($event, 8)">
+					<view class="list-search-item2">
 						{{ typeList[result_state].text }}
 						<view class="right-img"><img src="../../static/bottom.png" /></view>
 					</view>
@@ -271,7 +280,7 @@ const time_late = ref(null)
 // 发车前多少分钟截止预约
 const time_yy_end = ref(null)
 
-// 人员名单筛选状态
+// 人员名单上车状态
 const result_state = ref(0)
 
 const typeList = ref([
@@ -289,6 +298,24 @@ const typeList = ref([
 	}
 ])
 
+// 人员名单身份类型
+const result_status = ref(0)
+
+const statusList = ref([
+	{
+		text: '全部',
+		value: 0
+	},
+	{
+		text: '教师',
+		value: 1
+	},
+	{
+		text: '临时人员',
+		value: 2
+	}
+])
+
 // 获取路线数组请求
 const getPathList = async () => {
 	const res = await myRequest({
@@ -332,7 +359,8 @@ const getData = async () => {
 		url: '/appqueryAppointeds.action',
 		data: {
 			id: idRef.value,
-			result_state: result_state.value
+			result_state: result_state.value,
+			userzz_state: result_status.value
 		}
 	})
 	// console.log(res)
@@ -517,26 +545,29 @@ const changeMultiple = e => {
 
 // 原生下拉框的选择回调事件
 const bindPickerChange = (e, type) => {
-	if (type == 1) {
+	if (type === 1) {
 		info.value.ci_time = e.detail.value
 		info.value.sm_start = time_change(info.value.ci_time, time_early.value * -1)
 		info.value.sm_end = time_change(info.value.ci_time, time_late.value)
 		info.value.yy_end = time_change(info.value.ci_time, time_yy_end.value * -1)
-	} else if (type == 2) {
+	} else if (type === 2) {
 		info.value.route = pathList.value[e.detail.value].route
 		getEndList()
 		info.value.route_end = ''
-	} else if (type == 3) {
+	} else if (type === 3) {
 		info.value.route_end = endList.value[e.detail.value].route_end
-	} else if (type == 4) {
+	} else if (type === 4) {
 		info.value.sm_start = e.detail.value
-	} else if (type == 5) {
+	} else if (type === 5) {
 		info.value.sm_end = e.detail.value
-	} else if (type == 6) {
-		result_state.value = e.detail.value
+	} else if (type === 6) {
+		result_status.value = e.detail.value
 		getData()
-	} else if (type == 7) {
+	} else if (type === 7) {
 		info.value.yy_end = e.detail.value
+	} else if (type === 8) {
+		result_state.value = e.detail.value
+		getData()
 	}
 }
 // 获取当前时间  hh:mm
@@ -649,16 +680,17 @@ const getCurrentTime = () => {
 			height: 41rpx;
 			color: #999999;
 			font-size: 28rpx;
+		}
 
-			.list-title-left {
-				flex: 1;
-			}
+		.list-search {
+			display: flex;
+			padding: 20rpx 0;
 
-			.list-title-right {
+			.list-search-item,
+			.list-search-item2 {
 				flex: 1;
 				display: flex;
-				justify-content: flex-end;
-				color: #000;
+				justify-content: flex-start;
 
 				.right-img {
 					margin-left: 27rpx;
@@ -672,6 +704,9 @@ const getCurrentTime = () => {
 					}
 				}
 			}
+			.list-search-item2 {
+				justify-content: flex-end;
+			}
 		}
 
 		.list-item {

pages/detailDriver/detailDriver.vue

@@ -63,16 +63,25 @@
 		<!-- 提前一天预约区域 -->
 		<view class="box">
 			<view class="left">可否提前一天预约</view>
-			<view class="right">{{ info.before_state == 0 ? '不可以' : '可以' }}</view>
+			<view class="right">{{ info.before_state === '0' ? '不可以' : '可以' }}</view>
 		</view>
 
 		<!-- 人员名单区域 -->
 		<view class="list">
-			<view class="list-title">
-				<view class="list-title-left">人员名单（{{ typeList[result_state].text }}{{ listData.length }}人）</view>
-
-				<picker style="width: 38%;" :range="typeList" range-key="text" @change="bindPickerChange">
-					<view class="list-title-right">
+			<!-- 标题区域 -->
+			<view class="list-title" v-if="info.user_num !== '0'">人员名单({{ listData.length }}人)</view>
+			<!-- 筛选区域 -->
+			<view class="list-search" v-if="info.user_num !== '0'">
+				<!-- 身份筛选区域 -->
+				<picker style="width: 50%;" :range="statusList" range-key="text" @change="bindPickerChange($event, 1)">
+					<view class="list-search-item">
+						{{ statusList[result_status].text }}
+						<view class="right-img"><img src="../../static/bottom.png" /></view>
+					</view>
+				</picker>
+				<!-- 上车状态筛选区域 -->
+				<picker style="width: 50%;" :range="typeList" range-key="text" @change="bindPickerChange($event, 2)">
+					<view class="list-search-item2">
 						{{ typeList[result_state].text }}
 						<view class="right-img"><img src="../../static/bottom.png" /></view>
 					</view>
@@ -136,7 +145,7 @@ const idRef = ref(null)
 // 人员列表数组
 const listData = ref([])
 
-// 人员名单筛选状态
+// 人员名单上车状态
 const result_state = ref(0)
 
 const typeList = ref([
@@ -153,6 +162,23 @@ const typeList = ref([
 		value: 2
 	}
 ])
+// 人员名单身份类型
+const result_status = ref(0)
+
+const statusList = ref([
+	{
+		text: '全部',
+		value: 0
+	},
+	{
+		text: '教师',
+		value: 1
+	},
+	{
+		text: '临时人员',
+		value: 2
+	}
+])
 
 // 获取人员名单请求
 const getData = async () => {
@@ -160,7 +186,8 @@ const getData = async () => {
 		url: '/appqueryAppointeds.action',
 		data: {
 			id: idRef.value,
-			result_state: result_state.value
+			result_state: result_state.value,
+			userzz_state: result_status.value
 		}
 	})
 	// console.log(res)
@@ -168,8 +195,12 @@ const getData = async () => {
 }
 
 // 下拉框的选择回调事件
-const bindPickerChange = e => {
-	result_state.value = e.detail.value
+const bindPickerChange = (e, type) => {
+	if (type === 1) {
+		result_status.value = e.detail.value
+	} else if (type === 2) {
+		result_state.value = e.detail.value
+	}
 	getData()
 }
 </script>
@@ -213,16 +244,17 @@ const bindPickerChange = e => {
 			height: 41rpx;
 			color: #999999;
 			font-size: 28rpx;
+		}
 
-			.list-title-left {
-				flex: 1;
-			}
+		.list-search {
+			display: flex;
+			padding: 20rpx 0;
 
-			.list-title-right {
+			.list-search-item,
+			.list-search-item2 {
 				flex: 1;
 				display: flex;
-				justify-content: flex-end;
-				color: #000;
+				justify-content: flex-start;
 
 				.right-img {
 					margin-left: 27rpx;
@@ -236,6 +268,10 @@ const bindPickerChange = e => {
 					}
 				}
 			}
+
+			.list-search-item2 {
+				justify-content: flex-end;
+			}
 		}
 
 		.list-item {

pages/index/index.vue

@@ -11,9 +11,10 @@ import { myRequest } from '@/util/api.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/testingServertomcat/carbook/appopenid.action'
+// const URL = 'https://chtech.ncjti.edu.cn/carstop/carbook/appopenid.action'
+const URL = 'https://chtech.ncjti.edu.cn/testingServertomcat/carbook/appopenid.action'
 // 本地地址
 // const URL = 'http://192.168.161.220:8088/carBook/appopenid.action'
 
@@ -23,23 +24,18 @@ onLoad(() => {
 
 // 获取用户card_number
 const loginFilter = () => {
-	const card_number = uni.getStorageSync('bus_card_number')
+	const card_number = getQueryString('card_number')
 	if (!card_number) {
-		const card_number = getQueryString('card_number')
-		if (!card_number) {
-			// 兼容小程序
-			const type = getQueryString('type')
-			if (type === 'weixin') {
-				// 跳转回小程序页面
-				jWeixin.miniProgram.reLaunch({ url: '/pages/index/index' })
-			} else {
-				getCardnumberURL()
-			}
+		// 判断是否是从小程序进入
+		const type = getQueryString('type')
+		if (type === 'weixin') {
+			// 跳转回小程序页面授权
+			jWeixin.miniProgram.reLaunch({ url: '/pages/index/index' })
 		} else {
-			uni.setStorageSync('bus_card_number', card_number)
-			getUserInfo()
+			getCardnumberURL()
 		}
 	} else {
+		uni.setStorageSync('bus_card_number', card_number)
 		getUserInfo()
 	}
 }

unpackage/dist/build/h5/assets/_plugin-vue_export-helper.563c4239.js

@@ -0,0 +1 @@
+const s="/testingServertomcat/dist5/assets/no-bus-49df1801.png",t=(s,t)=>{const o=s.__vccOpts||s;for(const[n,c]of t)o[n]=c;return o};export{t as _,s as a};

unpackage/dist/build/h5/assets/_plugin-vue_export-helper.85faaf7d.js

@@ -1 +0,0 @@
-const s="/carstop/dist5/assets/no-bus-49df1801.png",t=(s,t)=>{const o=s.__vccOpts||s;for(const[c,n]of t)o[c]=n;return o};export{t as _,s as a};

unpackage/dist/build/h5/assets/api.65c7dcee.js

@@ -1 +0,0 @@
-import{U as a,E as e,V as s,Z as t,y as d,p as o}from"./index-0e1d4b94.js";const r=r=>(a({title:"加载中",mask:!0}),new Promise(((a,n)=>{e({url:"/carstop/carbook"+r.url,method:r.method||"GET",data:r.data||{},header:r.header,success:e=>{s(),200===e.data.code?a(e.data.data):"未查到用户信息"==e.data.message?(t("bus_card_number"),d({url:"/pages/index/index"})):o({title:e.data.message,icon:"none"})},fail:a=>{s(),o({title:"请求数据失败",icon:"none"}),n(a)}})})));export{r as m};

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

@@ -1 +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-0e1d4b94.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};
+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-b1399800.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/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<link rel="stylesheet" href="/carstop/dist5/assets/uni.956a6ead.css">
+		<link rel="stylesheet" href="/testingServertomcat/dist5/assets/uni.956a6ead.css">
 
 		<meta charset="UTF-8" />
 
@@ -16,8 +16,8 @@
 		<title>校车预约</title>
 		<!--preload-links-->
 		<!--app-context-->
-		<script type="module" crossorigin src="/carstop/dist5/assets/index-0e1d4b94.js"></script>
-		<link rel="stylesheet" href="/carstop/dist5/assets/index-88c6c4d6.css">
+		<script type="module" crossorigin src="/testingServertomcat/dist5/assets/index-b1399800.js"></script>
+		<link rel="stylesheet" href="/testingServertomcat/dist5/assets/index-88c6c4d6.css">
 	</head>
 	<body>
 		<div id="app"><!--app-html--></div>

util/api.js

@@ -1,5 +1,5 @@
-const BASE_URL = "/carstop/carbook"
-// const BASE_URL = "/testingServertomcat/carbook/"
+// const BASE_URL = "/carstop/carbook"
+const BASE_URL = "/testingServertomcat/carbook/"
 export const myRequest = (options) => {
 	uni.showLoading({
 		title: "加载中",