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

pages/user/coupon/myCoupon.vue

@@ -31,12 +31,17 @@
 				</view>
 				
 				<view class="limit">
-					<view class="limit-text">
+					<view class="limit-text" v-if="more==index&&readMoreStatus">
+							<view class="limit-text2">
+								<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">&#xe62c;</text>
+							<text class="iconfont arrows" @click="readMore(index)">&#xe607;</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>
@@ -65,6 +70,8 @@
 				myCouponList: [],
 				pageIndex: 1,
 				recordsTotal: 0,
+				readMoreStatus: false,
+				more: '',
 			}
 		},
 		onShow() {
@@ -86,6 +93,10 @@
 					url: '/pages/index/index'
 				})
 			},
+			readMore(index) {
+				this.more = index;
+				this.readMoreStatus = !this.readMoreStatus;
+			},
 			getCouponList(bl) {
 				uni.showLoading({
 					title: "加载中",
@@ -248,6 +259,15 @@
 					overflow: hidden;
 					text-overflow: ellipsis;	
 			}
+			.limit-text2{
+					max-width: 51vw;
+					line-height: 20px;
+					position: relative;
+					font-size: 11px;
+					white-space: normal;
+					overflow: hidden;
+					text-overflow: ellipsis;	
+			}
 			.arrows{
 									   display: inline-block;
 								   width: 20px;

pages/user/finance/rechargeList.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
-				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}元</h4></view>
+				<view class="rechargeList-row"><span>{{item.payName == "give" ? '赠送金额' : '充值金额'}}</span><h4>{{item.amount}}元</h4></view>
 				<view class="rechargeList-row"><p>{{item.payNameStr}}</p><p>{{item.createTime}}</p></view>
 			</view>
 		</view>