bug修改

pages.json

@@ -3,7 +3,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

pages/index/car.vue

@@ -1,14 +1,17 @@
 <template>
 	<view class="content">
+		
 		<view  class="nodataBox" v-show="nodataShow">
 			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
-		<view class="carLine" v-for="(item,index ) in carList" @click="extCarInfo(item)">
+		<view style="margin-top: -26rpx;"></view>
+		<view class="carLine" v-for="(item,index ) in carList" @click="carlineFn(item)">
 			<view class="carTop" >
 				<view class="carCont">
 					<view class="carModel">
-						<image :src="item.BrandLogo" mode="" class="carLogo"></image>
+						<image :src="item.BrandLogo" v-if="item.BrandLogo" mode="" class="carLogo"></image>
+						<image v-else src="../../static/img/nocar.png" mode="" class="carLogo"></image>
 						<view class="carModelCont">
 							<view class="carMcTop">
 								<view class="plateNumber">{{item.PlateNumber}}</view>
@@ -22,7 +25,8 @@
 							</view>
 						</view>
 						<view>
-							<image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image>
+							<image class="carUpimg" v-if="item.show" src="../../static/img/icon_arrow_up.png" mode=""></image>
+							<image class="carUpimg" v-if="!item.show" src="../../static/img/icon_arrow_down.png" mode=""></image>
 						</view>
 					</view>
 					<view class="carData">
@@ -34,9 +38,9 @@
 				</view>
 			</view>
 			
-			<view class="box">
+			<view class="box" v-if="item.show">
 				<view class="line">
-					<view class="lineTop">
+					<view class="lineTop" v-show="item.carDetailInfo.NextAuditTime" @click.stop="carDfn1(item)">
 						<view class="lineTop1">
 							<view class="lineTopNs">
 								<view class="nsTxt">年审日期</view>
@@ -47,10 +51,11 @@
 							</view>
 							<view class="lineTimeBox">
 								<span>{{item.carDetailInfo.NextAuditTime}}</span>
-								<image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image>
+								<image class="carUpimg" v-show="item.show2" src="../../static/img/icon_arrow_up.png" mode=""></image>
+								<image class="carUpimg" v-show="!item.show2" src="../../static/img/icon_arrow_down.png" mode=""></image>
 							</view>
 						</view>
-						<view class="lineTop2">
+						<view class="lineTop2" v-show="item.show2">
 							<view class="chaoqi">
 								<span v-if="!isDateGreater(item.carDetailInfo.NextAuditTime)">超期天数：{{daysUntilDate(item.carDetailInfo.NextAuditTime)}}天</span>
 								
@@ -58,30 +63,44 @@
 							<view class="lineBtn">发送提醒</view>
 						</view>
 					</view>
-					<view class="lineCont">
+					<view class="lineCont" v-show="item.carDetailInfo.InsuranceExpireDate" @click.stop="carDfn2(item)">
 						<view class="lcLine">
 							<view class="lineTop1">
 								<view class="lineTopNs">
 									<view class="nsTxt">保险提醒</view>
-									<view class="nsStatus"  v-if="!isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
-										<span v-if="daysUntilDate(item.carDetailInfo.InsuranceExpireDate)>30">已过期</span>
+									<view class="nsStatus"  v-if="isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
+										<span v-if="daysUntilDate(item.carDetailInfo.InsuranceExpireDate)>30"></span>
 										<span v-else>即将过期</span>
 									</view>
+									<view class="nsStatus" v-else>
+										<span>已过期</span>
+									</view>
 								</view>
 								<view class="lineTimeBox" v-if="item.carDetailInfo.InsuranceExpireDate">
 									<span>{{item.carDetailInfo.InsuranceExpireDate.slice(0,10)}}</span>
-									<image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image>
+									<image class="carUpimg" v-show="item.show3" src="../../static/img/icon_arrow_up.png" mode=""></image>
+									<image class="carUpimg" v-show="!item.show3" src="../../static/img/icon_arrow_down.png" mode=""></image>
 								</view>
 							</view>
