merge file

pages/module/maintain.vue

@@ -7,7 +7,7 @@
 				<image src="../../static/img/icon_edit.png" mode="" class="topEdit" @click="carEdit"></image>
 			</view>
 			<view class="topRight">
-				<input type="text" v-model="maintainCarData.milage" @confirm="milageEditconfirm" value="" placeholder="请输入当前里程" class="topInput" placeholder-style="color:#ffffff;"/>
+				<input type="number" v-model="maintainCarData.milage" @confirm="milageEditconfirm" value="" placeholder="请输入当前里程" class="topInput" placeholder-style="color:#ffffff;"/>
 				<image src="../../static/img/icon_edit.png" mode="" class="topEdit" @click="milageEdit"></image>
 			</view>
 		</view>
@@ -225,7 +225,6 @@ export default {
 			for(let k in this.maintainCarData){this.maintainCarData[k] = this.maintainCarData[k]==null?'':this.maintainCarData[k]}
 			this.$http('miniAppMyBMemberCar/updateMemberCar',this.maintainCarData,'POST').then(res => {
 				uni.hideLoading();
-				
 					uni.setStorage({
 						key: 'maintainCarData',
 						data: that.maintainCarData,
@@ -299,12 +298,12 @@ export default {
 							}
 							if(i.listGoodsAll.length>0){
 								i.listGoodsAll.forEach((goods,goodsIndex)=>{
-									/* goods.forEach(sp=>{
+									 goods.forEach(sp=>{
 									    this.goodsTotal=Number(this.goodsTotal)
 										this.goodsTotal+=sp.salePrice*sp.qty
 										this.goodsTotal=this.goodsTotal.toFixed(2) 
-									}) */
-									goods[0].salePrice=1;
+									}) 
+									//goods[0].salePrice=1;
 									this.goodsTotal=Number(this.goodsTotal)
 									this.goodsTotal+=goods[0].salePrice*goods[0].qty
 									this.goodsTotal=this.goodsTotal.toFixed(2)
@@ -323,7 +322,7 @@ export default {
 							
 							i.listItem.forEach(xm=>{
 								xm.qty=1;
-								xm.salePrice=1;
+								//xm.salePrice=1;
 								this.salePriceTotal=Number(this.salePriceTotal)
 								this.salePriceTotal+=xm.salePrice
 								this.salePriceTotal=this.salePriceTotal.toFixed(2)
@@ -351,9 +350,12 @@ export default {
 		},
 		getData(){
 			uni.showLoading({ });
+			var location = uni.getStorageSync("location");
 			this.$http('miniApp/tPackageMiniAppController/queryPackageList', {
-			   mileage:'22',//this.maintainCarData.milage,
-			   liyangId:'CFA0318M0024',//this.maintainCarData.nLevelID,
+			   mileage:this.maintainCarData.milage,
+			   liyangId:this.maintainCarData.nLevelID,
+			   cityCode:location.cityCode,
+			   guidePrice:this.maintainCarData.guidePrice,
 			 },'GET').then(res => {
 				uni.hideLoading();
 				this.mealData=res.data;

pages/order/myorder.vue

@@ -316,4 +316,8 @@
 		color: #FF4F00;
 		margin-left: 40rpx;
 	}
+	.orderState{
+		color: #F19D01;
+		font-size: 24rpx;
+	}
 </style>

pages/order/orderDetail.vue

@@ -515,7 +515,11 @@
 			refundMoney(){
 				console.log('退款');
 				uni.navigateTo({
+<<<<<<< HEAD
+					url:'../refundMoney/refundMoney?sheetId='+this.id +'&maxMoney=' + this.orderData.PayMoney
+=======
 					url:'../refundMoney/refundMoney?id='+this.id
+>>>>>>> 22e6aaaee76a8b173ef79e423f41fb1bcfbd9808
 				})
 			},
 			orderPay() {

pages/refundMoney/refundMoney.vue

@@ -1,118 +1,245 @@
-<template>
-	<view class="box">
-		<view class="content">
-			<view class="viewBg">
-				<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
-				<view class="leftTitle">退款原因</view>
-				<picker class="width70" mode="selector" :range="reasonArray"   @change="reasonChange" >
-					  <view class="blackColor" :class="{grayColor: reason==''}">{{reason?reason:'请选择'}}</view>
-				 </picker>
-				
-				<image src="../../static/img/rightArrow.png" mode="" style="width: 13rpx; height: 23rpx;"></image>
-			</view>
-			
-			<view class="moneyBg">
-				<view class="viewBg2">
-					<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
-					<view class="leftTitle">退款金额</view>
-					<input class="blackColor" type="number" v-model ="money" placeholder="最大可退 ￥123"
-						placeholder-style="color:#999999" />
-					
-				</view>
-				<view class="grayColor">如全额退款，优惠券会退回到您的账户</view>
-			</view>
-			
-			
-			<view class="contentBg">
-				<view class="leftTitle">补充描述</view>
-				
-					<textarea placeholder-style="color:#999999" placeholder="选填，请输入补充描述" v-model="exeContent"
-						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-				
-			</view>
-		</view>
-	</view>
-</template>
 
-<script>
-	export default {
-		data() {
-			return {
-				maxMoney:'',
-				reasonArray:['不想要了','质量不好'],
-				reason:'',
-				money:'',
-				exeContent:'',
-			}
-		},
+<template>
+	<view class="box">
+		<view class="content">
+			<view class="viewBg">
+				<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
+				<view class="leftTitle">退款原因</view>
+				<picker :value="firstIndex" class="width70" mode="selector" :range="reasonArray" range-key="contents"
+					@change="reasonChange">
+					<view class="blackColor" :class="{grayColor: firstIndex==null}">
+						{{firstIndex == null ? '请选择' : reasonArray[firstIndex].contents}}
+					</view>
+				</picker>
+
+				<image src="../../static/img/rightArrow.png" mode="" style="width: 13rpx; height: 23rpx;"></image>
+			</view>
+
+			<view class="moneyBg">
+				<view class="viewBg2">
+					<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
+					<view class="leftTitle">退款金额</view>
+					<input class="blackColor" type="number" v-model="money" :placeholder="'最大可退 ￥'+maxMoney"
+						placeholder-style="color:#999999" />
+
+				</view>
+				<view class="grayColor">如全额退款，优惠券会退回到您的账户</view>
+			</view>
+
+
+			<view class="contentBg">
+				<view class="leftTitle">补充描述</view>
+
+				<textarea placeholder-style="color:#999999" placeholder="选填，请输入补充描述" v-model="exeContent"
+					class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+
+			</view>
+
+			<view class="bottom">
+				<view class="shoreDz" @click="submit">提交</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				sheetId: '',
+				reasonArray: [],
+				firstIndex: null,
+				reasonId: '',
+				maxMoney: '',
+				money: '',
+				exeContent: '',
+			}
+		},
+		onLoad(opt) {
+			this.sheetId = opt.sheetId;
+			this.maxMoney = opt.maxMoney;
+			this.getRefundData();
+		},
 		methods: {
-			feedDone(e) {
-				this.exeContent = e.target.value
+			submit() {
+				if (this.reasonId == '') {
+					uni.showToast({
+						title: '请选择退款原因',
+						icon: 'none',
+						duration: 2000,
+					});
+					return ;
+				}
+				if (this.money==0) {
+					uni.showToast({
+						title: '请输入退款金额',
+						icon: 'none',
+						duration: 2000,
+					});
+					return ;
+				}
+				if (this.money > this.maxMoney) {
+					uni.showToast({
+						title: '退款金额不能大于最大可退金额',
+						icon: 'none',
+						duration: 2000,
+					});
+					return ;
+				}
+				
+				uni.showLoading({});
+				
+				this.$http('worldKeepCar/orderRefund/applyRefund', {
+					sheetId:this.sheetId,
+					applyReasonId:this.reasonId,
+					applyReason:this.reasonArray[this.firstIndex].contents,
+					money:this.money,
+					reasonComment: this.exeContent,
+					
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if(res.code==0){
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						setTimeout(function() {
+							uni.navigateBack({
+								
+							})
+						}, 2000); 	
+					}
+					
+					
 			
-			},
-			reasonChange(e){
-				this.reason = this.reasonArray[e.detail.value];
-			}
-		}
-	}
-</script>
+				})
+			},
+			getRefundData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/orderRefund/refuseReasonList',
+					params = {
+						type: 3,
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+
+					uni.hideLoading();
+
+
+					this.reasonArray = res.data
+					console.log(this.reasonArray);
+
+				})
+			},
+			feedDone(e) {
+				this.exeContent = e.target.value
+
+			},
+			reasonChange(e) {
+
+				this.firstIndex = e.target.value
+				this.reasonId = this.reasonArray[this.firstIndex].id
+
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+	.content {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 24rpx;
+		padding: 0 20rpx;
+	}
+
+	.viewBg {
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.width70 {
+		width: 70%;
+	}
+
+	.moneyBg {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.viewBg2 {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.leftTitle {
+		color: #333333;
+		font-size: 28rpx;
+		width: 130rpx;
+		margin-right: 50rpx;
+	}
+
+	.blackColor {
+		color: #333333;
+		font-size: 28rpx;
+	}
+
+	.grayColor {
+		color: #999999;
+		font-size: 28rpx;
+	}
+
+	.textareaCont {
+
+		width: 70%;
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.contentBg {
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0;
+
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
 
-<style scoped>
-	.box {
-		min-height: 100vh;
-		background: #F4F5F7;
-		padding-top: 20rpx;
-	}
-	
-	.content{
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-		margin: 20rpx 24rpx;
-		padding: 0 20rpx;
-	}
-	.viewBg{
-		display: flex;
-		align-items: center;
-		padding: 30rpx 0;
-		border-bottom: 1rpx solid #EEEEEE;
-	}
-	.width70{
-		width: 70%;
-	}
-	.moneyBg{
-		padding: 30rpx 0;
-		border-bottom: 1rpx solid #EEEEEE;
-	}
-	.viewBg2{
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-	}
-	.leftTitle{
-		color: #333333;
-		font-size: 28rpx;
-		width: 130rpx;
-		margin-right: 50rpx;
-	}
-	.blackColor{
-		color: #333333;
-		font-size: 28rpx;
-	}
-	.grayColor{
-		color: #999999;
-		font-size: 28rpx;
-	}
-	.textareaCont {
-		
-		width: 70%;
-		font-size: 28rpx;
-		color: #333333;
-		
-	}
-	.contentBg{
-		display: flex;
-		align-items: center;
-		padding: 30rpx 0;
-		
-	}
 </style>