1.1

pages/buytickets/home.js

@@ -87,7 +87,7 @@ export default {
 		submit() {
 			this.$refs.common.showLoading();
 			
-
+			console.log("Pay+"+new Date().getTime())
 			Pay.wxpay(this.passengerInfo.id).then((response) => {
 				if(!response.result){
 					this.$refs.common.showLoading(false, response.message);
@@ -95,7 +95,7 @@ export default {
 				}
 				var data = response.data
 				var url = window.location.href.split("#")[0] + "/#/pages/buytickets/success";
-				
+				console.log("Pay+"+new Date().getTime())
 				
 				var obj = {
 					...data,
@@ -204,6 +204,14 @@ export default {
 				if (!response.result) {
 					this.$refs.common.goError(response.message)
 					return
+				}
+				if (response.data.supply) {
+					this.$refs.common.alert('存在需要补票的订单。')
+					
+					uni.switchTab({
+						url: '/pages/news/index'
+					});
+					return;
 				}
 				this.passengerInfo = response.data
 				this.carhelp.set("paysucc",{

pages/buytickets/home.vue

@@ -31,9 +31,9 @@
 						</view>
 					</view>
 					<view class="ticket-item-right">
-						<u-avatar size="mini" :src="item.imageUrl"></u-avatar>
+						<u-avatar size="default" :src="item.imageUrl"></u-avatar>
 						<h3>{{item.totalFee}}</h3>
-						<p>票价</p>
+						
 					</view>
 				</view>
 			</template>
@@ -51,10 +51,10 @@
 					<span>￥{{passengerInfo.totalAmount}}</span>
 				</view>
 				<view class="add-foot-btn" @click="submit()" v-if="passengerInfo.list.length">
-					结算
+					支付
 				</view>
 				<view class=" gray-btn" v-if="!passengerInfo.list.length">
-					结算
+					支付
 				</view>
 			</view>
 	

pages/buytickets/index.js

@@ -4,6 +4,7 @@ import * as API from '@/apis/buytickets.js'
 export default {
 	data() {
 		return {
+			initBl:false,
 			noback:false,
 			id: '',
 			num: 0,
@@ -38,7 +39,11 @@ export default {
 				url: '/pages/buytickets/selectSite?id=' + this.id
 			})
 		},
-		ckBtn(item) {
+		ckBtn(item) {
+			if(this.num==5&&!item.ck){
+				this.$refs.common.alert("一次最多选择5名乘车人员");
+				return
+			}
 			item.ck = !item.ck;
 
 			if (item.ck) {
@@ -195,7 +200,9 @@ export default {
 		var obj = this.carhelp.get("form")
 
 		if (obj && obj.name == 'buytickets' && obj.id == this.id) {
-			//不创建新订单
+			//不创建新订单
+			obj.buy=null;
+			this.carhelp.set("form",obj);
 		} else {
 			this.carhelp.set("form", {
 				name: 'buytickets',
@@ -216,7 +223,11 @@ export default {
 			this.getPassengerInfo()
 		}
 			//this.upBusNoTicketList();
-		
+		this.initBl=true;
 
+	},onShow(){
+		if(this.initBl){
+			 this.upBusNoTicketList(true);
+		}	
 	}
 }

pages/buytickets/index.vue

@@ -14,7 +14,7 @@
 			<view class="confirm-img-border3" >
 				<view class="confirm-img-border">
 					<view class="confirm-img">
-						<img src="/static/img/discern.png" alt="">
+						<img src="static/img/discern.png" alt="">
 					</view>
 				</view>
 			</view>

pages/buytickets/selectSite.js

@@ -103,7 +103,7 @@ export default {
 					
 					this.carhelp.set("form",obj);
 					//uni.navigateBack()
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/buytickets/site?id='+this.id
 					})
 				})
@@ -303,6 +303,23 @@ export default {
 		if (this.myinterval) {
 			clearInterval(this.myinterval)
 		}
+	},onShow(){
+		console.log("onShowonShowonShowonShow")
+		this.$nextTick(function() {
+			try{
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.map-now').boundingClientRect(data => {
+					if(data){
+						document.getElementById('map-route-main').scrollLeft = data.left-20;
+					}
+					this.$refs.common.showLoading(false);
+				}).exec();
+			}catch(err){
+				console.log("err")
+				
+			}
+			
+		});
 	},
 	onReady() {
 

pages/buytickets/site.js

@@ -90,6 +90,7 @@ import {
 		submit(id) {
 			this.$refs.common.showLoading();
 		
+		console.log("Pay+"+new Date().getTime())
 		
 			Pay.wxpay(id).then((response) => {
 				if(!response.result){
@@ -103,6 +104,8 @@ import {
 					...data,
 					url: url
 				}
+				console.log("Pay+"+new Date().getTime())
+				
 				wxPayJs(obj);
 		
 			}).catch(error => {
@@ -150,7 +153,7 @@ import {
 					this.carhelp.set("paysucc",{
 							type:"buytickets",
 							id:this.id,
-							list:response.data.MergeOrderDTO.passengerRecordDTOList
+							list2:response.data.MergeOrderDTO.passengerRecordDTOList
 						})
 					if(this.buy){
 						this.submit(response.data.MergeOrderDTO.id);
@@ -238,6 +241,9 @@ import {
 		}else{
 			this.up.name = obj.oplist[0].upStationName;
 			this.up.id = obj.oplist[0].upStationId;
+			if(obj.oplist[0].ticketType2){
+				this.underLine=(obj.oplist[0].ticketType2==2?1:0);
+			}
 			this.personNum=obj.oplist.length
 			
 		}

pages/buytickets/site.vue

@@ -19,9 +19,10 @@
 						<span>上车站点</span>
 					</view>
 					<view class="site-head-img">
-						<view class="site-head-img-item">
-							<u-avatar size="large"  v-for="item,i in oplist" :key="i" :src="item.imageUrl"></u-avatar>
+						<view class="site-head-img-item" v-if="false">
 						</view>
+						<u-avatar size="large"     v-for="item,i in oplist" :key="i" :src="item.imageUrl"></u-avatar>
+						
 						<u-avatar size="large" v-if="pic"   :src="pic"></u-avatar>			
 					</view>
 					
@@ -147,8 +148,8 @@
 				display: flex;
 				justify-content: center;
 				.site-head-img-item{
-					height: 64px;
-					width:64px;
+					height: 60px;
+					width:60px;
 					box-shadow:3px 3px 3px rgba(0,0,0,0.1);
 					border: 2px solid #fff;
 					border-radius: 50%;

pages/buytickets/success.js

@@ -21,7 +21,7 @@
 		onLoad() {
 			 var obj = this.carhelp.get("paysucc");
 			 this.pay=obj;
-			 if(true||process.car.SIMPLE_RUN){
+			 if(process.car.SIMPLE_RUN){
 				 this.pay.list.push({
 					 ticketUpStationName:"上海",
 					 ticketDownStationName:"上海",

pages/buytickets/success.vue

@@ -31,7 +31,25 @@
 			<view class="ticket-item-right">
 				<u-avatar :src="item.imageUrl" size="default"></u-avatar>
 				<h3>{{item.totalFee}}</h3>
-				<p>票价</p>
+			</view>
+		</view>
+		<view class="ticket-item" v-for="item,i in pay.list2" :key="i" >
+			<view class="ticket-item-left" >
+				<view class="ticket-head">
+					<h3>{{item.startStation}} - {{item.endStation}}</h3>
+				</view>
+				<view class="ticket-text">
+					<view class="ticket-text-row">
+						<p>票种：</p><span>{{item.ticketTypeName}}</span>
+					</view>
+					<view class="ticket-text-row">
+						<p>货票：</p><span>￥{{item.goodTicket}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="ticket-item-right">
+				<u-avatar :src="item.imageUrl" size="default"></u-avatar>
+				<h3>{{item.totalFee}}</h3>
 			</view>
 		</view>
 		<view class="upload-button">

pages/index/index.vue

@@ -14,7 +14,7 @@
 					   </picker>
 				</view>				
 				<view class="search-wrap" >
-					<u-search placeholder="查线路、站点" @click="gotoQuery" :disabled="true" :show-action="false"></u-search>
+					<u-search placeholder="搜索线路" @click="gotoQuery" :disabled="true" :show-action="false"></u-search>
 				</view>
 				<view class="navbar-right"  @click="getScan">
 					<u-icon name="saoma" custom-prefix="custom-icon" size="40" color="#333"></u-icon>

pages/my/index.vue

@@ -30,7 +30,7 @@
 			<u-cell-group>
 				<u-cell-item title="意见反馈" @click="gotoUrl('/pages/my/user/feedback')"></u-cell-item>
 				<u-cell-item title="已绑定手机号" @click="gotoUrl('/pages/my/user/updatephone/index')">{{showphone(user.phone)}}</u-cell-item>
- 				<u-cell-item title="关于车信达" @click="gotoUrl('/pages/my/platform/about')"></u-cell-item>
+ 				<u-cell-item title="关于车信达" v-if="false" @click="gotoUrl('/pages/my/platform/about')"></u-cell-item>
 			</u-cell-group>
 		</view>
 		

pages/news/index.js

@@ -27,7 +27,8 @@ export default {
 						id:item.id,
 						upStationName:item.stationName,
 						upStationId:item.stationId,
-						imageUrl:item.imageUrl
+						imageUrl:item.imageUrl,
+						ticketType2:item.ticketType
 					}
 				], //当前添加的2人
 				list: [] // 一共添加的人 

utils/wxpay.js

@@ -1,5 +1,10 @@
  
 function onBridgeReady(params) {
+	console.log("onBridgeReady+"+new Date().getTime())
+	
+	uni.showLoading({
+		mask:true,title:'加载中...'
+	})
 	//记录要回跳的url
 	window.WeixinJSBridge.invoke(
 		'getBrandWCPayRequest', {
@@ -14,18 +19,24 @@ function onBridgeReady(params) {
 			//alert(JSON.stringify(res)); // 支付取消会执行 支付成功不会
 			if (res.err_msg == 'get_brand_wcpay_request:ok') {
 				//alert("支付成功") // 不会执行
-				window.location.href = params.url
+				//window.location.href = params.url
 			} else if (res.err_msg == "get_brand_wcpay_request:cancel") {
 				//alert("支付取消") // 会执行
+				 uni.hideLoading();
 			} else {
-				//alert("支付失败")
+				alert("支付失败")
+				 uni.hideLoading();
 			}
 		}
 	)
 }
 
 export const wxPayJs = (params) => {
+	console.log("wxPayJs+"+new Date().getTime())
 	
+	uni.showLoading({
+		mask:true,title:'加载中...'
+	})
 	if (!params.url) {
 		params.url = window.location.href.split("#")[0] + "/#/";
 	}