Browse Source

no message

xiaoxin 3 years ago
parent
commit
98c99ab967
30 changed files with 60 additions and 57 deletions
  1. 5 4
      manifest.json
  2. 25 18
      pages/detail/detail.vue
  3. 2 2
      pages/index/index.vue
  4. 4 4
      pages/record/record.vue
  5. 0 1
      unpackage/dist/build/h5/assets/_plugin-vue_export-helper.563c4239.js
  6. 1 0
      unpackage/dist/build/h5/assets/_plugin-vue_export-helper.85faaf7d.js
  7. 1 0
      unpackage/dist/build/h5/assets/api.897d7865.js
  8. 0 1
      unpackage/dist/build/h5/assets/api.a8ee9fc2.js
  9. 1 1
      unpackage/dist/build/h5/assets/detail-116ef76e.css
  10. 1 1
      unpackage/dist/build/h5/assets/filterIdentity.a5bf590d.js
  11. 2 2
      unpackage/dist/build/h5/assets/index-b1399800.js
  12. 1 1
      unpackage/dist/build/h5/assets/pages-404-404.6881663e.js
  13. 0 1
      unpackage/dist/build/h5/assets/pages-detail-detail.5f8e62e9.js
  14. 1 0
      unpackage/dist/build/h5/assets/pages-detail-detail.f53360e7.js
  15. 1 1
      unpackage/dist/build/h5/assets/pages-detailDriver-detailDriver.5c641942.js
  16. 1 1
      unpackage/dist/build/h5/assets/pages-home-home.8a55f536.js
  17. 0 1
      unpackage/dist/build/h5/assets/pages-index-index.1e1bcf29.js
  18. 1 0
      unpackage/dist/build/h5/assets/pages-index-index.c70798cd.js
  19. 1 1
      unpackage/dist/build/h5/assets/pages-my-my.9cf083f5.js
  20. 1 1
      unpackage/dist/build/h5/assets/pages-record-record.37f1858e.js
  21. 1 1
      unpackage/dist/build/h5/assets/pages-recordDriver-recordDriver.afe33905.js
  22. 0 1
      unpackage/dist/build/h5/assets/pass2.10ebc82a.js
  23. 1 0
      unpackage/dist/build/h5/assets/pass2.76a9020d.js
  24. 0 1
      unpackage/dist/build/h5/assets/record-5d131fb6.css
  25. 1 0
      unpackage/dist/build/h5/assets/record-7d5a3dca.css
  26. 1 1
      unpackage/dist/build/h5/assets/search-274fe34e.css
  27. 1 1
      unpackage/dist/build/h5/assets/search.40e4fcd5.js
  28. 1 1
      unpackage/dist/build/h5/assets/uni-app.es.6e445678.js
  29. 3 3
      unpackage/dist/build/h5/index.html
  30. 2 7
      util/api.js

+ 5 - 4
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协议的代理
@@ -75,8 +75,9 @@
             }
         },
         "router" : {
-            // "base" : "/carstop/dist5/"
-            "base" : "/testingServertomcat/dist5/"
+            "base" : "/carstop/dist5/"
         }
     }
 }
+// "base" : "/testingServertomcat/dist5/"
+

+ 25 - 18
pages/detail/detail.vue

@@ -40,7 +40,7 @@
 		<!-- 发车时间区域 -->
 		<view class="box">
 			<view class="left">发车时间</view>
