bug

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -74,14 +74,14 @@
 					<view class="anniu" @click="addValueCarRecords()">
 						<text>立即充值</text>
 					</view>
-					<view class="dibu" @click="goRechargeRecords()">
+					<view class="dibu" @click="goRechargeRecords(1)">
 						<view class="">充值记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
 
 					<view class="box-hui">
 						<view style="margin-bottom: 15px;">服务说明</view>
-						<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+						<view class="huisize">1.该服务为电子储值卡直充服务，仅限本站使用</view>
 						<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
 					</view>
 				</view>
@@ -130,14 +130,14 @@
 					<view class="anniu" @click="addFuleCarRecords()">
 						<text>立即充值</text>
 					</view>
-					<view class="dibu" @click="goRechargeRecords()">
+					<view class="dibu" @click="goRechargeRecords(2)">
 						<view class="">充值记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
 
 					<view class="box-hui">
 						<view style="margin-bottom: 15px;">服务说明</view>
-						<view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+						<view class="huisize">1.该服务为电子囤油卡直充服务，仅限本站使用</view>
 						<view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
 					</view>
 				</view>
@@ -648,9 +648,9 @@
 					console.log(res)
 				})
 			},
-			goRechargeRecords() {
+			goRechargeRecords(val) {
 				uni.navigateTo({
-					url: '/pagesMy/Recharge/Recharge'
+					url: '/pagesMy/Recharge/Recharge?index='+val
 				})
 			},
 			//获取本店员工列表

gasStation-uni/pagesMy/Coupons/Coupons.vue

@@ -27,6 +27,8 @@
 				<view class="right-box">
 					<view class="title">{{item.couponName}}</view>
 					<view class="hui-size">{{item.couponContent}}</view>
+					<view class="hui-size">使用条件:{{item.couponContent}}</view>
+					<view class="hui-size">使用说明:{{item.instruction}}</view>
 					<view class="dis-bt">
 						<view class="hui-size">有效期：{{item.endTime || ''}}</view>
 						<view class="anniu" v-if="item.couponType == '优惠券'" <!--
@@ -95,8 +97,6 @@
 					name: '兑换券'
 				}, {
 					name: '洗车券'
-				}, {
-					name: '洗车卡'
 				}]
 
 			}

gasStation-uni/pagesMy/Recharge/Recharge.vue

@@ -91,8 +91,12 @@
 		components: {
 
 		},
-		onLoad() {
-			
+		onLoad(e) {
+			if (e.index){
+				console.log(e.index);
+				this.tindex = e.index
+				this.tapindex(e.index)
+			}
 		},
 		onShow() {
 			this.getAllOrderList();

gasStation-uni/pagesMy/writeOff/writeOff.vue

@@ -75,9 +75,6 @@
 					{
 						text: "洗车券"
 					},
-					{
-						text: "洗车卡"
-					},
 				]