Merge remote-tracking branch 'origin/master'

gasStation-uni/pages/index/index.vue

@@ -162,7 +162,7 @@
 				chainStoreId: '',
 				indicatorDots: true,
 				autoplay: true,
-				interval: 3500,
+				interval: 3000,
 				duration: 500,
 				joinmsg: '',
 				msg: "1",

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -18,9 +18,17 @@
 			</view>
 			<!-- 储值充值 -->
 			<view class="boxback" v-if="actinput == 0">
-				<view class="box_s" v-for="(item,index) in actList" :key="index">
+				<swiper class="swiper" style="width: 100%;height: 70px;" circular
+					:autoplay="autoplay" :interval="interval" :vertical="true" :duration="duration">
+					<swiper-item  class="conttainer-box" v-for="(item,index) in actList" :key="index">
+						<view class="box_s">
+							{{item.discountActiveDescribe || ''}}
+						</view>
+					</swiper-item>
+				</swiper>
+				<!-- <view class="box_s" v-for="(item,index) in actList" :key="index">
 					{{item.discountActiveDescribe || ''}}
-				</view>
+				</view> -->
 				<!-- <view style="display: flex; align-items: center; justify-content: space-around;">
 					<view class="" @click="types = 0"> <u-button type="primary" text="自定义金额"></u-button></view>
 					<view class="" @click="types = 1"> <u-button type="primary" :plain="true" text="金额选项"></u-button>
@@ -66,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>
@@ -122,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>
@@ -222,6 +230,9 @@
 				shuomingFList: [],
 				columns: [],
 				actList: [],
+				autoplay: true,
+				interval: 3000,
+				duration: 500,
 				taplist: [{
 						title: '金额选项'
 					},
@@ -270,7 +281,7 @@
 
 				}).then(res => {
 					if (res.code == 200) {
-						console.log(res);
+						console.log(res,111);
 						this.actList = res.data
 					}
 				})
@@ -582,7 +593,7 @@
 					this.cardValueList = []
 					if (res.code == 200) {
 						this.cardValueList = res.data.records
-						console.log(res.data.records);
+						console.log(res.data.records,22);
 						this.xzindex(0, res.data.records[0].rechargeBalance, res.data.records[0].fringeBenefit,
 							res.data.records[0].giftBalance, res.data.records[0].points, res.data.records[0]
 							.growthValue, res.data.records[0]
@@ -637,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: "洗车卡"
-					},
 				]