Merge branch 'master-0817'

pages/searchPile/stationAndPile/stationDetails.vue

@@ -1,9 +1,9 @@
 <template>
 	<view style="padding-bottom: 28px;">
 		<ujp-navbar title="站点详情">
-			<view slot="right" style="margin-right: 10px;">
+			<!-- <view slot="right" style="margin-right: 10px;">
 				<span style="font-size: 16px; color: rgb(96, 98, 102);" @click="getChargingStationDetail(false)">刷新</span>
-			</view>
+			</view> -->
 		</ujp-navbar>
 
 		<view v-if="stationDetail.station!=null" class="station-details">

pages/user/InviteFriends.vue

@@ -16,7 +16,7 @@
 			</view>
 			<view class="InviteFriends-main">
 				<view class="InviteFriends-coupons">
-					<h4>每邀请1位好友注册，将获得1张服务费抵扣券</h4>
+					<h4>每邀请1位好友注册，将获得1张服务费优惠券</h4>
 					<view class="coupons-price">
 						<h2>5</h2><span>元</span>
 					</view>

pages/user/coupon/chooseCoupons.vue

@@ -20,7 +20,7 @@
 			<view 
 			:style="item.chooseStatus == '0' ? 'background-color:#9F9F9F':'' "
 			
-			class="voucher" v-if="item.classify == '2'||item.classify == '3'">折扣卷</view>
+			class="voucher" v-if="item.classify == '2'||item.classify == '3'">优惠券</view>
 			<view class="checked" v-if="selectObj.id==item.id">
 				<img src="../../../static/img/选中.png" alt="">
 			</view>

pages/user/coupon/couponDetails.vue

@@ -4,8 +4,8 @@
 		<view class="" style="background-color: rgba(188, 225, 208, 100);padding: 12px 0 ;">
 			<view class="list-item" style="margin-top: 0	;">
 				<view class="voucher" v-if="userCoupon.classify == '1'">优惠券</view>
-				<view class="voucher" v-if="userCoupon.classify == '2'">折扣卷</view>
-				<view class="voucher" v-if="userCoupon.classify == '3'">折扣卷</view>
+				<view class="voucher" v-if="userCoupon.classify == '2'">优惠券</view>
+				<view class="voucher" v-if="userCoupon.classify == '3'">优惠券</view>
 				
 				<view class="content">
 					<view class="content-left">

pages/user/coupon/myCoupon.vue

@@ -11,8 +11,8 @@
 		<view class="workable" :style="current == 0 ? '' : 'opacity: 0.6'">
 			<view class="list-item" v-for="(item,index) in myCouponList" :key="index">
 				<view class="voucher" v-if="item.classify == '1'">优惠券</view>
-				<view class="voucher" v-if="item.classify == '2'">折扣卷</view>
-				<view class="voucher" v-if="item.classify == '3'">折扣卷</view>
+				<view class="voucher" v-if="item.classify == '2'">优惠券</view>
+				<view class="voucher" v-if="item.classify == '3'">优惠券</view>
 				
 				<view class="content" @click="gotoUrl('pages/user/coupon/couponDetails?id=' + item.id)">
 					<view class="content-left">

pages/user/receiveCoupon.vue

@@ -23,7 +23,7 @@
 						<view class="unit">元</view>
 					<view class="ticket-info">
 						<view class="ticket-name">
-							{{item.threshold == 0 ? '无门槛充电抵扣券' : '满'+selectObj.threshold.toFixed(2)+'元可用'}}
+							{{item.threshold == 0 ? '无门槛充电优惠券' : '满'+selectObj.threshold.toFixed(2)+'元可用'}}
 							
 						</view>
 						<view class="condition">