-							<view class="carData">
-								<view class="carDataLine">交强险到期：{{item.carDetailInfo.CompulsoryInsuranceTime}}</view>
-								<view class="carDataLine">商业险到期：{{item.carDetailInfo.CommercialInsuranceTime}}</view>
-							</view>
-							<view class="carnotes">保险公司：{{item.carDetailInfo.inscName}}</view>
-							<view class="lineTop2">
-								<view class="chaoqi">距离天数：{{daysUntilDate(item.carDetailInfo.InsuranceExpireDate)}}天</view>
-								<view class="lineBtn">发送提醒</view>
+							<view v-show="item.show3">
+								<view class="carData">
+									<view class="carDataLine">交强险到期：{{item.carDetailInfo.CompulsoryInsuranceTime}}</view>
+									<view class="carDataLine">商业险到期：{{item.carDetailInfo.CommercialInsuranceTime}}</view>
+								</view>
+								<view class="carnotes">保险公司：{{item.carDetailInfo.inscName}}</view>
+								<view class="lineTop2">
+									<view class="chaoqi"  v-if="isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
+										<span >距离天数：</span>
+										{{daysUntilDate(item.carDetailInfo.InsuranceExpireDate)}}天
+									</view>
+									<view class="chaoqi"  v-if="!isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
+										<span >超期天数：</span>
+										{{daysUntilDate(item.carDetailInfo.InsuranceExpireDate)}}天
+									</view>
+									<view class="lineBtn">发送提醒</view>
+								</view>
 							</view>
+							
 						</view>
 						
 					</view>
@@ -229,6 +248,15 @@
 			}
 		  },
 		methods: {
+		   carlineFn(item){
+			   item.show=!item.show
+		   },
+		   carDfn2(item){
+			    item.show3=!item.show3
+		   },
+		   carDfn1(item){
+		   		 item.show2=!item.show2	   
+		   },
            getdata(){
 			   this.extCarInfo()
 			  /* var that=this;
@@ -242,16 +270,26 @@
 			   
 		   },
 		   extCarInfo(item){
+			 
 			   var that=this;
 			    this.customerId=uni.getStorageSync('customerId')
 				if(!this.customerId){
 					this.nodataShow=true
 				}else{
+					uni.showLoading({
+					 	title: '加载中'
+					}); 
 					this.$http('enterprise/wechat/extCarInfo', {
 					   id:this.customerId,
 					  
 					   //token:this.token
 					}, 'GET').then(res => {
+						uni.hideLoading();
+						res.data.forEach(item=>{
+							item.show=false
+							item.show2=false
+							item.show3=false
+						})
 					    this.carList=res.data
 					})
 				}
@@ -265,13 +303,17 @@
 	.carTop{
 		background: #fff;
 		padding: 24rpx;
-		padding-top: 0;
+		/* padding-top: 0; */
 	}
 	.carCont{
-		height: 305rpx;
+		/* height: 305rpx; */
 		background: linear-gradient( 180deg, #FFE9DB 0%, #FFF2EB 48%, #FFF8F4 100%);
 		border-radius: 10rpx;
-		opacity: 0.7;
+		padding-bottom: 20rpx;
+		/* opacity: 0.7; */
+	}
+	.carCont .carData{
+		padding-top: 20rpx;
 	}
 	.carLogo{
 		width: 72rpx;
@@ -305,7 +347,7 @@
 		border-radius: 4rpx;
 		font-size: 24rpx;
 		color: #FFFFFF;
-		line-height: 36rpx;
+		line-height: 38rpx;
 		padding: 0 10rpx;
 		margin-left: 20rpx;
 	}
@@ -315,7 +357,7 @@
 		border-radius: 4rpx;
 		font-size: 24rpx;
 		color: #2A2623;
-		line-height: 36rpx;
+		line-height: 38rpx;
 		padding: 0 10rpx;
 		margin-left: 20rpx;
 	}
@@ -353,7 +395,7 @@
 	.carData{
 		display: flex;
 		justify-content: space-between;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #666666;
 	/* 	padding-top: 18rpx; */
 		line-height: 33rpx;
@@ -361,7 +403,7 @@
 		padding-right: 20rpx;
 	}
 	.carnotes{
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #666666;
 		padding-top: 18rpx;
 		line-height: 33rpx;
@@ -376,7 +418,7 @@
 		border-radius: 10rpx;
 	}
 	.lineTop{
-		padding: 30rpx 22rpx;
+		padding: 30rpx 22rpx 0rpx 22rpx;
 	}
 	.lineTop1{
 		display: flex;justify-content: space-between;
@@ -386,7 +428,7 @@
 		display: flex;
 	}
 	.nsTxt{
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #3C3C3C;
 		line-height: 36rpx;
 	}
@@ -396,7 +438,7 @@
 		height: 36rpx;
 		background: #FFF1F1;
 		border-radius: 4rpx;
-		line-height: 36rpx;
+		line-height: 38rpx;
 		padding: 0 10rpx;
 		margin-left: 20rpx;
 	}
