Jelajahi Sumber

更改页面样式

xiaoxin 2 tahun lalu
induk
melakukan
c0bec908ea
60 mengubah file dengan 247 tambahan dan 173 penghapusan
  1. 80 80
      manifest.json
  2. 1 1
      pages.json
  3. 3 3
      pages/detailDriver/detailDriver.vue
  4. 71 31
      pages/home/home.vue
  5. 3 0
      pages/index/index.vue
  6. 23 11
      pages/my/my.vue
  7. 17 8
      pages/record/record.vue
  8. 21 12
      pages/recordDriver/recordDriver.vue
  9. TEMPAT SAMPAH
      static/assigned.png
  10. TEMPAT SAMPAH
      static/box.png
  11. TEMPAT SAMPAH
      static/cancel.png
  12. TEMPAT SAMPAH
      static/pass.png
  13. TEMPAT SAMPAH
      static/right2.png
  14. TEMPAT SAMPAH
      static/success.png
  15. TEMPAT SAMPAH
      static/unAppoint.png
  16. TEMPAT SAMPAH
      static/verification.png
  17. TEMPAT SAMPAH
      static/waiting.png
  18. 1 1
      unpackage/dist/build/h5/assets/api.14bd61a2.js
  19. 1 0
      unpackage/dist/build/h5/assets/detailDriver-1dd5631c.css
  20. 0 1
      unpackage/dist/build/h5/assets/detailDriver-5b6bd8b6.css
  21. 1 1
      unpackage/dist/build/h5/assets/filterIdentity.752142a1.js
  22. 0 1
      unpackage/dist/build/h5/assets/home-666832aa.css
  23. 1 0
      unpackage/dist/build/h5/assets/home-e928c05d.css
  24. 0 6
      unpackage/dist/build/h5/assets/index-6dd6c134.js
  25. 6 0
      unpackage/dist/build/h5/assets/index-e69583df.js
  26. 1 0
      unpackage/dist/build/h5/assets/my-0d826fe6.css
  27. 0 1
      unpackage/dist/build/h5/assets/my-6c8d5f5b.css
  28. 1 1
      unpackage/dist/build/h5/assets/pages-404-404.1eeef72f.js
  29. 1 1
      unpackage/dist/build/h5/assets/pages-detail-detail.4cfef2ec.js
  30. 1 1
      unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.bb63721d.js
  31. 0 1
      unpackage/dist/build/h5/assets/pages-home-home.9357ff40.js
  32. 1 0
      unpackage/dist/build/h5/assets/pages-home-home.ca8b7ace.js
  33. 1 1
      unpackage/dist/build/h5/assets/pages-index-index.1c9f62ab.js
  34. 1 0
      unpackage/dist/build/h5/assets/pages-my-my.48bca581.js
  35. 0 1
      unpackage/dist/build/h5/assets/pages-my-my.f59047a2.js
  36. 0 1
      unpackage/dist/build/h5/assets/pages-record-record.ad919717.js
  37. 1 0
      unpackage/dist/build/h5/assets/pages-record-record.fe751d9f.js
  38. 0 1
      unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.3c1bb402.js
  39. 1 0
      unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.a59e4b8b.js
  40. 1 0
      unpackage/dist/build/h5/assets/record-61b7d42b.css
  41. 0 1
      unpackage/dist/build/h5/assets/record-7d5a3dca.css
  42. 1 0
      unpackage/dist/build/h5/assets/recordDriver-2f0c32dd.css
  43. 0 1
      unpackage/dist/build/h5/assets/recordDriver-a5887b05.css
  44. 1 1
      unpackage/dist/build/h5/assets/right.5b5369cb.js
  45. 1 0
      unpackage/dist/build/h5/assets/search.39602408.js
  46. 0 1
      unpackage/dist/build/h5/assets/search.79cdfc7b.js
  47. 1 1
      unpackage/dist/build/h5/assets/uni-app.es.67f4ac91.js
  48. 1 0
      unpackage/dist/build/h5/assets/uni.91e17222.css
  49. 0 1
      unpackage/dist/build/h5/assets/uni.956a6ead.css
  50. 2 2
      unpackage/dist/build/h5/index.html
  51. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/assigned.png
  52. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/box.png
  53. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/cancel.png
  54. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/pass.png
  55. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/right2.png
  56. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/success.png
  57. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/unAppoint.png
  58. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/verification.png
  59. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/waiting.png
  60. 1 0
      util/api.js

