1

components/Carmap.vue

@@ -12,7 +12,7 @@
 		props:{
 			myStyle: {
 				require: false,
-				default: "width: 100%; height: 240px;",
+				default: "width: 100%; height: 140px;",
 			},
 		},
 		data() {

pages/buytickets/index.js

@@ -4,9 +4,10 @@ import * as API from '@/apis/buytickets.js'
 export default {
 	data() {
 		return {
-			
+			isLoading:true,
 			initBl:false,
-			noback:false,
+			noback:false,
+			passengerInfo:{},
 			id: '',
 			num: 0,
 			pic: '',
@@ -89,12 +90,11 @@ export default {
 				}
 				this.passengerInfo = response.data
 				
-				
-		
 				var obj = this.carhelp.get("form");
 				if(!obj){
 					obj={}
 				}
+				
 				//obj.list = this.passengerInfo.list;
 				obj.name= 'buytickets';
 				obj.id= this.id;
@@ -142,18 +142,20 @@ export default {
 			this.$refs.common.showLoading();
 			this.subForm.id = this.id;
 			var obj = this.carhelp.get("form")
-			this.list = [];
+			//this.list = [];
+			//this.isLoading=true;
 			API.upBusNoTicketList(this.subForm).then((res) => {
-
-				var list = res.data.data;
-				if(!list.length){
+				this.isLoading=false;
+				this.list = res.data.data;
+				//this.list = [];
+				if(!this.list.length){
 					this.$refs.common.showLoading(false);
 					if(!bl){
 						this.$refs.common.alert("刷新成功");	
 					}
 					return;
 				}
-				this.list=list
+				
 		 
 				this.selectList=[];//清空选中
 				if (this.list.length != 0&&!bl) {
@@ -162,7 +164,7 @@ export default {
 					this.$refs.common.showLoading(false);
 				}
 
-
+				
 
 			}).catch(error => {
 				this.$refs.common.showLoading(false, error);

pages/buytickets/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
 		<car-common   ref="common"></car-common>
+		<car-loading  v-if="isLoading"  ></car-loading>
 		
 		<u-navbar title="确认身份"  :is-back="noback">
 			<view class="slot-wrap"></view>
@@ -11,20 +12,21 @@
 		</u-navbar>
 		<view class="confirm" v-show="!list.length">
 		
-			<view class="confirm-img-border3" >
+			<view class="confirm-img-border3" v-if="!isLoading" >
 				<view class="confirm-img-border">
 					<view class="confirm-img">
 						<img src="static/img/discern.png" alt="">
 					</view>
 				</view>
 			</view>
-			<h3>欢迎使用车信达<br>请<span style="color: red;">人脸识别</span>后进行购票</h3>
+			<h3>欢迎乘坐{{passengerInfo.routeName}}车<br>请前往上车处刷脸登记</h3>
 		</view>
 		<view class="confirm" v-show="list.length">
 		
 			<h3 >请选择购票人的照片？</h3>
 			<p v-show="!num">一位乘客仅需选择一张照片</p>
 			<p v-show="num">如需为您的同伴购票请同时选中Ta的照片</p>
+			
 			<view class="confirm-pic" v-if="list.length">
 				<template v-for="item in list">
 					<view class="confirm-pic-item "   :class="item.ck?'active':''" @click="ckBtn(item)" >
@@ -33,6 +35,8 @@
 				</template>	 
 				 
 			</view>
+			<p v-show="!num"><span style="color: #007AFF;">无本人照片？</span>请前往上车处重新刷脸登记</p>
+			
 		</view>
 		 
 		<view class="upload-button" >

pages/index/index.js

@@ -8,6 +8,7 @@ export default {
 				btn:{
 					color: '#1677FF'
 				},
+				isLoading:false,
 				getPointBl:false,//是否定位完成
 				longitude: '',
 				latitude: '',
@@ -89,14 +90,21 @@ export default {
 			},
 			gotoQuery(){
 				uni.navigateTo({
-					url:'/pages/query/index'
+					url:'/pages/query/index?back=true'
 				})
 			},
 			gotoLine(item){
-				this.carhelp.set("form",{});
-				uni.navigateTo({
-					url:'/pages/buytickets/selectSite?id='+item.id
-				})
+				if(item.id){
+					this.carhelp.set("form",{});
+					uni.navigateTo({
+						url:'/pages/buytickets/selectSite?id='+item.id
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/route/index?id='+item.routeId
+					})
+				}
+				
 			},
 			getPoint() {
 			this.$refs.common.alert("正在获取定位信息，为您查找附近的站点...");
@@ -119,8 +127,8 @@ export default {
 				})
 			},
 			passengerNearbyStation(){
-				// this.latitude = '30.284867';
-				// this.longitude = '112.291269';
+				 this.latitude = '30.306452';
+				this.longitude = '112.27642';
 				
 				var form={
 					longitude:this.longitude,
@@ -131,6 +139,7 @@ export default {
 				this.$refs.common.showLoading();
 				API.passengerNearbyStation(form).then((res) => {
 					this.siteList=res.data;
+					this.isLoading=true;
 					//this.$refs.common.showLoading(fa);
 					if(this.siteList.length){
 						this.$refs.common.alert( "已为您查询出附近的站点");

pages/index/index.vue

@@ -23,17 +23,17 @@
 			
 		</u-navbar>	
 		<view class="banner" v-show="list.length">
-			<u-swiper :list="list" @click="clickSwiper"></u-swiper>
+			<u-swiper height="180" :list="list" @click="clickSwiper"></u-swiper>
 		</view>
 		
 		<view  v-if="!getPointBl"  style="text-align:center;margin-top: 40px;" >		
 			 <img src="static/img/getPointError.png" style="width: 50%;" alt="" >
-			 <view>无法获取定位信息,请打开手机定位功能</view>
+			 <view>打开手机定位功能，为您查询附近的站点</view>
 			 <u-button :custom-style="btn" size="medium" shape="circle" plain @click="getPoint(true)"  >刷新</u-button>
 			 
 		</view>
 		
-		<view  v-if="getPointBl&&siteList.length==0" style="text-align:center;margin-top: 40px;" >
+		<view  v-if="isLoading&&getPointBl&&siteList.length==0" style="text-align:center;margin-top: 40px;" >
 			<img src="static/img/null.png" style="width: 50%;" alt="" >
 			<view>附近暂无站点信息</view>
 			<u-button   :custom-style="btn" size="medium" shape="circle" plain   @click="getPoint(true)" >刷新</u-button>
@@ -53,7 +53,7 @@
 						</view>
 						<view class="route-gap" >
 							<view class="route-gap stop">
-								<span>{{li.distance}}米</span>
+								<span>{{li.des}}</span>
 								<u-icon name="arrow-right" color="#999" size="28"></u-icon>
 							</view>
 						</view>

pages/my/user/bybusList.js

@@ -2,7 +2,8 @@ import * as API from '@/apis/my.js'
 
 export default {
 	data() {
-		return {
+		return {
+			isLoading:false,
 			clientHeight: 0,
 			list: [
 				1, 2, 3, 4, 6, 7
@@ -28,8 +29,8 @@ export default {
 		passengerRecordList() {
 			this.$refs.common.showLoading();
 			this.listForm.openId=this.carhelp.getOpenId()
-
 			API.passengerRecordList(this.listForm).then((res) => {
+				this.isLoading=true;
 				var response=res.data;
 				if (response) {
 					if (this.listForm.pageIndex == 1) {

pages/my/user/bybusList.vue

@@ -28,8 +28,9 @@
 				<p>票价</p>
 			</view>
 		</view>
+		<view style="text-align: center;">{{listForm.pageIndex>listForm.totalPage?'没有更多记录了':'下拉刷新'}}</view>
 		</scroll-view>
-		<view  v-show="recordList.length==0" style="text-align:center;margin-top: 80px;" >
+		<view  v-show="isLoading&&recordList.length==0" style="text-align:center;margin-top: 80px;" >
 				<img src="static/img/blankpage.png" style="width: 50%;" alt="" >
 				<view>暂无信息</view>
 		</view>

pages/news/index.js

@@ -3,6 +3,7 @@ import * as API from '@/apis/news.js'
 export default {
 	data() {
 		return {
+			isLoading:false,
 			initBl:false,
 			clientHeight: 0,
 			list: [
@@ -54,6 +55,7 @@ export default {
 			this.listForm.openId=this.carhelp.getOpenId()
 			API.passengerMessage(this.listForm).then((res) => {
 				this.initBl=true
+				this.isLoading=true
 				var response=res.data;
 				if (response) {
 					if (this.listForm.pageIndex == 1) {

pages/news/index.vue

@@ -32,7 +32,7 @@
 			  
 			    </template>
 		  </scroll-view>
-		 <view  v-show="recordList.length==0" style="text-align:center;margin-top: 80px;" >
+		 <view  v-show="isLoading&&recordList.length==0" style="text-align:center;margin-top: 80px;" >
 		 		<img src="static/img/blankpage.png" style="width: 50%;" alt="" >
 		 		<view>暂无信息</view>
 		 	</view>

pages/query/index.js

@@ -9,6 +9,7 @@ import * as API from '@/apis/query.js'
 				record:[],
 				result:[],
 				recordsTotal:0,
+				back:false,
 			}
 		},
 		methods: {
@@ -97,8 +98,11 @@ import * as API from '@/apis/query.js'
 				})
 			}
 		},
-		onLoad() {
-			 
+		onLoad(op) {
+			if(op.back){
+				 this.back=true;
+			}
+	 
 		},onReady(){
 			
 			this.record=this.carhelp.get("searchHistory");

pages/query/index.vue

@@ -2,10 +2,10 @@
 	<view class="content" :style="ing&&result.length==0?'':'background-color: #ffffff'">
 		<car-common   ref="common"  ></car-common>
 		
-		<u-navbar   title="">	
+		<u-navbar :is-back="back"  title="">	
 			<view class="slot-wrap">	
 				<view class="search-wrap">
-					<u-search placeholder="查线路、站点"  :focus="true" v-model="key" @change="change()" @search="submit"  :show-action="false"></u-search>
+					<u-search placeholder="搜索线路"  :focus="true" v-model="key" @change="change()" @search="submit"  :show-action="false"></u-search>
 				</view>
 				<view class="navbar-right">
 				

utils/request.js

@@ -22,6 +22,8 @@ const request = (options) => {
 				'Authorization':carhelp.getToken()
 			}
 		}).then((response) => {
+			//for(var t = Date.now(); Date.now() - t <= 2000;);
+			
 			resCount++
 			//防止连续请求多个接口时loading闪现
 			let [error, res] = response;