2 years ago · 07fc2768e4
--- a/manifest.json
+++ b/manifest.json
@@ -64,9 +64,9 @@
 
				             "proxy" : {
			
 
				                 "/carstop/carbook" : {
			
 
				                     //目标接口域名
			
 
				-                    "target" : "https://chtech.ncjti.edu.cn/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" : "https://chtech.ncjti.edu.cn/testingServertomcat/carbook/",
			
 
				                     //是否跨域
			
 
				                     "changeOrigin" : true,
			
 
				                     // 设置支持https协议的代理
			
@@ -75,8 +75,9 @@
 
				             }
			
 
				         },
			
 
				         "router" : {
			
 
				-            // "base" : "/testingServertomcat/dist5/",
			
 
				-            "base" : "/carstop/dist5/"
			
 
				+            "base" : "/testingServertomcat/dist5/"
			
 
				         }
			
 
				     }
			
 
				 }
			
 
				+// "base": "/carstop/dist5/"
			
 
				+
			
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,10 +13,10 @@ 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 = 'https://chtech.ncjti.edu.cn/testingServertomcat/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'
			
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -55,7 +55,7 @@
 
				 				<!-- <view class="list-button-change" v-if="item.state ===1" @click="handleChange">
			
 
				 					更换车次
			
 
				 				</view> -->
			
 
				-				<view class="list-button-change" v-if="item.state === 1 && item.contain == 6" @click="handleOnCar(item.id)">我已上车</view>
			
 
				+				<view class="list-button-change" v-if="item.state === 1 && item.is_device == ''" @click="handleOnCar(item.id)">我已上车</view>
			
 
				 				<view class="list-button-cancel" v-if="item.state === 1 || item.state === 3" @click="handleCancel(item.id)">取消预约</view>
			
 
				 			</view>
			
 
				 		</view>
			
--- a/unpackage/dist/build/h5/assets/_plugin-vue_export-helper.85faaf7d.js
+++ b/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};
			
--- a/unpackage/dist/build/h5/assets/api.9a3ad04e.js
+++ b/unpackage/dist/build/h5/assets/api.9a3ad04e.js
@@ -1 +0,0 @@
 
				-import{E as a,G as e,V as t,p as o}from"./index-d0748378.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};
			
--- a/unpackage/dist/build/h5/assets/filterIdentity.cbbb7619.js
+++ b/unpackage/dist/build/h5/assets/filterIdentity.cbbb7619.js
--- a/unpackage/dist/build/h5/assets/home-8c9524b3.css
+++ b/unpackage/dist/build/h5/assets/home-8c9524b3.css
--- a/unpackage/dist/build/h5/assets/index-d0748378.js
+++ b/unpackage/dist/build/h5/assets/index-d0748378.js
--- a/unpackage/dist/build/h5/assets/my-0d826fe6.css
+++ b/unpackage/dist/build/h5/assets/my-0d826fe6.css
--- a/unpackage/dist/build/h5/assets/pages-404-404.8587f8da.js
+++ b/unpackage/dist/build/h5/assets/pages-404-404.8587f8da.js
--- a/unpackage/dist/build/h5/assets/pages-detail-detail.b533bc5e.js
+++ b/unpackage/dist/build/h5/assets/pages-detail-detail.b533bc5e.js
--- a/unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.3bd5bff2.js
+++ b/unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.3bd5bff2.js
--- a/unpackage/dist/build/h5/assets/pages-home-home.424d10d2.js
+++ b/unpackage/dist/build/h5/assets/pages-home-home.424d10d2.js
--- a/unpackage/dist/build/h5/assets/pages-index-index.ec8c4c4b.js
+++ b/unpackage/dist/build/h5/assets/pages-index-index.ec8c4c4b.js
--- a/unpackage/dist/build/h5/assets/pages-my-my.f0bbc7e8.js
+++ b/unpackage/dist/build/h5/assets/pages-my-my.f0bbc7e8.js
--- a/unpackage/dist/build/h5/assets/pages-record-record.a21ef099.js
+++ b/unpackage/dist/build/h5/assets/pages-record-record.a21ef099.js
--- a/unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.bb5763e5.js
+++ b/unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.bb5763e5.js
--- a/unpackage/dist/build/h5/assets/pass2.76a9020d.js
+++ b/unpackage/dist/build/h5/assets/pass2.76a9020d.js
--- a/unpackage/dist/build/h5/assets/search-1f99e3e7.css
+++ b/unpackage/dist/build/h5/assets/search-1f99e3e7.css
--- a/unpackage/dist/build/h5/assets/search.bf783dee.js
+++ b/unpackage/dist/build/h5/assets/search.bf783dee.js
--- a/unpackage/dist/build/h5/assets/uni-app.es.74adb8e7.js
+++ b/unpackage/dist/build/h5/assets/uni-app.es.74adb8e7.js
@@ -1 +0,0 @@
 
				-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-d0748378.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};
			
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,7 +1,7 @@
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
 
				 	<head>
			
 
				-		<link rel="stylesheet" href="/carstop/dist5/assets/uni.91e17222.css">
			
 
				+		<link rel="stylesheet" href="/testingServertomcat/dist5/assets/uni.91e17222.css">
			
 
				 
			
 
				 		<meta charset="UTF-8" />
			
 
				 
			
@@ -16,8 +16,8 @@
 
				 		<title>校车预约</title>
			
 
				 		<!--preload-links-->
			
 
				 		<!--app-context-->
			
 
				-		<script type="module" crossorigin src="/carstop/dist5/assets/index-d0748378.js"></script>
			
 
				-		<link rel="stylesheet" href="/carstop/dist5/assets/index-88c6c4d6.css">
			
 
				+		<script type="module" crossorigin src="/testingServertomcat/dist5/assets/index-51addcba.js"></script>
			
 
				+		<link rel="stylesheet" href="/testingServertomcat/dist5/assets/index-88c6c4d6.css">
			
 
				 	</head>
			
 
				 	<body>
			
 
				 		<div id="app"><!--app-html--></div>
			
--- a/util/api.js
+++ b/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({
		`@@ -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};`