+ 80 - 80
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" : "/testingServertomcat/dist5/",
+            "base" : "/carstop/dist5/"
+        }
+    }
 }
-// "base": "/testingServertomcat/dist5/"

+ 1 - 1
pages.json

@@ -63,7 +63,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "校车预约",
+		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"app-plus": {

+ 3 - 3
pages/detailDriver/detailDriver.vue

@@ -73,14 +73,14 @@
 			<!-- 筛选区域 -->
 			<view class="list-search" v-if="info.user_num !== '0'">
 				<!-- 身份筛选区域 -->
-				<picker style="width: 50%;" :range="statusList" range-key="text" @change="bindPickerChange($event, 1)">
+				<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)">
+				<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>
@@ -122,7 +122,7 @@ import { isWeixin } from '@/util/isWeixin.js'
 
 import { filterIdentity } from '@/util/filterIdentity.js'
 
-onLoad(options => {
+onLoad((options) => {
 	if (isWeixin()) {
 		filterIdentity()
 		info.value = JSON.parse(options.info)

+ 71 - 31
pages/home/home.vue

@@ -16,7 +16,7 @@
 			<view class="path-title">请选择路线</view>
 			<view class="path-list" v-if="pathList.length">
 				<view
-					:class="currentIndex1 === index ? 'active path-item' : 'path-item'"
+					:class="[index % 2 === 1 ? 'active path-item' : 'path-item', { scale: currentIndex1 === index }]"
 					v-for="(item, index) in pathList"
 					:key="index"
 					@click="handleChangeCurrentIndex(1, index, item)"
@@ -31,7 +31,7 @@
 		<view class="carList">
 			<view class="carList-title">请选择车辆</view>
 			<view
-				:class="[currentIndex2 === index ? 'active ' : '', item.can_order == 0 ? 'unactive' : '', 'carList-item']"
+				:class="[currentIndex1 === 0 ? 'yellow ' : 'blue', item.can_order == 0 ? 'unactive' : '', 'carList-item']"
 				v-for="(item, index) in busList"
 				:key="index"
 				@click="handleChangeCurrentIndex(2, index, item)"
@@ -44,6 +44,7 @@
 						<span>容量:{{ item.boarde_num + '/' + item.contain }}</span>
 					</view>
 				</view>
+				<view v-if="currentIndex2 === index" class="item-check" :class="currentIndex1 === 0 ? 'type ' : 'type2'">✔</view>
 			</view>
 
 			<!-- 没有数据时展示的区域 -->
@@ -56,14 +57,16 @@
 		<!-- 立即预约按钮区域 -->
 		<view class="btn-box" v-if="busList.length">
 			<view class="btn">
-				<view class="btn-clock"><img src="../../static/clock.png" /></view>
+				<view class="btn-clock">
+					<img src="../../static/clock.png" />
+				</view>
 				<view class="btn-info" v-if="status">
 					<view class="btn-info-title">开始预约时间段</view>
 					<view>{{ yy_duration }}</view>
 				</view>
 				<view class="btn-info" v-else>
 					<view class="btn-info-title2">候补截止时间</view>
-					<view class="btn-info-time">{{ currentPath == '墨轩湖校区-黄家湖校区' ? mxh_end : hjh_end }}</view>
+					<view class="btn-info-time">{{ currentPath == '靖安-南昌' ? mxh_end : hjh_end }}</view>
 				</view>
 
 				<view class="btn-button" @click="handleSub">{{ status ? '立即预约' : '候补预约' }}</view>
@@ -130,7 +133,7 @@ onPullDownRefresh(() => {
 	currentBusId.value = null
 	busList.value = []
 
-	setTimeout(function() {
+	setTimeout(function () {
 		currentPath.value = pathList.value[0].route
 		getBusList(pathList.value[0].route)
 		uni.stopPullDownRefresh()
@@ -163,9 +166,9 @@ const currentBusId = ref(null)
 const yy_duration = ref('')
 // 预约截止时间
 const yy_end = ref('')
-// 黄家湖校区-墨轩湖校区 候补截止时间
+// 南昌-靖安 候补截止时间
 const hjh_end = ref('')
-// 墨轩湖校区-黄家湖校区 候补截止时间
+// 靖安-南昌 候补截止时间
 const mxh_end = ref('')
 // 爽约次数
 const black_count = ref('')
@@ -176,9 +179,9 @@ const status = ref(true)
 // 监听车辆列表更改候补预约状态
 watch(
 	() => busList.value,
-	newValue => {
+	(newValue) => {
 		if (newValue.length) {
-			let flag = newValue.some(item => item.can_order == 1)
+			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) {
@@ -200,7 +203,7 @@ const getPathList = async () => {
 }
 
 // 根据路线查询所有车次
-const getBusList = async route => {
+const getBusList = async (route) => {
 	busList.value = []
 	// 处理时间参数
 	let date = new Date()
@@ -251,7 +254,7 @@ const handleSub = () => {
 		uni.showModal({
 			title: '提示',
 			content: '确定预约吗?',
-			success: res => {
+			success: (res) => {
 				if (res.confirm) {
 					handleSubscribe()
 				} else if (res.cancel) {
@@ -283,7 +286,7 @@ const handleSub = () => {
 		uni.showModal({
 			title: '提示',
 			content: '确定候补预约吗?',
-			success: res => {
+			success: (res) => {
 				if (res.confirm) {
 					handleStandby()
 				} else if (res.cancel) {
@@ -330,7 +333,7 @@ const handleStandby = async () => {
 		data: {
 			route: currentPath.value,
 			card_number: card_number.value,
-			hh_end: currentPath.value == '墨轩湖校区-黄家湖校区' ? mxh_end.value : hjh_end.value
+			hh_end: currentPath.value == '靖安-南昌' ? mxh_end.value : hjh_end.value
 		}
 	})
 	// console.log(res);
@@ -360,6 +363,13 @@ const handleChangeCurrentIndex = (type, index, item) => {
 		// 如果车辆不能预约则不进行任何操作
 		if (item.can_order == 0) {
 		} else {
+			if (currentIndex1.value === 0) {
+				uni.showToast({
+					title: '只到黄家湖不前往墨轩湖不需要预约',
+					icon: 'none',
+					mask: true
+				})
+			}
 			currentIndex2.value = index
 			currentBusId.value = item.id
 		}
@@ -389,7 +399,7 @@ const handleChangeTime = () => {
 }
 
 // 获取格式化时间 日期 和 星期
-const getTimeFormat = dayType => {
+const getTimeFormat = (dayType) => {
 	let date = new Date()
 	if (dayType) {
 		let targetday = date.getTime() + 1000 * 60 * 60 * 24
@@ -406,7 +416,7 @@ const getTimeFormat = dayType => {
 }
 
 // 点击电话回调
-const handlePhone = phone => {
+const handlePhone = (phone) => {
 	uni.makePhoneCall({
 		phoneNumber: phone
 	})
@@ -469,14 +479,19 @@ const handlePhone = phone => {
 				min-width: 45%;
 				line-height: 96rpx;
 				text-align: center;
-				font-size: 27rpx;
+				font-size: 40rpx;
+				font-weight: bold;
 				border-radius: 14rpx;
-				background-color: #ebebeb;
+				background-color: #ffdb6e;
+			}
+
+			.scale {
+				transform: scale(1.08);
 			}
 
 			.active {
 				color: #fff;
-				background-color: #5c60f3;
+				background-color: #3d51e8;
 
 				.item-info {
 					.item-info-detail {
@@ -517,11 +532,15 @@ const handlePhone = phone => {
 		}
 
 		.carList-item {
+			position: relative;
 			display: flex;
 			align-items: center;
 			box-sizing: border-box;
-			padding: 37rpx 30rpx 32rpx;
-			height: 163rpx;
+			padding: 37rpx 100rpx 32rpx 30rpx;
+			margin: 0 auto 20rpx;
+			width: 690rpx;
+			height: 224rpx;
+			border-radius: 24rpx;
 
 			.item-time {
 				position: relative;
@@ -534,11 +553,12 @@ const handlePhone = phone => {
 				height: 77rpx;
 				position: absolute;
 				top: -15rpx;
-				right: 0;
+				right: 0rpx;
 				border-right: 1px solid #a6a6a6;
 			}
 
 			.item-info {
+				flex: 1;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-around;
@@ -550,7 +570,6 @@ const handlePhone = phone => {
 				}
 
 				.item-info-detail {
-					color: #999999;
 					font-size: 26rpx;
 
 					span {
@@ -558,17 +577,38 @@ const handlePhone = phone => {
 					}
 				}
 			}
-		}
 
-		.active {
-			color: #fff;
-			background-color: #5c60f3;
+			.item-check {
+				position: absolute;
+				right: 2rpx;
+				bottom: 2rpx;
+				display: flex;
+				justify-content: center;
+				width: 100rpx;
+				height: 70rpx;
+				font-size: 50rpx;
+				border-radius: 24rpx 0 22rpx 0;
+			}
 
-			.item-info {
-				.item-info-detail {
-					color: #fff;
-				}
+			.type {
+				color: #fff;
+				background-color: #d43030;
 			}
+
+			.type2 {
+				color: #3d51e8;
+				background-color: #fff;
+			}
+		}
+
+		.yellow {
+			color: #e01f1f;
+			background-color: #ffdb6e;
+		}
+
+		.blue {
+			color: #fff;
+			background-color: #3d51e8;
 		}
 
 		.unactive {
@@ -626,7 +666,7 @@ const handlePhone = phone => {
 				flex-direction: column;
 				justify-content: center;
 				font-size: 24rpx;
-				color: #5863f1;
+				color: #d43030;
 
 				.btn-info-title {
 					margin-bottom: 8rpx;

+ 3 - 0
pages/index/index.vue

@@ -14,7 +14,10 @@ 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 = 'http://192.168.161.220:8088/carBook/appopenid.action'
 

+ 23 - 11
pages/my/my.vue

@@ -5,15 +5,15 @@
 
 		<!-- 列表区域 -->
 		<view class="list" v-for="(item, index) in listData" :key="index">
-			<view class="list-title">
+			<view class="list-title" :class="item.route === '南昌-靖安' ? 'type' : 'type2'">
 				<view>{{ item.route }}</view>
-				<view class="list-img" :class="item.state === 1 ? 'mr-30' : ''">
-					<img v-if="item.state === 1" src="../../static/success.png" />
-					<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" />
-					<img v-if="item.state === 6" src="../../static/verification.png" />
+				<view class="list-img" :class="[item.state === 1 ? 'mr-30' : '', { blue: item.route === '南昌-靖安' }]">
+					<view v-if="item.state === 1" class="">预约成功</view>
+					<view v-if="item.state === 2" class="">已乘车</view>
+					<view v-if="item.state === 3" class="">候补中...</view>
+					<view v-if="item.state === 4" class="">已取消</view>
+					<view v-if="item.state === 5" class="">已爽约</view>
+					<view v-if="item.state === 6" class="">爽约已核销</view>
 				</view>
 			</view>
 			<view class="list-info">
@@ -318,10 +318,12 @@ const getConveyData = (Obj) => {
 			.list-img {
 				margin-right: 10rpx;
 				height: 34rpx;
+				font-size: 28rpx;
+				font-weight: 400;
+			}
 
-				img {
-					height: 100%;
-				}
+			.blue {
+				color: #3c50e8;
 			}
 
 			.mr-30 {
@@ -329,6 +331,16 @@ const getConveyData = (Obj) => {
 			}
 		}
 
+		.type {
+			color: #000;
+			background-color: #ffdb6e;
+		}
+
+		.type2 {
+			color: #fff;
+			background-color: #3c50e8;
+		}
+
 		.list-info {
 			display: flex;
 			flex-direction: column;

+ 17 - 8
pages/record/record.vue

@@ -5,9 +5,12 @@
 
 		<!-- 列表区域 -->
 		<view class="list" v-for="(item, index) in listData" :key="index" @click="handleLookDetail(item)">
-			<view class="list-title">
-				<view class="title-number">车牌:{{ item.car_number != 0 ? item.car_number : '无' }}</view>
-				<view class="title-icon"><img src="../../static/right.png" /></view>
+			<view class="list-title" :class="item.route === '南昌-靖安' ? 'type' : 'type2'">
+				<view class="title-number">{{ item.route }} &nbsp; 车牌:{{ item.car_number != 0 ? item.car_number : '无' }}</view>
+				<view class="title-icon">
+					<img v-if="item.route === '南昌-靖安'" src="../../static/right.png" />
+					<img v-if="item.route === '靖安-南昌'" src="../../static/right2.png" />
+				</view>
 			</view>
 			<view class="list-item">
 				状态:
@@ -26,10 +29,6 @@
 				<span>{{ item.sm_start + '-' + item.sm_end }}</span>
 			</view>
 			<view class="list-item">
-				线路:
-				<span>{{ item.route }}</span>
-			</view>
-			<view class="list-item">
 				站点:
 				<span>{{ item.route_end }}</span>
 			</view>
@@ -195,6 +194,16 @@ const getConveyData = (Obj) => {
 			}
 		}
 
+		.type {
+			color: #000;
+			background-color: #ffdb6e;
+		}
+
+		.type2 {
+			color: #fff;
+			background-color: #3c50e8;
+		}
+
 		.list-item {
 			display: flex;
 			align-items: center;
@@ -237,4 +246,4 @@ const getConveyData = (Obj) => {
 		}
 	}
 }
-</style>
+</style>

+ 21 - 12
pages/recordDriver/recordDriver.vue

@@ -5,9 +5,12 @@
 
 		<!-- 列表区域 -->
 		<view class="list" v-for="(item, index) in listData" :key="index" @click="handleLookDetail(item)">
-			<view class="list-title">
-				<view class="title-number">车牌:{{ item.car_number != 0 ? item.car_number : '无' }}</view>
-				<view class="title-icon"><img src="../../static/right.png" /></view>
+			<view class="list-title" :class="item.route === '南昌-靖安' ? 'type' : 'type2'">
+				<view class="title-number">{{ item.route }} &nbsp; 车牌:{{ item.car_number != 0 ? item.car_number : '无' }}</view>
+				<view class="title-icon">
+					<img v-if="item.route === '南昌-靖安'" src="../../static/right.png" />
+					<img v-if="item.route === '靖安-南昌'" src="../../static/right2.png" />
+				</view>
 			</view>
 			<view class="list-item">
 				状态:
@@ -26,10 +29,6 @@
 				<span>{{ item.sm_start + '-' + item.sm_end }}</span>
 			</view>
 			<view class="list-item">
-				线路:
-				<span>{{ item.route }}</span>
-			</view>
-			<view class="list-item">
 				站点:
 				<span>{{ item.route_end }}</span>
 			</view>
@@ -79,7 +78,7 @@ onLoad(() => {
 onPullDownRefresh(() => {
 	getBusList()
 	getData()
-	setTimeout(function() {
+	setTimeout(function () {
 		uni.stopPullDownRefresh()
 	}, 500)
 })
@@ -136,7 +135,7 @@ const getData = async () => {
 	})
 	// console.log(res.data)
 	if (res.data.length) {
-		res.data.forEach(item => {
+		res.data.forEach((item) => {
 			item.percent = Math.ceil((parseInt(item.user_num) / parseInt(item.contain)) * 100)
 		})
 	}
@@ -167,7 +166,7 @@ const getBusList = async () => {
 }
 
 // 点击每一条记录回调
-const handleLookDetail = item => {
+const handleLookDetail = (item) => {
 	const info = JSON.stringify(item)
 	uni.navigateTo({
 		url: `/pages/detailDriver/detailDriver?info=${info}`
@@ -175,7 +174,7 @@ const handleLookDetail = item => {
 }
 
 // 条件筛选框选择回调
-const getConveyData = Obj => {
+const getConveyData = (Obj) => {
 	// console.log(Obj)
 	result_state.value = Obj.typeIndex
 	busNumber.value = busList.value[Obj.timeIndex].text
@@ -215,6 +214,16 @@ const getConveyData = Obj => {
 			}
 		}
 
+		.type {
+			color: #000;
+			background-color: #ffdb6e;
+		}
+
+		.type2 {
+			color: #fff;
+			background-color: #3c50e8;
+		}
+
 		.list-item {
 			display: flex;
 			align-items: center;
@@ -257,4 +266,4 @@ const getConveyData = Obj => {
 		}
 	}
 }
-</style>
+</style>

TEMPAT SAMPAH
static/assigned.png


TEMPAT SAMPAH
static/box.png


TEMPAT SAMPAH
static/cancel.png


TEMPAT SAMPAH
static/pass.png


TEMPAT SAMPAH
static/right2.png


TEMPAT SAMPAH
static/success.png


TEMPAT SAMPAH
static/unAppoint.png


TEMPAT SAMPAH
static/verification.png


TEMPAT SAMPAH
static/waiting.png


+ 1 - 1
unpackage/dist/build/h5/assets/api.14bd61a2.js

@@ -1 +1 @@
-import{E as a,G as e,V as t,p as o}from"./index-6dd6c134.js";const s=s=>(a({title:"加载中",mask:!0}),new Promise(((a,d)=>{e({url:"/carstop/carbook"+s.url,method:s.method||"GET",data:s.data||{},header:s.header,success:e=>{t(),200===e.data.code?a(e.data.data):o({title:e.data.message,icon:"none"})},fail:a=>{t(),o({title:"请求数据失败",icon:"none"}),d(a)}})})));export{s as m};
+import{E as a,G as e,V as t,p as o}from"./index-e69583df.js";const s=s=>(a({title:"加载中",mask:!0}),new Promise(((a,d)=>{e({url:"/carstop/carbook"+s.url,method:s.method||"GET",data:s.data||{},header:s.header,success:e=>{t(),200===e.data.code?a(e.data.data):o({title:e.data.message,icon:"none"})},fail:a=>{t(),o({title:"请求数据失败",icon:"none"}),d(a)}})})));export{s as m};

File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/detailDriver-1dd5631c.css


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/detailDriver-5b6bd8b6.css


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/filterIdentity.752142a1.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/home-666832aa.css


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/home-e928c05d.css


File diff ditekan karena terlalu besar
+ 0 - 6
unpackage/dist/build/h5/assets/index-6dd6c134.js


File diff ditekan karena terlalu besar
+ 6 - 0
unpackage/dist/build/h5/assets/index-e69583df.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/my-0d826fe6.css


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/my-6c8d5f5b.css


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/pages-404-404.1eeef72f.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/pages-detail-detail.4cfef2ec.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.bb63721d.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/pages-home-home.9357ff40.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/pages-home-home.ca8b7ace.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/pages-index-index.1c9f62ab.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/pages-my-my.48bca581.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/pages-my-my.f59047a2.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/pages-record-record.ad919717.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/pages-record-record.fe751d9f.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.3c1bb402.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.a59e4b8b.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/record-61b7d42b.css


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/record-7d5a3dca.css


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/recordDriver-2f0c32dd.css


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/recordDriver-a5887b05.css


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/build/h5/assets/right.5b5369cb.js


File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/search.39602408.js


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/search.79cdfc7b.js


+ 1 - 1
unpackage/dist/build/h5/assets/uni-app.es.67f4ac91.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-6dd6c134.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-e69583df.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};

File diff ditekan karena terlalu besar
+ 1 - 0
unpackage/dist/build/h5/assets/uni.91e17222.css


File diff ditekan karena terlalu besar
+ 0 - 1
unpackage/dist/build/h5/assets/uni.956a6ead.css


+ 2 - 2
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="/carstop/dist5/assets/uni.91e17222.css">
 
 		<meta charset="UTF-8" />
 
@@ -16,7 +16,7 @@
 		<title>校车预约</title>
 		<!--preload-links-->
 		<!--app-context-->
-		<script type="module" crossorigin src="/carstop/dist5/assets/index-6dd6c134.js"></script>
+		<script type="module" crossorigin src="/carstop/dist5/assets/index-e69583df.js"></script>
 		<link rel="stylesheet" href="/carstop/dist5/assets/index-88c6c4d6.css">
 	</head>
 	<body>

TEMPAT SAMPAH
unpackage/dist/build/h5/static/assigned.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/box.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/cancel.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/pass.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/right2.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/success.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/unAppoint.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/verification.png


TEMPAT SAMPAH
unpackage/dist/build/h5/static/waiting.png


+ 1 - 0
util/api.js

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