-			<picker style="width: 40%;" @change="bindPickerChange($event, 1)" mode="time" :value="info.ci_time" :start="getCurrentTime()">
+			<picker style="width: 40%" @change="bindPickerChange($event, 1)" mode="time" :value="info.ci_time" :start="getCurrentTime()">
 				<view :class="['right', info.ci_time != 0 ? '' : 'unSelect']">
 					{{ info.ci_time != 0 ? info.ci_time : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -51,7 +51,7 @@
 		<!-- 扫码开始时间区域 -->
 		<view class="box">
 			<view class="left">扫码开始时间</view>
-			<picker style="width: 40%;" @change="bindPickerChange($event, 4)" mode="time" :value="info.sm_start">
+			<picker style="width: 40%" @change="bindPickerChange($event, 4)" mode="time" :value="info.sm_start">
 				<view :class="['right', info.sm_start != 0 ? '' : 'unSelect']">
 					{{ info.sm_start != 0 ? info.sm_start : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -62,7 +62,7 @@
 		<!-- 扫码结束时间区域 -->
 		<view class="box">
 			<view class="left">扫码结束时间</view>
-			<picker style="width: 40%;" @change="bindPickerChange($event, 5)" mode="time" :value="info.sm_end">
+			<picker style="width: 40%" @change="bindPickerChange($event, 5)" mode="time" :value="info.sm_end">
 				<view :class="['right', info.sm_end != 0 ? '' : 'unSelect']">
 					{{ info.sm_end != 0 ? info.sm_end : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -73,7 +73,7 @@
 		<!-- 预约截止时间区域 -->
 		<view class="box">
 			<view class="left">预约截止时间</view>
-			<picker style="width: 40%;" @change="bindPickerChange($event, 7)" mode="time" :value="info.yy_end">
+			<picker style="width: 40%" @change="bindPickerChange($event, 7)" mode="time" :value="info.yy_end">
 				<view :class="['right', info.yy_end != 0 ? '' : 'unSelect']">
 					{{ info.yy_end != 0 ? info.yy_end : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -85,7 +85,7 @@
 		<view class="box">
 			<view class="left">路线</view>
 
-			<picker style="width: 60%;" @change="bindPickerChange($event, 2)" :range="pathList" range-key="route">
+			<picker style="width: 60%" @change="bindPickerChange($event, 2)" :range="pathList" range-key="route">
 				<view :class="['right', info.route ? '' : 'unSelect']">
 					{{ info.route ? info.route : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -97,7 +97,7 @@
 		<view class="box">
 			<view class="left">站点</view>
 
-			<picker style="width: 80%;" @change="bindPickerChange($event, 3)" :range="endList" range-key="route_end">
+			<picker style="width: 80%" @change="bindPickerChange($event, 3)" :range="endList" range-key="route_end">
 				<view :class="['right', info.route_end ? '' : 'unSelect']">
 					{{ info.route_end ? info.route_end : '请选择' }}
 					<view class="right-img"><img src="../../static/bottom.png" /></view>
@@ -127,14 +127,14 @@
 			<!-- 筛选区域 -->
 			<view class="list-search" v-if="info.user_num !== '0'">
 				<!-- 身份筛选区域 -->
-				<picker style="width: 50%;" :range="statusList" range-key="text" @change="bindPickerChange($event, 6)">
+				<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)">
+				<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>
@@ -177,7 +177,10 @@ import { filterIdentity } from '@/util/filterIdentity.js'
 
 import { time_to_sec, time_change } from '@/util/formatTime.js'
 
-onLoad(options => {
+const BASE_URL = '/carstop/carbook'
+// const BASE_URL = '/testingServertomcat/carbook/'
+
+onLoad((options) => {
 	if (isWeixin()) {
 		filterIdentity()
 		info.value = JSON.parse(options.info)
@@ -198,7 +201,7 @@ onLoad(options => {
 
 		setTimeout(() => {
 			let temList = []
-			selectMultiple.value.columns.forEach(item => {
+			selectMultiple.value.columns.forEach((item) => {
 				if (item.label == form.value.selectValue) {
 					temList.push(item.value)
 				}
@@ -437,7 +440,7 @@ const handleSave = () => {
 	uni.showModal({
 		title: '提示',
 		content: '确定保存吗?',
-		success: res => {
+		success: (res) => {
 			if (res.confirm) {
 				handleSaveRequest()
 			} else if (res.cancel) {
@@ -452,12 +455,16 @@ const handleSaveRequest = () => {
 	const { id, car_number, ci_time, route, route_end, contain, sm_start, sm_end, yy_end } = info.value
 
 	const { user_name } = JSON.parse(uni.getStorageSync('bus-userInfo'))
+	uni.showLoading({
+		title: '保存中',
+		mask: true
+	})
 
 	uni.request({
-		url: '/carstop/carbook/scheupdate.action',
+		url: `${BASE_URL}/scheupdate.action`,
 		method: 'post',
 		header: {
-			admin_name: user_name
+			admin_name: encodeURIComponent(user_name)
 		},
 		data: {
 			id,
@@ -470,7 +477,7 @@ const handleSaveRequest = () => {
 			sm_end,
 			yy_end
 		},
-		success: res => {
+		success: (res) => {
 			if (res.data.code == 200) {
 				uni.showToast({
 					title: res.data.message
@@ -491,19 +498,19 @@ const handleSaveRequest = () => {
 }
 
 // 点击车牌号下拉框回调
-const handleMultiple = val => {
+const handleMultiple = (val) => {
 	// console.log(val);
 	selectMultiple.value.index = val || []
 	selectMultiple.value.show = true
 }
 
 // 车牌号下拉框确定按钮回调
-const confirmMultiple = e => {
+const confirmMultiple = (e) => {
 	// console.log(e);
 	// console.log(e.value);
 	if (selectMultiple.value.index != e.value) {
 		let temp = []
-		e.selected.forEach(item => {
+		e.selected.forEach((item) => {
 			temp.push(item.label)
 		})
 		form.value.selectValue = temp.toString()
@@ -539,7 +546,7 @@ const getTimeConfig = async () => {
 }
 
 // 下拉框选择时的回调
-const changeMultiple = e => {
+const changeMultiple = (e) => {
 	// console.log(e);
 }
 

+ 2 - 2
pages/index/index.vue

@@ -13,8 +13,8 @@ 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'
 

+ 4 - 4
pages/record/record.vue

@@ -77,7 +77,7 @@ onLoad(() => {
 
 onPullDownRefresh(() => {
 	getData()
-	setTimeout(function() {
+	setTimeout(function () {
 		uni.stopPullDownRefresh()
 	}, 500)
 })
@@ -140,7 +140,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)
 		})
 	}
@@ -148,7 +148,7 @@ const getData = async () => {
 }
 
 // 点击每一条记录回调
-const handleLookDetail = item => {
+const handleLookDetail = (item) => {
 	const info = JSON.stringify(item)
 	uni.navigateTo({
 		url: `/pages/detail/detail?info=${info}`
@@ -156,7 +156,7 @@ const handleLookDetail = item => {
 }
 
 // 条件筛选框选择回调
-const getConveyData = Obj => {
+const getConveyData = (Obj) => {
 	date_state.value = Obj.timeIndex - 0 + 1
 	result_state.value = Obj.typeIndex
 	getData()

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

@@ -1 +0,0 @@
-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};

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

@@ -0,0 +1 @@
+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};

+ 1 - 0
unpackage/dist/build/h5/assets/api.897d7865.js

@@ -0,0 +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};

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


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/h5/assets/detail-116ef76e.css


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


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/h5/assets/index-b1399800.js


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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

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

+ 2 - 7
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: "加载中",
@@ -15,11 +15,6 @@ export const myRequest = (options) => {
 				uni.hideLoading();
 				if (res.data.code === 200) {
 					resolve(res.data.data)
-				} else if (res.data.message == "未查到用户信息") {
-					uni.removeStorageSync("bus_card_number")
-					uni.navigateTo({
-						url: "/pages/index/index"
-					})
 				} else {
 					uni.showToast({
 						title: res.data.message,