添加爽约已核销状态

manifest.json

@@ -65,8 +65,8 @@
                 "/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/",
+                    "target" : "http://192.168.161.220:8088/carBook",
+                    // "target" : "https://chtech.ncjti.edu.cn/testingServertomcat/carbook/",
                     //是否跨域
                     "changeOrigin" : true,
                     // 设置支持https协议的代理
@@ -79,5 +79,5 @@
         }
     }
 }
-// "base" : "/testingServertomcat/dist5/"
+// "base": "/testingServertomcat/dist5/"
 

pages/my/my.vue

@@ -13,6 +13,7 @@
 					<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>
 			</view>
 			<view class="list-info">
@@ -103,7 +104,7 @@ onPullDownRefresh(() => {
 	currentPage.value = 1
 	listData.value = []
 	getMyData()
-	setTimeout(function() {
+	setTimeout(function () {
 		uni.stopPullDownRefresh()
 	}, 500)
 })
@@ -148,6 +149,10 @@ const typeList = ref([
 	{
 		text: '已爽约',
 		value: 5
+	},
+	{
+		text: '爽约已核销',
+		value: 6
 	}
 ])
 // 筛选条件时间列表
@@ -208,11 +213,11 @@ const handleChange = () => {
 }
 
 // 我已上车按钮回调
-const handleOnCar = id => {
+const handleOnCar = (id) => {
 	uni.showModal({
 		title: '提示',
 		content: '确定已经上车吗？',
-		success: res => {
+		success: (res) => {
 			if (res.confirm) {
 				handleOnCarRequest(id)
 			} else if (res.cancel) {
@@ -222,7 +227,7 @@ const handleOnCar = id => {
 }
 
 // 已上车请求
-const handleOnCarRequest = async id => {
+const handleOnCarRequest = async (id) => {
 	const res = await myRequest({
 		url: '/appBoarding.action',
 		data: {
@@ -244,11 +249,11 @@ const handleOnCarRequest = async id => {
 }
 
 // 取消预约按钮回调
-const handleCancel = id => {
+const handleCancel = (id) => {
 	uni.showModal({
 		title: '提示',
 		content: '确定取消预约吗？',
-		success: res => {
+		success: (res) => {
 			if (res.confirm) {
 				handleCancelRequest(id)
 			} else if (res.cancel) {
@@ -257,7 +262,7 @@ const handleCancel = id => {
 	})
 }
 // 取消预约请求
-const handleCancelRequest = async id => {
+const handleCancelRequest = async (id) => {
 	const res = await myRequest({
 		url: '/appcancelOrder.action',
 		data: {
@@ -279,7 +284,7 @@ const handleCancelRequest = async id => {
 }
 
 // 筛选下拉框确定选择回调
-const getConveyData = Obj => {
+const getConveyData = (Obj) => {
 	// console.log(Obj)
 	result_state.value = Obj.typeIndex
 	date_state.value = Obj.timeIndex - 0 + 1
@@ -311,11 +316,10 @@ const getConveyData = Obj => {
 			border-bottom: 1rpx solid #e6e6e6;
 
 			.list-img {
-				width: 121rpx;
+				margin-right: 10rpx;
 				height: 34rpx;
 
 				img {
-					// width: 100%;
 					height: 100%;
 				}
 			}

unpackage/dist/build/h5/assets/api.897d7865.js

@@ -1 +1 @@
-import{E as a,G as e,V as t,p as o}from"./index-004972ce.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-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};

unpackage/dist/build/h5/assets/uni-app.es.f6244607.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-004972ce.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-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};

unpackage/dist/build/h5/index.html

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