@@ -408,19 +450,19 @@
 	}
 	.lineTop2{
 		display: flex;justify-content: space-between;
-		/* padding-bottom: 30rpx; */
+	    padding-bottom: 20rpx; 
 	}
 	.lineBtn{
 		height: 52rpx;
 		border-radius: 28rpx;
 		border: 1rpx solid #DDDDDD;
-		line-height: 52rpx;
+		line-height: 54rpx;
 		padding: 0 20rpx;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #3C3C3C;
 	}
 	.chaoqi{
-		line-height: 56rpx;font-size: 24rpx;
+		line-height: 56rpx;font-size: 26rpx;
 color: #FF0000;
 	}
 	.lineCont{
@@ -429,7 +471,7 @@ color: #FF0000;
 	.lcLine{
 		padding: 24rpx 20rpx 0 20rpx;
 		border-top: 1px solid #EEEEEE;
-		padding-bottom: 20rpx;
+		/* padding-bottom: 20rpx; */
 	}
 	.lcLine .carData{
 		padding-left: 0;padding-right: 0;

pages/index/consumption.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<view style="margin-top: -26rpx;"></view>
 		<view class="topbox">
 			<view class="top">
 				<picker @change="bindPickerChange" :value="index" :range="array">
@@ -23,7 +24,7 @@
 						<view class="km" v-if="item.CurrentMileage">{{item.CurrentMileage}}km</view>
 					</view>
 					<view class="ltRgiht">
-						<span class="span1">¥{{item.ReceiptMoney}}</span>
+						<span class="span1">¥{{item.RecvedMoney}}</span>
 					</view>
 					
 				</view>
@@ -42,6 +43,7 @@
 				</view>
 				<view class="lineBottom" @click="seeData(item)">
 					<span>查看消费明细</span>
+					<image class="mxJt" src="../../static/img/big_rightArrow.png" mode=""></image>
 				</view>
 				
 				
@@ -51,64 +53,67 @@
 		<uni-popup ref="popup" type="bottom" >
 			<view class="popupBox">
 			  <view class="popupTitleBox">
+				  <view class="chaImg"></view>
 				  <view class="popupTitle">消费明细</view>
 				  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="gaunbi"></image>
 			  </view>
 			  <view class="popupCp">{{carData.PlateNumber}}</view>
 			  <view class="popupLcBox">
 				  <view class="popupLc">进店里程：<span style="color: #3C3C3C;" v-if="carData.CurrentMileage">{{carData.CurrentMileage}}km</span> </view>
-				  <view class="shishouamount">实收金额：<span style="color: #FF0000;">{{carData.ReceiptMoney}}</span> </view>
+				  <view class="shishouamount">实收金额：<span style="color: #FF0000;">{{carData.RecvedMoney}}</span> </view>
 			  </view>
-			  
-			  <view class="plineBox" v-if="lineData.billItemDetailList.length" >
-				  <view class="pline">
-					  <view class="tableTop">
-						  <view class="w50">项目信息</view>
-						  <view class="w25">工时</view>
-						  <view class="w25">金额</view>
-					  </view>
-					  <view class="tableLine"  v-for="(item,index) in lineData.billItemDetailList">
-						  <view class="w50">
-							  <view class="tableName">
-								  <view class="ka"  v-if="item.cardDetailID">卡</view>
-								  <view class="itemname">{{item.itemName}}</view>
-							  </view>
-							   <view class="remarks"v-if="item.comment">{{item.comment}}</view>
-						  </view>
-						  <view class="w25">
-							  <view class="tableNum">{{item.saleQty}}</view>
+			  <view class="ps">
+				  <view class="plineBox" v-if="lineData.billItemDetailList.length" >
+					  <view class="pline">
+						  <view class="tableTop">
+							  <view class="w50">项目信息</view>
+							  <view class="w25">工时</view>
+							  <view class="w25">金额</view>
 						  </view>
-						  <view class="w25">
-							  <view class="tableNum">{{item.salePrice}}</view>
+						  <view class="tableLine"  v-for="(item,index) in lineData.billItemDetailList">
+							  <view class="w50">
+								  <view class="tableName">
+									  <view class="ka"  v-if="item.cardDetailID">卡</view>
+									  <view class="ka" v-if="item.servicePackID">套餐</view>
+									  <view class="itemname">{{item.itemName}}</view>
+								  </view>
+								   <view class="remarks"v-if="item.comment">{{item.comment}}</view>
+							  </view>
+							  <view class="w25">
+								  <view class="tableNum">{{item.saleQty}}</view>
+							  </view>
+							  <view class="w25">
+								  <view class="tableNum">{{item.realMoney}}</view>
+							  </view>
 						  </view>
 					  </view>
 				  </view>
-			  </view>
-			  <view class="plineBox" v-if="lineData.billPartDetailList.length" >
-				  <view class="pline">
-					  <view class="tableTop">
-						  <view class="w50">商品信息</view>
-						  <view class="w25">数量</view>
-						  <view class="w25">金额</view>
-					  </view>
-					  <view class="tableLine"  v-for="(item,index) in lineData.billPartDetailList">
-						  <view class="w50">
-							  <view class="tableName">
-								  <view class="ka" v-if="item.cardDetailID">卡</view>
-								  <view class="itemname">{{item.goodsName}}</view>
+				  <view class="plineBox" v-if="lineData.billPartDetailList.length" >
+						  <view class="pline">
+							  <view class="tableTop">
+								  <view class="w50">商品信息</view>
+								  <view class="w25">数量</view>
+								  <view class="w25">金额</view>
+							  </view>
+							  <view class="tableLine"  v-for="(item,index) in lineData.billPartDetailList">
+								  <view class="w50">
+									  <view class="tableName">
+										  <view class="ka" v-if="item.cardDetailID">卡</view>
+										  <view class="ka" v-if="item.servicePackID">套餐</view>
+										  <view class="itemname">{{item.goodsName}}</view>
+									  </view>
+									   <view class="remarks"v-if="item.comment">{{item.comment}}</view>
+								  </view>
+								  <view class="w25">
+									  <view class="tableNum">{{item.saleQty}}</view>
+								  </view>
+								  <view class="w25">
+									  <view class="tableNum">{{item.realMoney}}</view>
+								  </view>
 							  </view>
-							   <view class="remarks"v-if="item.comment">{{item.comment}}</view>
-						  </view>
-						  <view class="w25">
-							  <view class="tableNum">{{item.saleQty}}</view>
-						  </view>
-						  <view class="w25">
-							  <view class="tableNum">{{item.salePrice}}</view>
 						  </view>
-					  </view>
 				  </view>
-			  </view>
-			  <view class="plineBox" v-if="lineData.billSurchargesList.length" >
+				  <view class="plineBox" v-if="lineData.billSurchargesList.length" >
 					  <view class="pline">
 						  <view class="tableTop">
 							  <view class="w75">附加费</view>
@@ -128,8 +133,11 @@
 							  </view>
 						  </view>
 					  </view>
+				  </view>
 			  </view>
 			  
+			
+			  
 			</view>
 			
 		</uni-popup>
@@ -172,6 +180,9 @@
 					
 			},
 			getList(){
+				uni.showLoading({
+				 	title: '加载中'
+				});
 				this.$http('enterprise/wechat/listIntegralInfoByCustomerId', {
 				   customerID:this.customerId,
 				   unionID:'EEADACCD-8A19-499D-8AD7-6975D2C93243',
@@ -179,6 +190,7 @@
 				   limit:50,
 				   plateNumber:this.plateNumber
 				}, 'GET').then(res => {
+					uni.hideLoading();
 				    this.list=res.data.Items
 				})
 			},
@@ -222,10 +234,12 @@
 
 .cBox{
 	padding: 0 24rpx;
+	padding-bottom: 40rpx;
 }
 .line{
 	padding: 30rpx 0rpx;background: #FFFFFF;
 border-radius: 10rpx;margin-top: 20rpx;
+padding-bottom: 20rpx;
 }
 .lineTop{
 	border-bottom: 1px solid #EEEEEE;
@@ -238,17 +252,18 @@ border-radius: 10rpx;margin-top: 20rpx;
 	display: flex;
 }
 .km{
-	height: 36rpx;
 	border-radius: 4rpx;
 	border: 1rpx solid #DDDDDD;
-	line-height: 36rpx;
-	padding: 0 10rpx;
+	height: 36rpx;
+	padding: 0rpx 10rpx;
 	margin-left: 20rpx;
+	line-height: 38rpx;
 }
 .cp{
 	line-height: 36rpx;
 	font-size: 30rpx;
 	color: #333333;
+	font-weight: 600;
 }
 .span1{
 	line-height: 36rpx;
@@ -257,7 +272,7 @@ border-radius: 10rpx;margin-top: 20rpx;
 	color: #FF0000;
 }
 .lineLine1{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #666666;
 	line-height: 33rpx;
 	padding-top: 16rpx;
@@ -265,7 +280,7 @@ border-radius: 10rpx;margin-top: 20rpx;
 	padding-right: 20rpx;
 }
 .line2{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #666666;
 	line-height: 33rpx;
 	padding-top: 16rpx;
@@ -279,11 +294,13 @@ border-radius: 10rpx;margin-top: 20rpx;
 	padding-bottom: 16rpx;
 }
 .lineBottom{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #3C3C3C;
 	line-height: 33rpx;
 	padding: 20rpx;
 	padding-bottom: 0;
+	display: flex;
+	justify-content: space-between;
 }
  .popupBox{
 		width: 750rpx;
@@ -303,6 +320,7 @@ border-radius: 10rpx;margin-top: 20rpx;
 		font-size: 30rpx;
 		color: #3C3C3C;
 		line-height: 42rpx;
+		font-weight: 600;
 	}
 	.chaImg{
 		width: 27rpx;height: 27rpx;margin-top: 9rpx;
@@ -334,12 +352,13 @@ border-radius: 10rpx;margin-top: 20rpx;
 		border-bottom:none;
 	}
 	.plineBox{
-		padding: 20rpx 24rpx 0 24rpx;
-		    background: #F4F5F7;
+		margin: 20rpx 24rpx 0 24rpx;
+		    background: #f9f9f9;
+			border-radius: 10rpx;
 	}
 	.pline{
 		margin-bottom: 20rpx;
-		background: #F4F5F7;
+		background: #f9f9f9;
 		border-radius: 10rpx;
 	}
 	.w50{
@@ -357,7 +376,7 @@ border-radius: 10rpx;margin-top: 20rpx;
 		
 	}
 	.ka{
-		width: 28rpx;
+		padding: 0 4rpx;
 		height: 28rpx;
 		background: #FF8113;
 		border-radius: 4rpx;
@@ -393,4 +412,11 @@ border-radius: 10rpx;margin-top: 20rpx;
 	.nodataBox{
 		text-align: center;
 	}
+	.mxJt{
+		width: 30rpx;height: 30rpx;
+	}
+	.ps{
+		height:calc(80vh - 250rpx) ;
+		overflow-y: auto;
+	}
 </style>

pages/index/coupon.vue

@@ -4,6 +4,7 @@
 			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
+		<view style="margin-top: -26rpx;"></view>
 		<view class="topbox" v-show="!nodataShow">
 			<view class="top">
 				<view class="topLine">
@@ -31,7 +32,7 @@
 						<view class="type" v-if="item.discountType==3">服务券</view>
 						<view class="name">{{item.ActName}}</view>
 					</view>
-					<view class="lprice">
+					<view class="lprice" v-if="item.discountType==1">
 						 <span class="price1">￥</span>
 						 <span class="price2">{{item.ActMoney}}</span>
 						 <span class="price3">{{item.WhereMoney}}</span>
@@ -59,6 +60,7 @@
 		<view class="tkBox" v-if="couShow" @click="couHide">
 			<view class="popupBox" @click.stop="">
 				<view class="popupTitleBox">
+				  <view  class="chaImg"></view>
 				  <view class="popupTitle">使用说明</view>
 				  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="couHide"></image>
 				</view>
@@ -105,9 +107,13 @@
 			   if(!this.customerId){
 			   	this.nodataShow=true
 			   }else{
+				   uni.showLoading({
+				    	title: '加载中'
+				   }); 
 				   this.$http('enterprise/wechat/listIntegralInfo', {
 				     id:this.customerId,
 				   }, 'GET').then(res => {
+					   uni.hideLoading();
 				       this.list=res.data
 				   	
 				   })
@@ -148,9 +154,9 @@
 	color: #2D2417;
 }
 .topTxt2{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #50402A;
-	padding-top: 8rpx;
+	padding-top: 10rpx;
 }
 .cBox{
 	padding: 0 24rpx;
@@ -165,12 +171,13 @@ border-radius: 10rpx;margin-top: 20rpx;
 .type{
 	font-size: 24rpx;
 	color: #2B2219;
-	height: 36rpx;
+	padding-top: 2rpx;
+	padding-bottom: 2rpx;
 	background: linear-gradient( 128deg, #FFE4C5 0%, #FDC692 100%);
 	border-radius: 4rpx;
 	width: 82rpx;
 	text-align: center;
-	line-height: 36rpx;
+	
 }
 .name{
 	line-height: 36rpx;padding-left: 10rpx;font-weight: 500;
@@ -204,7 +211,7 @@ color: #666666;
 	color: #FF8113;
 	line-height: 36rpx;
 	padding: 0 10rpx;
-	margin-top: 10rpx;
+	margin-top: 14rpx;
 }
 .time{
 	font-size: 22rpx;
@@ -215,6 +222,7 @@ color: #666666;
 	font-size: 22rpx;
 	color: #666666;
 	padding: 15rpx 24rpx;
+	padding-bottom: 0;
 }
 .nodataImg{
 	  width: 400rpx;
@@ -253,8 +261,15 @@ color: #666666;
 			font-size: 30rpx;
 			color: #3C3C3C;
 			line-height: 42rpx;
+			font-weight: 600;
 		}
 		.chaImg{
 			width: 27rpx;height: 27rpx;margin-top: 9rpx;
 		}
+.lprice{
+	padding-top: 10rpx;
+}
+.price3{
+	padding-left: 16rpx;
+}
 </style>

pages/index/custom.vue

@@ -34,7 +34,7 @@
 				<view class="lineTitle">客户等级</view>
 				<view class="lineRgiht">{{customerInfo.levelName}}</view>
 			</view>
-			<view class="contLine">
+			<view class="contLine" style="padding-bottom: 14rpx;">
 				<view class="lineTitle">客户标签</view>
 				<view class="titleBox">
 					<view class="title" v-for="(item,index) in customerInfo.lables">{{item.name}}</view>
@@ -72,7 +72,7 @@
 				</view>
 				<view class="creditLine">
 					<view class="creditTitle">超期账款：</view>
-					<view class="creditNum">{{customerInfo.remainderMoney}}</view>
+					<view class="creditNum">{{customerInfo.overdueMoney}}</view>
 				</view>
 				<view class="creditLine">
 					<view class="creditTitle">最近到期日：</view>
@@ -80,7 +80,7 @@
 				</view>
 				<view class="creditLine">
 					<view class="creditTitle">可用额度：</view>
-					<view class="creditNum">{{keyongMoney}}</view>
+					<view class="creditNum" v-if="keyongMoney">{{keyongMoney.toFixed(2)}}</view>
 				</view>
 				<view class="creditLine">
 					<view class="creditTitle">信用额度：</view>
@@ -90,7 +90,8 @@
 		</view>
 		<view class="box" >
 			<view class="boxTitle2" @click="moreBtn">更多
-			   <image class="boxIcon" src="../../static/img/icon_arrow_up.png" mode=""></image>
+			   <image class="boxIcon"  v-if="moreShow" src="../../static/img/icon_arrow_up.png" mode=""></image>
+			    <image class="boxIcon"  v-if="!moreShow" src="../../static/img/icon_arrow_down.png" mode=""></image>
 			</view>
 			<view v-if="moreShow">
 				<view class="contLine">
@@ -179,6 +180,9 @@
 				this.extCustomerInfo()
 			},
 			extCustomerInfo(){
+				uni.showLoading({
+				 	title: '加载中'
+				}); 
 				var that=this;
 				this.userId=uni.getStorageSync('userId')
 				this.$http('enterprise/wechat/extCustomerInfo', {
@@ -186,6 +190,7 @@
 				   extUserId:this.userId,
 				   token:this.token
 				}, 'GET').then(res => {
+					uni.hideLoading();
 				    this.customerInfo=res.data.customerInfo
 					this.customerId=this.customerInfo.id
 					uni.setStorage({
@@ -252,6 +257,7 @@
 	}
 	.lineTitle{
 		color: #666666;
+		width:200rpx ;
 	}
 	.lineRgiht{
 		color: #3C3C3C;
@@ -261,7 +267,7 @@
 	}
 	.titleBox{
 		display: flex;    flex-wrap: wrap;
-width: 500rpx;
+width: 500rpx;justify-content: flex-end;
 		
 	}
 	.title{
@@ -355,9 +361,10 @@ width: 500rpx;
 		border-bottom: 1px solid #EEEEEE;
 	}
 	.iphoneInput{
-		line-height: 98rpx;
+		line-height: 1;
 		height: 98rpx;
 		padding-left: 40rpx;
+		 -webkit-text-size-adjust: none;
 	}
 	.pBottom{
 		position: absolute;
@@ -372,10 +379,10 @@ width: 500rpx;
 	}
 	.pBcancel{
 		width: 331rpx;
-		height: 74rpx;
+		
 		border-radius: 37rpx;
 		border: 2rpx solid #DDDDDD;
-		line-height: 74rpx;
+	   padding: 16rpx 0;
 		text-align: center;
 		font-weight: 500;
 		font-size: 28rpx;
@@ -383,10 +390,10 @@ width: 500rpx;
 	}
 	.pBBtn{
 		width: 331rpx;
-		height: 74rpx;
+		padding: 16rpx 0;
 		background: #FF8113;
 		border-radius: 37rpx;
-		line-height: 74rpx;
+	
 		text-align: center;
 		font-weight: 500;
 		font-size: 28rpx;

pages/index/index.vue

@@ -1,29 +1,35 @@
 <template>
 	<view class="content" style="background: #F4F5F7;">
-		<view class="top">
-			<view>
-				<image class="logo" :src="userDetail.avatar"></image>
-			</view>
-			<view class="topRight">
-				<view class="wxName">{{userDetail.name}}</view>
-				<view class="titleBox">
-					<view class="title" v-for="(item,index) in customerInfo.lables">{{item.name}}</view>
+		<view class="indexTop">
+			<view class="top">
+				<view>
+					<image class="logo" :src="userDetail.avatar"></image>
 				</view>
-			</view>	
+				<view class="topRight">
+					<view class="wxName">{{userDetail.name}}</view>
+					<view class="titleBox">
+						<view class="title" v-for="(item,index) in customerInfo.lables">{{item.name}}</view>
+					</view>
+				</view>	
+			</view>
+			<view class="tabBox">
+				<view class="tabline" :class="{tabActive:tabIndex==1}" @click="tabFn(1)">客户信息</view>
+				<view class="tabline" :class="{tabActive:tabIndex==2}" @click="tabFn(2)">车辆信息</view>
+				<view class="tabline" :class="{tabActive:tabIndex==3}" @click="tabFn(3)">套餐余额</view>
+				<view class="tabline" :class="{tabActive:tabIndex==4}" @click="tabFn(4)">优惠券</view>
+				<view class="tabline" :class="{tabActive:tabIndex==5}" @click="tabFn(5)">消费历史</view>
+			</view>
 		</view>
-		<view class="tabBox">
-			<view class="tabline" :class="{tabActive:tabIndex==1}" @click="tabFn(1)">客户信息</view>
-			<view class="tabline" :class="{tabActive:tabIndex==2}" @click="tabFn(2)">车辆信息</view>
-			<view class="tabline" :class="{tabActive:tabIndex==3}" @click="tabFn(3)">套餐余额</view>
-			<view class="tabline" :class="{tabActive:tabIndex==4}" @click="tabFn(4)">优惠券</view>
-			<view class="tabline" :class="{tabActive:tabIndex==5}" @click="tabFn(5)">消费历史</view>
+		<view class="indexCont">
+			<custom ref="customView" :token="token" v-show="tabIndex==1"></custom>
+			<car ref="carView"  :token="token" v-show="tabIndex==2"></car>
+			<packageV ref="packageView" v-show="tabIndex==3"></packageV> 
+			<coupon ref="couponView" v-show="tabIndex==4"></coupon>
+			<consumption ref="consumptionView" v-show="tabIndex==5"></consumption>
 		</view>
 		
-		<custom ref="customView" :token="token" v-show="tabIndex==1"></custom>
-	    <car ref="carView"  :token="token" v-show="tabIndex==2"></car>
-	    <packageV ref="packageView" v-show="tabIndex==3"></packageV> 
-		<coupon ref="couponView" v-show="tabIndex==4"></coupon>
-		<consumption ref="consumptionView" v-show="tabIndex==5"></consumption>
+		
+		
 	  <!--  <view>{{code}}</view>
 		<view @click="copy(code)">复制code</view> -->
 		<!--<view style="color: red;">{{userId}}</view>
@@ -74,8 +80,8 @@
 			//this.token='26AF53EA2DC528681ABD7B3AC46072E96F0A964431A2453CF0F1DA1C28732A1EAF945459643F62A3A6FD87751E6880BB'
 			
 		   //this.userId='wmMGjbBgAALroygkoaVBN4-W2O1daIkg'
-			//this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
-			this.userId='wmMGjbBgAAeKTdCmEN0CLKPNwJ4ACTxw'
+			this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
+			 this.userId='wmMGjbBgAAeKTdCmEN0CLKPNwJ4ACTxw'
 			this.token='0A809B6077F4044EDECFC49762B59668E9508B2CA4C6C4791C8894B2B1A7338AAF945459643F62A3A6FD87751E6880BB'
 			 uni.setStorage({
 				key: 'token',
@@ -414,6 +420,31 @@
 			       }
 			     });
 		   }
+		},
+		onReachBottom() {
+			
+		},
+		onPullDownRefresh() {
+		
+			var num = this.tabIndex
+			if(num==1){
+					this.$refs.customView.getdata()
+			}
+			if(num==2){
+					this.$refs.carView.getdata()
+			}
+			if(num == 3){
+				this.$refs.packageView.getdata()
+			}
+			if(num==4){
+				  this.$refs.couponView.getdata()
+			}
+			if(num==5){
+				  this.$refs.consumptionView.getdata()
+			}
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		}
 	}
 </script>

pages/index/package.vue

@@ -11,12 +11,12 @@
 						 <view class="type">储值</view>
 						 <view class="lname">{{item.PacKName}}</view>
 					 </view>
-					 <view class="lBtn">使用条款</view>
+					<view class="lBtn" @click.stop="showuseComment(item)">使用条款</view> 
 				 </view>
 				 <view class="lprice">
 					 <span class="price1">￥</span>
 					 <span class="price2">4566</span>
-					 <span class="price3">( 充{{item.ChargeMoney}}送{{item.GiftMoney}} )</span>
+					 <span class="price3">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
 				 </view>
 				 <view class="lShop">
 					 <view class="lShopName">可用门店：{{item.ShopName}}</view>
@@ -29,7 +29,7 @@
 						 <view class="type">计次</view>
 						 <view class="lname">{{item.packName}}</view>
 					 </view>
-					 <view class="lBtn">使用条款</view>
+					 <view class="lBtn" @click.stop="showuseComment(item)">使用条款</view>
 				 </view>
 				 <!-- <view class="lprice">
 					 <span class="price1">￥</span>
@@ -64,6 +64,7 @@
 		
 		<view class="popupBox" v-if="type==2">
 		  <view class="popupTitleBox">
+			  <view class="chaImg"></view>
 			  <view class="popupTitle">计次详情</view>
 			  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="guanbi"></image>
 		  </view>
@@ -86,7 +87,18 @@
 		</view>
 	 	
 	 </uni-popup>
-	 
+	 <uni-popup ref="popup2" type="bottom" >
+		 <view class="popupBox" @click.stop="">
+		 	<view class="popupTitleBox">
+		 	  <view  class="chaImg"></view>
+		 	  <view class="popupTitle">使用条款</view>
+		 	  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="couHide2"></image>
+		 	</view>
+		 	<view>
+		 	<rich-text :nodes="txt"></rich-text>
+		 	</view>
+		 </view>
+	 </uni-popup>
 		
 	</view>
 </template>
@@ -101,12 +113,18 @@
 				listCar:'',
 				maps:'',
 				nodataShow:false,
+				txt:'',
+				
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
+		  showuseComment(item){
+			  this.txt=item.useComment
+			    this.$refs.popup2.open('bottom')
+		  },
 		  getdata(){
 			  var that=this;
 			  this.customerId=uni.getStorageSync('customerId')
@@ -114,9 +132,13 @@
 			  if(!this.customerId){
 			  	this.nodataShow=true
 			  }else{
+				  uni.showLoading({
+				   	title: '加载中'
+				  });
 				  this.$http('enterprise/wechat/cardMoneyInfo', {
 				    id:this.customerId,
 				  }, 'GET').then(res => {
+					  uni.hideLoading();
 				     this.czList=res.data
 				  	
 				  })
@@ -142,6 +164,9 @@
 		  },
 		  guanbi(){
 			    this.$refs.popup.close()
+		  },
+		  couHide2(){
+			   this.$refs.popup2.close()
 		  }
 		}
 	}
@@ -156,33 +181,35 @@
 }
 .line{
 	background: #fff;
-	padding: 30rpx 20rpx;
+	padding: 24rpx 20rpx;
 	border-radius: 10rpx;
 	margin-top: 20rpx;
 }
 .lineNameBox{
 	display: flex;justify-content: space-between;
-	padding-bottom: 10rpx;
+	padding-bottom: 6rpx;
 }
 .lnameLeft{
 	display: flex;
 }
 .type{
-	idth: 64rpx;
+	width: 64rpx;
 	height: 36rpx;
 	background: #FF8113;
 	border-radius: 5rpx;
 	font-size: 24rpx;
 	color: #FFFFFF;
 	text-align: center;
-	line-height: 36rpx;
+	line-height: 38rpx;
 	margin-top: 8rpx;
 }
 .lname{
-	font-size: 28rpx;
+	font-size: 30rpx;
 	color: #333333;
 	line-height: 52rpx;
 	padding-left: 12rpx;
+	width: 440rpx;
+	font-weight: 600;
 }
 .lBtn{
 	width: 136rpx;
@@ -198,10 +225,12 @@
 .price1{
 	font-size: 24rpx;
 	color: #FF3B30;
+	font-family: 600;
 }
 .price2{
 	font-size: 36rpx;
 	color: #FF3B30;
+	font-weight: 600;
 }
 .price3{
 	font-size: 24rpx;
@@ -221,7 +250,9 @@
 		height: 60vh;
 		background: #FFFFFF;
 		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		position: relative;
+		position: fixed;
+		left: 0;
+		bottom: 0;
 	}
 	.popupTitleBox{
 		display: flex;
@@ -232,6 +263,7 @@
 		font-size: 30rpx;
 		color: #3C3C3C;
 		line-height: 42rpx;
+		font-weight: 600;
 	}
 	.chaImg{
 		width: 27rpx;height: 27rpx;margin-top: 9rpx;
@@ -268,19 +300,19 @@
 		border-radius: 5rpx;
 		border: 1px solid #F19D01;
 		text-align: center;
-		line-height: 32rpx;
+		line-height: 34rpx;
 		font-size: 24rpx;
 		color: #F19D01;
 	}
 	.jcNameTxt{
-		font-size: 26rpx;
+		font-size: 30rpx;
 		color: #333333;
 		padding-left: 10rpx;
 		line-height: 36rpx;
 	}
 	.jcTitme{
 		display: flex;justify-content: space-between;
-		padding-top: 20rpx;
+		padding-top: 16rpx;
 	}
 	.jcYxq{
 		font-size: 24rpx;