调整

pages/searchPile/chargeProcess/charge.vue

@@ -106,7 +106,8 @@
 
 	export default {
 		data() {
-			return {
+			return {
+				stationId:"",
 				elderMode:false,
 				isback:true,
 				moneyActiveClass: "20",
@@ -155,8 +156,10 @@
 			}
 		},
 		onLoad(op) {
-			this.uuid=new Date().getTime();
-			if (op.deviceNo) {
+			this.uuid=new Date().getTime();
+			this.stationId= op.stationId;
+			if (op.deviceNo) {
+				
 				this.submitForm.deviceNo = op.deviceNo;
 				this.submitForm.channelNo = op.gun;
 				this.submitForm.carNumber = op.carNumber;
@@ -208,7 +211,7 @@
 			chooseCoupons(){
 				this.submitInit()
 					
-				this.gotoUrl('pages/user/coupon/chooseCoupons?uuid='+this.uuid+"&amount="+this.submitForm.amount)
+				this.gotoUrl('pages/user/coupon/chooseCoupons?uuid='+this.uuid+"&amount="+this.submitForm.amount+"&stationId="+this.stationId)
 				
 			},
 			ckInput(text) {
@@ -320,7 +323,8 @@
 				 
 				 
 				userApi.couponList({
-					status:0
+					status:0,
+					stationId:this.stationId
 				}).then((res) => {
 					
 					this.listlength= res.data.recordsTotal;

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -258,7 +258,7 @@
 				this.role()
 				if(this.isReady){
 					uni.navigateTo({
-						url:'/pages/searchPile/chargeProcess/charge?deviceNo='+this.detail.deviceNo+"&gun="+this.gun.channelNo+"&carNumber="+(this.car?this.car.carNum:'')
+						url:'/pages/searchPile/chargeProcess/charge?stationId='+this.detail.stationId+'&deviceNo='+this.detail.deviceNo+"&gun="+this.gun.channelNo+"&carNumber="+(this.car?this.car.carNum:'')
 					})
 				}
 				

pages/user/coupon/chooseCoupons.vue

@@ -51,8 +51,8 @@
 			</view>
 		
 		</view>
-		<u-divider  v-if="myCouponList.length > 0" style="padding-bottom: 80px;margin-top: 10px;">已经到底了</u-divider>
-		
+		<u-divider  v-if="myCouponList.length > 0" style="margin-top: 10px;">已经到底了</u-divider>
+		<view   v-if="myCouponList.length > 0"  style="padding-bottom: 80px;" ></view>
 		<view class="carNone" v-if="myCouponList.length == 0">
 			<img src="static/img/暂无数据-缺省页.png" alt="">
 			<p>暂无优惠券</p>
@@ -94,6 +94,7 @@
 				myCouponList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
+				stationId:"",
 			}
 		},
 		onReachBottom() {
@@ -105,6 +106,7 @@
 			if(op.uuid){
 				this.amount=op.amount
 				this.uuid=op.uuid
+				this.stationId=op.stationId;
 			}
 		
 		},
@@ -148,7 +150,8 @@
 					this.pageIndex = 1;
 				}
 				userApi.useCoupon({
-					amount:this.amount
+					amount:this.amount,
+					stationId:this.stationId
 				}).then((res) => {
 					uni.hideLoading();
 					
@@ -221,7 +224,7 @@
 			}
 		}
 		.item-left{
-			padding: 24px 0 20px 16px;
+			padding: 24px 0 20px 5px;
 			.title{
 				line-height: 25px;
 				color: rgba(16, 16, 16, 100);
@@ -236,7 +239,7 @@
 			}
 		}
 		.item-right{
-			padding: 19px 20px 18px 0;
+			padding: 19px 5px 18px 0;
 			
 			.price{
 				height: 38px;

pages/user/coupon/couponDetails.vue

@@ -47,7 +47,7 @@
 					适用范围
 				</view>
 				<view class="content">
-					{{chargingCoupon.useScope}}
+					{{userCoupon.useScopeText}}
 				</view>
 			</view>
 			<view class="explain-item">

pages/user/coupon/myCoupon.vue

@@ -33,7 +33,7 @@
 				<view class="limit">
 					<view class="limit-text">
 							<view :class="more==index&&readMoreStatus ? 'limit-text2' : 'limit-text1'">
-								<span>{{item.useScope}}</span>		
+								<span>{{item.useScopeText}}</span>		
 							</view>
 							<text class="iconfont arrows" @click="readMore(index)">{{more==index&&readMoreStatus ? '&#xe607;' : '&#xe62c;'}}</text>
 					</view>