111

.env.test.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
-	BASE_URL: 'http://192.168.33.120:8087/smart-bus-server/' ,
+	//BASE_URL: 'http://192.168.33.120:8087/smart-bus-server/' ,
 	//BASE_URL: 'https://xpgjapi.xiaoxinda.com/' ,
-	//BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
+	BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
 	NODE_ENV :"test",
 	SIMPLE_RUN:true,
 	//车信达 appid

apis/my.js

@@ -54,5 +54,16 @@ export function passengerRecordDetail(id) {
 		},
 		url: '/mobile/passengerApi/passengerRecordDetail'
 		
+	})
+}
+
+
+
+export function helpCenterList() {
+	return request({
+		method: 'post',
+	
+		url: '/mobile/passengerApi/helpCenterList'
+		
 	})
 }

components/Carmap.vue

@@ -85,8 +85,8 @@
 						var ob1=new AMap.Marker({
 							map: this.mapbus,
 							position: [ob.longitude,ob.latitude],
-							offset: new AMap.Pixel(-5, -5),
-							
+							//offset: new AMap.Pixel(-5, -5),
+							offset: new AMap.Pixel(-15, -30),
 							content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
 							
 							zIndex:99,

pages/buytickets/selectSite.js

@@ -192,6 +192,13 @@ export default {
 			this.getPoint()
 		
 
+		},
+		showname(name){
+			if(!name){
+				return "";
+			}
+		
+			return name.substring(0,1)+'师傅';
 		},
 		carShow(){
 			this.caritemBl=true;

pages/buytickets/selectSite.vue

@@ -18,7 +18,7 @@
 							</view>
 							<view class="driver-text">
 								<h2>{{showInfo.licensePlateNumber}}</h2>
-								<p>{{showInfo.driver.name}}  {{showInfo.driver.phone}}</p>
+								<p>{{showname(showInfo.driver.name)}}  {{showInfo.driver.phone}}</p>
 							</view>
 						</view>
 						<u-icon name="dianhua" v-if="showInfo.driver.phone"  @click="makePhoneCall(showInfo.driver.phone)"  custom-prefix="custom-icon" size="80" color="#1778fb"></u-icon>

pages/buytickets/site.vue

@@ -59,7 +59,7 @@
 					
 				</view>
 				<view class="site-foot-row">
-					<span>货票</span>
+					<span>货票(元)</span>
 					<u-number-box v-model="pnum" @change="radioGroupChange" ></u-number-box>
 				</view>
 				<view class="site-foot-row">

pages/car/login.vue

@@ -11,7 +11,7 @@
 			</view>
 		</u-navbar>
 		<view class="login-logo">
-			<img src="static/img/logo.png" alt="">
+			<img src="static/img/logo_1.png" alt="">
 		</view>
 		<view class="login-name">车信达</view>
 		<view class="login-form">

pages/my/platform/help.vue

@@ -1,86 +1,27 @@
 <template>
-	<view>
+	<view>
 		<car-common  mytitle="使用指南"   ref="common"  ></car-common>
-		<view class="collapse">
-			<u-collapse :item-style="itemStyle" :head-style="headStyle" :body-style="bodyStyle">
-				<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index" :open="item.head==openId">
-						{{item.body}}	
+		
+		<view class="collapse" v-if="itemList.length" >
+			<u-collapse :item-style="itemStyle" :head-style="headStyle" :body-style="bodyStyle" ref="collapseView">
+				<u-collapse-item :title="item.titleName" v-for="(item, index) in itemList" :key="index" :open="item.id==id">
+				
+							{{item.desc}}
+							
 				</u-collapse-item>
 			</u-collapse>
 		</view>
+	
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				itemStyle: {
-							
-							},
-							headStyle: {
-											marginLeft: '20px',
-											marginBottom:'10px',
-											paddingRight:'15px',
-											borderBottom:'1px solid #eee',
-											paddingBottom:'20px',
-										},
-										bodyStyle: {
-													marginLeft: '25px',
-													
-													},
-				 openId:"",
-						itemList: [{
-							head: "上车如何购票",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "下车注意事项",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "如何查询车辆位置",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "如何查询站点信息",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "如何设置提醒",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "纸质车票、现金购票应该怎么操作",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "坐过站了怎么办",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "如何退票",
-							body: "帮助说明内容……",
-						
-						},{
-							head: "如何为他人购票",
-							body: "帮助说明内容……",
-						
-						},],
-					}
-		},
-		methods: {
-			
-		},onLoad(op){
-			this.openId=op.id;
-		}
-	}
+	import api from './help.js'
+	export default api;
 </script>
 
 <style>
