Browse Source

加上了校车预约

soft5566 3 years ago
parent
commit
0b109a216a
5 changed files with 50 additions and 18 deletions
  1. 10 0
      pages.json
  2. 4 0
      pages/index/index.vue
  3. 17 18
      pages/reshui/reshui.vue
  4. 19 0
      pagesBus/bus/bus.vue
  5. BIN
      static/images/bus.png

+ 10 - 0
pages.json

@@ -126,6 +126,16 @@
 			}]
 			}]
 		},
 		},
 		{
 		{
+			"root": "pagesBus",
+			"pages": [{
+				"path": "bus/bus",
+				"style": {
+					"navigationBarTitleText": "校车预约",
+					"enablePullDownRefresh": false
+				}
+			}]
+		},
+		{
 			"root": "pagesClockIn",
 			"root": "pagesClockIn",
 			"pages": [{
 			"pages": [{
 					"path": "home/home",
 					"path": "home/home",

+ 4 - 0
pages/index/index.vue

@@ -17,6 +17,10 @@
 					<image src="../../static/images/air.png" mode=""></image>
 					<image src="../../static/images/air.png" mode=""></image>
 					<text>共享空调</text>
 					<text>共享空调</text>
 				</navigator>
 				</navigator>
+				<navigator :url="'/pagesBus/bus/bus'" open-type="navigate" class="menu_item">
+					<image src="../../static/images/bus.png" mode=""></image>
+					<text>校车预约</text>
+				</navigator>
 				<!-- <navigator :url="'/pagesClockIn/index/index'" open-type="navigate" class="menu_item">
 				<!-- <navigator :url="'/pagesClockIn/index/index'" open-type="navigate" class="menu_item">
 					<image src="../../static/images/clockIn.png" mode=""></image>
 					<image src="../../static/images/clockIn.png" mode=""></image>
 					<text>校园打卡</text>
 					<text>校园打卡</text>

+ 17 - 18
pages/reshui/reshui.vue

@@ -9,8 +9,7 @@
 				</view>
 				</view>
 				<view class="qinshihao">
 				<view class="qinshihao">
 					<!-- <text class="iconfont icon-zhuye"></text> -->
 					<!-- <text class="iconfont icon-zhuye"></text> -->
-					<image :src="require('./images/icon-zhuye.png')" style="width: 28rpx; margin-right: 8rpx;"
-						mode="aspectFit"></image>
+					<image :src="require('./images/icon-zhuye.png')" style="width: 28rpx; margin-right: 8rpx;" mode="aspectFit"></image>
 					<text class="dormtxt">{{dorm_number || '宿舍未知'}}</text>
 					<text class="dormtxt">{{dorm_number || '宿舍未知'}}</text>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -33,8 +32,8 @@
 					</view>
 					</view>
 					<view class="start_payamount" @tap="chongzhi_yemian()" hover-class="scan_hover">
 					<view class="start_payamount" @tap="chongzhi_yemian()" hover-class="scan_hover">
 						<text>点击充值</text>
 						<text>点击充值</text>
-						<image :src="require('./images/icon-dayuhao.png')"
-							style="width: 26rpx; margin-left: 10rpx; padding-top: 3rpx; opacity: 0.6;" mode="aspectFit">
+						<image :src="require('./images/icon-dayuhao.png')" style="width: 26rpx; margin-left: 10rpx; padding-top: 3rpx; opacity: 0.6;"
+							mode="aspectFit">
 						</image>
 						</image>
 						<!-- <text class="iconfont icon-dayuhao"></text> -->
 						<!-- <text class="iconfont icon-dayuhao"></text> -->
 					</view>
 					</view>
@@ -46,8 +45,7 @@
 			</view>
 			</view>
 			<view v-if="showRoom" style="width: 100%; height: 100%; ">
 			<view v-if="showRoom" style="width: 100%; height: 100%; ">
 				<view style="display: flex; flex-wrap: wrap;">
 				<view style="display: flex; flex-wrap: wrap;">
-					<button v-for="item in rooms" :key="item.id" @tap="clickRoom(item.id)"
-						class="btn_room">{{item.room}}</button>
+					<button v-for="item in rooms" :key="item.id" @tap="clickRoom(item.id)" class="btn_room">{{item.room}}</button>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="start_up_process">
 			<view class="start_up_process">
@@ -62,22 +60,19 @@
 			</view>
 			</view>
 			<view class="record-item">
 			<view class="record-item">
 				<view class="uni-list-cell-db">
 				<view class="uni-list-cell-db">
-					<picker mode="date" :value="date" fields="month" :start="startDate" :end="endDate"
-						@change="bindDateChange">
+					<picker mode="date" :value="date" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
 						<view class="uni-input">
 						<view class="uni-input">
 							<text>{{date}}</text>
 							<text>{{date}}</text>
 							<!-- <text class="iconfont icon-arrow-down"></text> -->
 							<!-- <text class="iconfont icon-arrow-down"></text> -->
-							<image :src="require('./images/icon-arrow-down.png')" style="width: 26rpx;"
-								mode="aspectFit">
+							<image :src="require('./images/icon-arrow-down.png')" style="width: 26rpx;" mode="aspectFit">
 							</image>
 							</image>
 						</view>
 						</view>
 					</picker>
 					</picker>
 				</view>
 				</view>
 				<view class="item-list" v-for="(item, i) in xiaofei_items" :key="i">
 				<view class="item-list" v-for="(item, i) in xiaofei_items" :key="i">
 					<text class="item-list-txt"><text class="iconfont icon-shijian"></text>{{item.begin_time}}</text>
 					<text class="item-list-txt"><text class="iconfont icon-shijian"></text>{{item.begin_time}}</text>
-					<text class="item-list-txt"><text
-							class="iconfont icon-shuidi"></text>{{numFilter(item.use_size)}}t</text>
-					<text class="item-list-txt">{{numFilter(item.use_amount)}}</text>
+					<text class="item-list-txt"><text class="iconfont icon-shuidi"></text>{{numFilter(item.use_size, 'l')}} t</text>
+					<text class="item-list-txt">{{numFilter(item.use_amount, 'm')}}</text>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -325,10 +320,13 @@
 			 * 保留小数点数值后两位,尾数四舍五入
 			 * 保留小数点数值后两位,尾数四舍五入
 			 * @param {Object} value
 			 * @param {Object} value
 			 */
 			 */
-			numFilter(value) {
-				// 截取当前数据到小数点后两位
-				let realVal = parseFloat(value).toFixed(2)
-				return realVal
+			numFilter(value, param) {
+				var v = parseFloat(value);
+				if (param == 'l')
+					return v.toFixed(2);
+				else
+					// 截取当前数据到小数点后两位
+					return v.toFixed(2);
 			},
 			},
 			/**
 			/**
 			 * 获取基本信息
 			 * 获取基本信息
@@ -515,6 +513,7 @@
 						// console.log(res);
 						// console.log(res);
 						if (res.data.mess == '返回成功') {
 						if (res.data.mess == '返回成功') {
 							this.xiaofei_items = []
 							this.xiaofei_items = []
+							console.log(res.data.data);
 							// 消费记录
 							// 消费记录
 							let items = res.data.data
 							let items = res.data.data
 							for (var i = 0; i < items.length; i++) {
 							for (var i = 0; i < items.length; i++) {
@@ -1792,4 +1791,4 @@
 			}
 			}
 		}
 		}
 	}
 	}
-</style>
+</style>

+ 19 - 0
pagesBus/bus/bus.vue

@@ -0,0 +1,19 @@
+<template>
+	<web-view :src="url" :progress="false"></web-view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: 'https://chtech.ncjti.edu.cn/carstop/dist5'
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

BIN
static/images/bus.png