Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51 into master

.env.test.js

@@ -12,11 +12,11 @@ const UNI_APP = {
 	//小鹏管家appid
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 	//zkx的测试openId
-	openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
+	// openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
 	// openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	// openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
 	//zq的测试openId
-	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",
+	openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU"
 }  
 
 module.exports = UNI_APP;

pages/index/index.vue

@@ -85,7 +85,7 @@
 
 
 
-		<view style="height:50px"></view>
+		<view style="height:100px"></view>
 		<!-- 站点 -->
 		<view class="station" v-if="message == 'getLocation:ok' && chargeList.length == 0"
 			@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
@@ -607,7 +607,7 @@
 		text-align: center;
 		background-color: #fff;
 		position: absolute;
-		top: 160px;
+		top: 210px;
 		left: 0;
 		right: 0;
 		margin: auto;

pages/login/welcome.vue

@@ -14,7 +14,7 @@
 				<view slot="error"></view>
 			</u-image>
 			
-			<u-image   v-if="!imgmode"  :height="imgH"  ref="imgw2"  mode="aspectFill">
+			<u-image   v-if="!imgmode"  :height="imgH"  ref="imgw"  mode="aspectFill">
 				<view slot="loading"></view>
 				<view slot="error"></view>
 			</u-image>

pages/user/coupon/myCoupon.vue

@@ -31,17 +31,11 @@
 				</view>
 				
 				<view class="limit">
-					<view class="limit-text" v-if="more==index&&readMoreStatus">
-							<view class="limit-text2">
+					<view class="limit-text">
+							<view :class="more==index&&readMoreStatus ? 'limit-text2' : 'limit-text1'">
 								<span>{{item.useScope}}</span>		
 							</view>
-							<text class="iconfont arrows" @click="readMore(index)">&#xe62c;</text>
-					</view>
-					<view class="limit-text" v-else>
-							<view class="limit-text1">
-								<span>{{item.useScope}}</span>
-							</view>
-							<text class="iconfont arrows" @click="readMore(index)">&#xe607;</text>
+							<text class="iconfont arrows" @click="readMore(index)">{{more==index&&readMoreStatus ? '&#xe607;' : '&#xe62c;'}}</text>
 					</view>
 					<view class="use-button" v-if="current == '0'" @click="toIndex">去使用</view>
 					<view class="have-used" v-if="current == '1'"><img src="../../../static/img/haveused.png" alt=""></view>
@@ -71,7 +65,8 @@
 				pageIndex: 1,
 				recordsTotal: 0,
 				readMoreStatus: false,
-				more: '',
+				more: -1,
+				moreShow: '',
 			}
 		},
 		onShow() {
@@ -94,8 +89,13 @@
 				})
 			},
 			readMore(index) {
-				this.more = index;
-				this.readMoreStatus = !this.readMoreStatus;
+				if(this.more != index && this.readMoreStatus) {
+					this.more = index;
+					this.readMoreStatus = true;
+				} else {
+					this.more = index;
+					this.readMoreStatus = !this.readMoreStatus;
+				}
 			},
 			getCouponList(bl) {
 				uni.showLoading({