-.u-collapse-title{
-	margin-left: 20px;
-}
+
 .collapse{
 	border-top: 10px solid #f7f7f7;
 	padding-top: 5px;

pages/my/user/bybusDetails.vue

@@ -10,8 +10,8 @@
 					<u-avatar :src="src" size="100"></u-avatar>
 				</view>
 				<view class="driver-text">
-					<h4>六中 → 锣场</h4>
-					<p>首班：06:05  末班：18:10</p>
+					<h4>{{obj.shiftInfo.startStationName}} → {{obj.shiftInfo.endStationName}}</h4>
+					<p>首班：{{obj.routeInfo.startTime}}  末班：{{obj.routeInfo.endTime}}</p>
 					<p>鄂D12345  李师傅  15512344567</p>
 				</view>
 			</view>
@@ -19,22 +19,22 @@
 		</view> 
 		<view class="bybusDetailsList">
 			<view class="bybusDetails-list">
-				<p>行程</p><h4>玉桥 - 宿架转盘</h4>
+				<p>行程</p><h4>{{obj.tripName}}</h4>
 			</view>
 			<view class="bybusDetails-list">
-				<p>车票</p><h4>成人票 6元</h4>
+				<p>车票</p><h4>{{obj.ticketDes}}</h4>
 			</view>
 			<view class="bybusDetails-list">
-				<p>货票</p><h4>20元</h4>
+				<p>货票</p><h4>{{obj.goodsTicket}}</h4>
 			</view>
 			<view class="bybusDetails-list">
-				<p>合计票价</p><span>26.00</span>
+				<p>合计票价</p><span>{{obj.totalFee}}</span>
 			</view>
 			<view class="bybusDetails-list">
-				<p>购票时间</p><h4>2021-03-30 12:00:00</h4>
+				<p>购票时间</p><h4>{{obj.payTime}}</h4>
 			</view>
 			<view class="bybusDetails-list">
-				<p>车票状态</p><h4>乘车中/已过期</h4>
+				<p>车票状态</p><h4>{{obj.ticketStatusName}}</h4>
 			</view>
 		</view>
 	</view>

pages/my/user/bybusList.js

@@ -18,7 +18,7 @@ export default {
 	},
 	methods: {
 		gotoUrl(id){
-			return;
+			return
 			uni.navigateTo({
 				url:"/pages/my/user/bybusDetails?id="+id
 			})

pages/my/user/updateinfo.js

@@ -21,10 +21,15 @@ export default {
 					}
 					
 						API_Common.upload(formData).then(response => {
+							
+							if(response.data){
+								this.pic=response.data
+														
+								this.$refs.common.showLoading(false,"上传成功！")
+							}else{
+								this.$refs.common.showLoading(false,"图片过大，请上传其他照片！")
+							}
 							
-							this.pic=response.data
-						
-							this.$refs.common.showLoading(false,"上传成功！")
 							
 						}).catch(error => {
 							this.$refs.common.showLoading(false,error)

pages/query/index.js

@@ -15,7 +15,7 @@ import * as API from '@/apis/query.js'
 		methods: {
 			 gotoLine(item){
 				 uni.redirectTo({
-					url:'/pages/route/index?id='+item.id
+					url:'/pages/route/index?id='+item.id+"&downid="+item.stationId
 				 })
 			 },
 			setHistory(){

pages/query/index.vue

@@ -24,8 +24,8 @@
 			 
 			</view>
 			<view class="search-result" v-show="ing&&result.length" v-for="item,index in result" :key="index" @click="gotoLine(item)">
-				<u-icon name="bus" custom-prefix="custom-icon" size="30" color="#888888"></u-icon>
-				<u-icon name="zhanpai1" v-if="false" custom-prefix="custom-icon" size="30" color="#888888"></u-icon>
+				<u-icon name="bus" custom-prefix="custom-icon" size="30" color="#888888" v-if="!item.stationId"></u-icon>
+				<u-icon name="zhanpai1" v-if="item.stationId" custom-prefix="custom-icon" size="30" color="#888888"></u-icon>
 				
 				<view class="search-result-text"  >
 					<p>{{item.name1}}</p><span>{{key}}</span><p>{{item.name2}}</p>

pages/route/index.js

@@ -144,6 +144,13 @@ export default {
 				}
 			}
 			return false;
+		},
+		showname(name){
+			if(!name){
+				return "";
+			}
+		
+			return name.substring(0,1)+'师傅';
 		},
 		getCar(){
 			if(this.stationList.length==0){
@@ -156,7 +163,7 @@ export default {
 			API.routeShiftList(obj).then((response) => {
 				this.carList=response.data;
 				this.$refs.amap.setCarList(response.data);
-				
+				this.vehicleStationDis();
 			}).catch(error => {
 				this.$refs.common.showLoading(false,error)
 			})

pages/route/index.vue

@@ -50,7 +50,7 @@
 									</view>
 									<view class="driver-text">
 										<h2>{{caritem.licensePlateNumber}}</h2>
-										<p>{{caritem.driverInfo.name}}  {{caritem.driverInfo.phone}}</p>
+										<p>{{showname(caritem.driverInfo.name)}}  {{caritem.driverInfo.phone}}</p>
 									</view>
 								</view>
 								<u-icon name="dianhua" v-if="caritem.driverInfo.phone"  @click="makePhoneCall(caritem.driverInfo.phone)"  custom-prefix="custom-icon" size="80" color="#1778fb"></u-icon>