Home Explore Help
Register Sign In
ch-校园卡
/
School_bus_h5
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

no message

xiaoxin 2 years ago
parent
3294d76a32
commit
07fc2768e4
23 changed files with 13 additions and 35 deletions
Unified View Show Diff Stats
  1. 5 4
      manifest.json
  2. 2 2
      pages/index/index.vue
  3. 1 1
      pages/my/my.vue
  4. 0 1
      unpackage/dist/build/h5/assets/_plugin-vue_export-helper.85faaf7d.js
  5. 0 1
      unpackage/dist/build/h5/assets/api.9a3ad04e.js
  6. 0 1
      unpackage/dist/build/h5/assets/filterIdentity.cbbb7619.js
  7. 0 1
      unpackage/dist/build/h5/assets/home-8c9524b3.css
  8. 0 6
      unpackage/dist/build/h5/assets/index-d0748378.js
  9. 0 1
      unpackage/dist/build/h5/assets/my-0d826fe6.css
  10. 0 1
      unpackage/dist/build/h5/assets/pages-404-404.8587f8da.js
  11. 0 1
      unpackage/dist/build/h5/assets/pages-detail-detail.b533bc5e.js
  12. 0 1
      unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.3bd5bff2.js
  13. 0 1
      unpackage/dist/build/h5/assets/pages-home-home.424d10d2.js
  14. 0 1
      unpackage/dist/build/h5/assets/pages-index-index.ec8c4c4b.js
  15. 0 1
      unpackage/dist/build/h5/assets/pages-my-my.f0bbc7e8.js
  16. 0 1
      unpackage/dist/build/h5/assets/pages-record-record.a21ef099.js
  17. 0 1
      unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.bb5763e5.js
  18. 0 1
      unpackage/dist/build/h5/assets/pass2.76a9020d.js
  19. 0 1
      unpackage/dist/build/h5/assets/search-1f99e3e7.css
  20. 0 1
      unpackage/dist/build/h5/assets/search.bf783dee.js
  21. 0 1
      unpackage/dist/build/h5/assets/uni-app.es.74adb8e7.js
  22. 3 3
      unpackage/dist/build/h5/index.html
  23. 2 2
      util/api.js

+ 5 - 4
manifest.json
View File 

@@ -64,9 +64,9 @@
 
             "proxy" : {
 
             "proxy" : {
 
                 "/carstop/carbook" : {
 
                 "/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": "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,
 
                     "changeOrigin" : true,
 
                     // 设置支持https协议的代理
 
                     // 设置支持https协议的代理
 
@@ -75,8 +75,9 @@
 
             }
 
             }
 
         },
 
         },
 
         "router" : {
 
         "router" : {
 
-            // "base" : "/testingServertomcat/dist5/",
 
-            "base" : "/carstop/dist5/"
 
+            "base" : "/testingServertomcat/dist5/"
 
         }
 
         }
 
     }
 
     }
 
 }
 
 }
 
+// "base": "/carstop/dist5/"
 
+

+ 2 - 2
pages/index/index.vue
View File 

@@ -13,10 +13,10 @@ const APPKEY = '4AA7B3944BDF3739'
 
 const ocode = '1015730314'
 
 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'
 
 // const URL = 'http://192.168.161.220:8088/carBook/appopenid.action'

+ 1 - 1
pages/my/my.vue
View File 

@@ -55,7 +55,7 @@
 
 				<!-- <view class="list-button-change" v-if="item.state ===1" @click="handleChange">
 
 				<!-- <view class="list-button-change" v-if="item.state ===1" @click="handleChange">
 
 					更换车次
 
 					更换车次
 
 				</view> -->
 
 				</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 class="list-button-cancel" v-if="item.state === 1 || item.state === 3" @click="handleCancel(item.id)">取消预约</view>
 
 			</view>
 
 			</view>
 
 		</view>
 
 		</view>

+ 0 - 1
unpackage/dist/build/h5/assets/_plugin-vue_export-helper.85faaf7d.js
View File 

@@ -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};

+ 0 - 1
unpackage/dist/build/h5/assets/api.9a3ad04e.js
View File 

@@ -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};

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/filterIdentity.cbbb7619.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/home-8c9524b3.css


File diff suppressed because it is too large
+ 0 - 6
unpackage/dist/build/h5/assets/index-d0748378.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/my-0d826fe6.css


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-404-404.8587f8da.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-detail-detail.b533bc5e.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.3bd5bff2.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-home-home.424d10d2.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-index-index.ec8c4c4b.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-my-my.f0bbc7e8.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-record-record.a21ef099.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.bb5763e5.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/pass2.76a9020d.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/search-1f99e3e7.css


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/h5/assets/search.bf783dee.js


+ 0 - 1
unpackage/dist/build/h5/assets/uni-app.es.74adb8e7.js
View File 

@@ -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};

+ 3 - 3
unpackage/dist/build/h5/index.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
 	<head>
 
 	<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" />
 
 		<meta charset="UTF-8" />
 
 
 
@@ -16,8 +16,8 @@
 
 		<title>校车预约</title>
 
 		<title>校车预约</title>
 
 		<!--preload-links-->
 
 		<!--preload-links-->
 
 		<!--app-context-->
 
 		<!--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>
 
 	</head>
 
 	<body>
 
 	<body>
 
 		<div id="app"><!--app-html--></div>
 
 		<div id="app"><!--app-html--></div>

+ 2 - 2
util/api.js
View File 

@@ -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) => {
 
 export const myRequest = (options) => {
 
 	uni.showLoading({
 
 	uni.showLoading({