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

pages/article/articleDetails.vue

@@ -43,6 +43,12 @@
 				newsApi.newsInfoDetail(this.id).then((res) => {
 					uni.hideLoading()					
 					this.newsDetail = res.data;
+					this.$nextTick(()=>{
+					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");
+					    for(var i=0;i<list.length;i++){
+					        list[i].style='width: 100%;height: 100%;'
+					    }
+					})
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/article/details.vue

@@ -38,6 +38,12 @@
 				}).then((res) => {
 					uni.hideLoading()					
 					this.newsDetail = res.data;
+					this.$nextTick(()=>{
+					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");
+					    for(var i=0;i<list.length;i++){
+					        list[i].style='width: 100%;height: 100%;'
+					    }
+					})
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/article/newsNotice.vue

@@ -8,12 +8,14 @@
 			</view>
 		</view>
 		
-		<view class="swiper-box" v-if="list.length">
-			<u-swiper  :list="list" @click="clickBanner" :img-mode="'aspectFit'" :name="'picUrl'" >
+		<view class="swiper-box" 
+		style="margin-bottom: 20px;"
+		v-if="list.length">
+			<u-swiper  bg-color="#fff" :list="list" @click="clickBanner" height="292" :img-mode="'aspectFit'" :name="'picUrl'" >
 		</u-swiper>
 		</view>
 		
-		<view class="news">
+		<view class="news" >
 			<view class="news-content" v-for="(item,index) in newsList" :key="item.id" @click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
 				<view class="content-text">
 					{{item.title}}
@@ -153,11 +155,7 @@
 		margin: 0px 16px ;
 	}
 	.swiper-box{
-	
-		height: 146px;
 		margin: 0 16px;
-	
-		
 	}
 	.news {
 		background-color: #fff;
@@ -169,18 +167,21 @@
 			margin-bottom: 24px;
 	
 			.content-text {
-				width: 211px;
-				height: 42px;
+				width: 56.2%;
+				height: 100%;
 				line-height: 21px;
 				color: #101010;
 				text-align: left;
-				font-size: 14px
+				font-size: 14px;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 	
 			;
 	
 			.content-img {
-				width: 48.74%;
+				width: 40.57%;
 				height: 100%;
 				border-radius: 4px;
 				overflow: hidden;
@@ -192,7 +193,7 @@
 			}
 	
 			.news-time {
-				margin-top: 20%;
+				margin-top: 26%;
 				color: #999999;
 				width: 100px;
 				height: 20px;

pages/index/index.vue

@@ -843,11 +843,14 @@
 
 			.content-text {
 				width: 56.2%;
-				height: 42px;
+				height: 100%;
 				line-height: 21px;
 				color: #101010;
 				text-align: left;
-				font-size: 14px
+				font-size: 14px;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 
 			;

pages/user/finance/refundList.vue

@@ -50,7 +50,11 @@
 			<u-modal v-model="show" :title="title" :content='content'  :show-confirm-button="true" :show-cancel-button='true' @confirm="confirm"></u-modal> 
 		</view>
 		<view>
-			<u-modal v-model="showtip" :title="title" :content='content1' :show-confirm-button="true" confirm-text="知道了" ></u-modal> 
+			<u-modal v-model="showtip" :title="title" :show-confirm-button="true" confirm-text="知道了" confirm-color="#00B962">
+				<view class="slot-content">
+					<rich-text :nodes="content1"></rich-text>
+				</view>
+			</u-modal> 
 		</view>
 				
 		<view style="bottom:0;position:absolute;width: 100%;padding: 20px;" v-show="account.totalAmount>0">
@@ -65,7 +69,7 @@
 	export default {
 		data() {
 			return {
-				content1:'本平台仅支持可支持金额全额退费,申请成功后退费金额将于5个工作日内退还至您的充值账户.在本平台,三个月内的支付宝充值,微信支付可申请退费.		退费成功后,您可以在退费记录查看退费信息和审核进度.',
+				content1:`本平台仅支持可支持金额全额退费,申请成功后退费金额将于5个工作日内退还至您的充值账户.在本平台,三个月内的支付宝充值,微信支付可申请退费.<br />退费成功后,您可以在退费记录查看退费信息和审核进度.`,
 				title:'提示',
 				content:'是否确定提交退费申请？申请成功后退费金额将于5个工作日内退还至您的充值账户',
 				show:false,
@@ -162,6 +166,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.slot-content {
+		font-size: 28rpx;
+		color: $u-content-color;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20px;
+		padding-bottom: 20px;
+	}
 	.refundList-none{
 		display: flex;
 		align-items: center;