zhengkaixin 4 years ago
parent
commit
6dd0fab12a

+ 1 - 1
pages/buytickets/index.vue

@@ -35,7 +35,7 @@
 				</template>	 
 				 
 			</view>
-			<p v-show="!num"><span style="color: #007AFF;">无本人照片?</span>请前往上车处重新刷脸登记</p>
+			<p v-show="!num"><span style="color: #007AFF;">无本人照片?</span>请前往上车处重新刷脸登记</p>
 			
 		</view>
 		 

+ 9 - 2
pages/buytickets/selectSite.js

@@ -6,6 +6,7 @@ import Carmap from '@/components/Carmap.vue'
 export default {
 	data() {
 		return {
+			buy:"",
 			look:false,
 			initBl: false,
 			title: '乘车人',
@@ -211,6 +212,7 @@ export default {
 				
 				//this.car.currentStationId=this.stationList[this.k].id
 				//this.car.currentStationStatus="2"
+				
 				
 				this.$refs.amap.setCar(this.car);
 				var bl = false;
@@ -233,7 +235,9 @@ export default {
 						if(i==this.stationList.length-1){
 								stat.status = 1;
 						}
-						
+						if(this.buy){
+							this.downBtn(stat)
+						}
 					}
 				}
 				if (!this.initBl) {
@@ -334,7 +338,10 @@ export default {
 			this.$refs.common.showLoading()
 			 WxJsApi.getWxConfig(['getLocation']).then(()=>{
 				 this.$refs.common.showLoading(false)
-			 });
+			 });
+			 var obj = this.carhelp.get("form");
+			 this.buy=obj.buy;
+			 
 		this.getShiftInfo()
 		var pages = getCurrentPages();  
 		var page = (pages[pages.length - 1]).route;  

+ 51 - 76
pages/buytickets/site.js

@@ -6,7 +6,7 @@ import {
  export default {
  	data() {
  		return {
- 			 
+ 			total:0,
  			uid: '', //用户id ,有id是修改
  			id: '', //车id
  			type: 2,
@@ -26,62 +26,52 @@ import {
  			ticket: {
  				price1: 0,
  				price2: 0,
- 			},
+ 			},
+			list:[
+				{
+					id:1,
+					name:"儿童票"
+				},{
+					id:2,
+					name:"成人票"
+				}
+			],
  			underLine: 1,
  			op: {
 
  			}
  		}
  	},
- 	computed: {
- 		// 计算属性的 getter
- 		total: function() {
- 			// `this` 指向 vm 实例
+ 	 
+ 	methods: {
+		
+		radioGroupChange(){
+			var ptotal=this.getTotal();
 			
+			ptotal+=parseFloat(this.pnum)
+			this.total=ptotal;
+		},
+		getTotal(){
 			var ptotal=0;
-			if(this.underLine){
-				ptotal+=this.ticket.price2
-			}else{
-				ptotal+=this.ticket.price1
-			}
-			ptotal=ptotal*this.personNum;
-			ptotal+=this.pnum
-			
- 			return ptotal;
- 		}
- 	},
- 	methods: {
-		personDelete(){
-			this.$refs.common.showLoading();
 			
-			var obj = this.carhelp.get("form")
-			var thisform={
-				id:obj.op.id,
-				mergeOrderId:obj.mergeOrderId
+			for(var i in this.oplist){
+				if(this.oplist[i].ticketType=="1"){
+					ptotal+=parseFloat(this.ticket.price1*100)
+				}
+				if(this.oplist[i].ticketType=="2"){
+					ptotal+=parseFloat(this.ticket.price2*100)
+				}
 			}
-			API.deletePassengerOrder(thisform).then((response) => {
-				obj.op=null
-				obj.ticket=null;
-				obj = this.carhelp.set("form", obj)
-				this.$refs.common.alert( "操作成功",()=>{
-					uni.redirectTo({
-						url: '/pages/buytickets/home?id=' + this.id 
-					})
-				});
-				
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-			
-			})	
+			return ptotal/100;
+		},
+		personDelete(){ 
 		},
  		deleteBtn() {
 			this.$refs.common.setFnc(this.personDelete)
  			 this.$refs.common.confirm('是否删除该乘车人信息?')
  		},
  		select() {
- 			//var obj = this.carhelp.get("form")
- 			//obj.op = this.op;
- 			//obj = this.carhelp.set("form", obj)
+ 		 
 
  			uni.navigateTo({
  				url: '/pages/buytickets/selectSite?id=' + this.id
@@ -115,13 +105,18 @@ import {
 		},
  		clickBtn(bl) {
  			var obj = this.carhelp.get("form")
- 			//obj.op = this.op;
+ 		
  			//obj = this.carhelp.set("form", obj)
 			this.$refs.common.showLoading();
 			var arr=[]
+			var arr2=[]
 			for(var i in obj.oplist){
 				arr.push(obj.oplist[i].id);
 			}
+			for(var i in this.oplist){
+				arr2.push(this.oplist[i].ticketType);
+			}
+			
 			var thisform={
 				id:this.id,
 				mergeOrderId:obj.mergeOrderId,
@@ -129,25 +124,12 @@ import {
 				passengerIds:arr.join(),
 				ticketUpStationId:this.up.id,
 				ticketDownStationId:this.down.id,
-				ticketType:this.underLine?2:1,
+				ticketTypes:arr2.join(),
 				goodsTicket:this.pnum,
 				totalFee:this.total
 			}
 			if(obj.op){
-				thisform.id=obj.op.id;
-				API.updatePassengerOrder(thisform).then((response) => {
-					obj.oplist=[];
-					obj.ticket=null;
-					obj = this.carhelp.set("form", obj)
-					
-					uni.reLaunch({
-						url: '/pages/buytickets/home?id=' + this.id 
-					})
-					console.log(response)
-				}).catch(error => {
-					this.$refs.common.showLoading(false, error);
-				
-				})
+				 
 			}else{
 				API.createPassengerOrder(thisform).then((response) => {
 				
@@ -197,6 +179,7 @@ import {
 				API.ticketAmount(thisform).then((response2) => {
 					thisform.price2=response2.data.price
 					this.ticket=thisform;
+					this.radioGroupChange()
 					obj.ticket=thisform;
 					this.carhelp.set("form",obj);
 					this.$refs.common.showLoading(false);
@@ -223,28 +206,20 @@ import {
  		var obj = this.carhelp.get("form");
 		this.buy=obj.buy;
 		this.oplist=obj.oplist;
-		if(obj.op ){
-			this.uid = obj.op.id;
-			this.up.id = obj.op.ticketUpStationId;
-			this.up.name = obj.op.ticketUpStationName;
-			
-			this.down.id = obj.op.ticketDownStationId;
-			this.down.name = obj.op.ticketDownStationName;
-			this.underLine=(obj.op.ticketType==2?1:0);
-			this.pnum=obj.op.goodsTicket;
-			this.pic=obj.op.imageUrl;
-			this.personNum=1;
-		}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);
+		for(var i  in this.oplist){
+			if(!this.oplist[i].ticketType){
+				this.oplist[i].ticketType="2"
 			}
-			this.personNum=obj.oplist.length
-			
-		}
+		}
+		
+		this.up.name = obj.oplist[0].upStationName;
+		this.up.id = obj.oplist[0].upStationId;
+		
+		this.personNum=obj.oplist.length
+		
  		if (obj.ticket) {
  			this.ticket = obj.ticket;
+			this.radioGroupChange()
  			this.down = {
  				id: obj.ticket.ticketDownStationId,
  				name: obj.ticket.ticketDownStationName

+ 19 - 8
pages/buytickets/site.vue

@@ -3,7 +3,7 @@
 		<car-common  ref="common"></car-common>
 		
 		
-		<u-navbar title="站点选择">
+		<u-navbar title="购买车票">
 			<view class="slot-wrap"></view>
 			<view class="navbar-right"  v-if="uid" @click="deleteBtn" >
 				<u-icon name="shanchu" custom-prefix="custom-icon" size="40" :color="uid?'red':'#999'"></u-icon>
@@ -18,7 +18,7 @@
 						<view class="circle"></view>
 						<span>上车站点</span>
 					</view>
-					<view class="site-head-img">
+					<view class="site-head-img"  v-if="false">
 						<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>
@@ -41,14 +41,26 @@
 				</view>
 			</view>
 			<view class="site-foot">
-				<view class="site-foot-row">
-					<span>乘客类型</span>
-					<h3 v-if="buy">{{['儿童票', '成人票'][underLine]}}</h3>
-					<u-subsection v-if="!buy" :current="underLine" @change="underLineChange" vibrateShort :list="['儿童票', '成人票']"  ></u-subsection>
+				<view class="site-foot-row"   v-for="item,i in oplist" :key="i">
+					<span>
+						<u-avatar size="large"     :src="item.imageUrl"></u-avatar>
+					</span>
+					<h3 v-if="buy">{{item.ticketTypeName}}</h3>
+					
+					<u-radio-group  v-if="!buy" v-model="item.ticketType" @change="radioGroupChange">
+								<u-radio 
+									v-for="(item, index) in list" :key="index" 
+									:name="item.id"
+								>
+									{{item.name}}
+								</u-radio>
+							</u-radio-group>
+							
+					
 				</view>
 				<view class="site-foot-row">
 					<span>货票</span>
-					<u-number-box v-model="pnum"  ></u-number-box>
+					<u-number-box v-model="pnum" @change="radioGroupChange" ></u-number-box>
 				</view>
 				<view class="site-foot-row">
 					<span>应付金额</span>
@@ -107,7 +119,6 @@
 		background-color: #fff;
 		margin: 10px;
 		border-radius: 10px;
-		margin-top: 50px;
 		box-shadow:3px 3px 3px rgba(0,0,0,0.1);
 		.site-head{
 			border-bottom:1px dashed #eee;

+ 2 - 2
pages/index/index.js

@@ -127,8 +127,8 @@ export default {
 				})
 			},
 			passengerNearbyStation(){
-				 this.latitude = '30.306452';
-				this.longitude = '112.27642';
+				// this.latitude = '30.306452';
+				//this.longitude = '112.27642';
 				
 				var form={
 					longitude:this.longitude,

+ 5 - 1
pages/my/user/feedback.js

@@ -13,6 +13,10 @@
 		},
 		methods: {
 			submit(){
+				if(!this.text){
+					this.$refs.common.alert('请详细描述您的意见和反馈')
+					return 
+				}
 				this.$refs.common.showLoading();
 				var obj={
 					content:this.text,
@@ -25,7 +29,7 @@
 						    url: '/pages/my/index'
 						});
 					})
-					this.$refs.common.alert2("操作成功!");
+					this.$refs.common.alert2("操作成功,感谢您的反馈!");
 				
 				}).catch(error => {
 					this.$refs.common.showLoading(false,error);

+ 2 - 1
pages/news/index.js

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