bug修改

pages/index/car.vue

@@ -12,7 +12,7 @@
 						<view class="carModelCont">
 							<view class="carMcTop">
 								<view class="plateNumber">{{item.PlateNumber}}</view>
-								<view class="carTime">9年4个月</view>
+								<view class="carTime" v-if="item.carDetailInfo.carAge">{{item.carDetailInfo.carAge}}</view>
 								<view class="carA">{{item.carType}}</view>
 							</view>
 							<view class="carMcTxt">{{item.CarModel}}</view>
@@ -27,7 +27,7 @@
 					</view>
 					<view class="carData">
 						<view class="carDataLine">最新里程：{{item.Milage}}km</view>
-						<view class="carDataLine">累计消费：2930.00</view>
+						<view class="carDataLine">累计消费：{{item.checkoutMoneySum}}</view>
 						
 					</view>
 					<view class="carnotes">车辆备注：{{item.carDetailInfo.Comment}}</view>
@@ -332,7 +332,8 @@
 
 	}
 	.carTitleBox{
-		display: flex;padding-top: 12rpx;
+		display: flex;padding-top: 12rpx;flex-wrap: wrap;
+		
 	}
 	.carTitle{
 		height: 36rpx;
@@ -343,6 +344,7 @@
 		color: #FF8113;
 		padding: 0 8rpx;
 		margin-right: 10rpx;
+		margin-bottom: 10rpx;
 	}
 	.carModel{
 		border-bottom: 1px solid #EFDFD6;

pages/index/consumption.vue

@@ -40,7 +40,7 @@
 					</view>
 					<view class="lineLine1">备注：{{item.Comment}}</view>
 				</view>
-				<view class="lineBottom" @click="seeData">
+				<view class="lineBottom" @click="seeData(item)">
 					<span>查看消费明细</span>
 				</view>
 				
@@ -52,64 +52,83 @@
 			<view class="popupBox">
 			  <view class="popupTitleBox">
 				  <view class="popupTitle">消费明细</view>
-				  <image src="../../static/img/cha.png" mode="" class="chaImg"></image>
+				  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="gaunbi"></image>
 			  </view>
-			  <view class="popupCp">鲁A9JK82</view>
+			  <view class="popupCp">{{carData.PlateNumber}}</view>
 			  <view class="popupLcBox">
-				  <view class="popupLc">进店里程：<span style="color: #3C3C3C;">12233km</span> </view>
-				  <view class="shishouamount">实收金额：<span style="color: #FF0000;">2030.43</span> </view>
+				  <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>
 			  
-			  <view class="plineBox">
+			  <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">
+					  <view class="tableLine"  v-for="(item,index) in lineData.billItemDetailList">
 						  <view class="w50">
 							  <view class="tableName">
-								  <view class="ka">卡</view>
-								  <view class="itemname">项目名称</view>
+								  <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">12.00</view>
+							  <view class="tableNum">{{item.saleQty}}</view>
 						  </view>
 						  <view class="w25">
-							  <view class="tableNum">2312.22</view>
+							  <view class="tableNum">{{item.salePrice}}</view>
 						  </view>
 					  </view>
-					  <view class="tableLine">
-							  <view class="w50">
-								  <view class="tableName">
-									  <view class="itemname">奖金元</view>
-								  </view>
-							  </view>
-							  <view class="w25">
-								  <view class="tableNum">12.00</view>
-							  </view>
-							  <view class="w25">
-								  <view class="tableNum">2312.22</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">
+					  <view class="tableLine"  v-for="(item,index) in lineData.billPartDetailList">
 						  <view class="w50">
 							  <view class="tableName">
-								  <view class="itemname">奖金元</view>
+								  <view class="ka" v-if="item.cardDetailID">卡</view>
+								  <view class="itemname">{{item.goodsName}}</view>
 							  </view>
-							  <view class="remarks">商品备注有显示，没有不显示行</view>
+							   <view class="remarks"v-if="item.comment">{{item.comment}}</view>
 						  </view>
 						  <view class="w25">
-							  <view class="tableNum">12.00</view>
+							  <view class="tableNum">{{item.saleQty}}</view>
 						  </view>
 						  <view class="w25">
-							  <view class="tableNum">2312.22</view>
+							  <view class="tableNum">{{item.salePrice}}</view>
 						  </view>
 					  </view>
 				  </view>
 			  </view>
+			  <view class="plineBox" v-if="lineData.billSurchargesList.length" >
+					  <view class="pline">
+						  <view class="tableTop">
+							  <view class="w75">附加费</view>
+							
+							  <view class="w25">金额</view>
+						  </view>
+						  <view class="tableLine"  v-for="(item,index) in lineData.billSurchargesList">
+							  <view class="w75">
+								  <view class="tableName">
+									  <view class="itemname">{{item.surchargesName}}</view>
+								  </view>
+							
+							  </view>
+							  
+							  <view class="w25">
+								  <view class="tableNum">{{item.surchargesMoeny}}</view>
+							  </view>
+						  </view>
+					  </view>
+			  </view>
 			  
 			</view>
 			
@@ -123,10 +142,17 @@
 			return {
 				 customerId:'',
 				 list:[],
-				 array:'',
+				 array:[],
 				 nodataShow:false,
 				 index:0,
 				 plateNumber:'',
+				 lineId:'',
+				 lineData:{
+					 billItemDetailList:[],
+					 billPartDetailList:[],
+					 billSurchargesList:[]
+				 },
+				 carData:'',
 			}
 		},
 		onLoad() {
@@ -165,8 +191,21 @@
 					}
 					this.getList()
 			},
-           seeData(){
+           seeData(item){
+			    this.lineId=item.ID;
+				this.carData=item
+				this.maintenanceOrderDetail()
 			    this.$refs.popup.open('bottom')
+		   },
+		   maintenanceOrderDetail(){
+			   this.$http('enterprise/wechat/maintenanceOrderDetail', {
+			     id:this.lineId
+			   }, 'GET').then(res => {
+			      this.lineData=res.data  
+			   })
+		   },
+		   gaunbi(){
+			   this.$refs.popup.close()
 		   }
 		}
 	}
@@ -251,7 +290,9 @@ border-radius: 10rpx;margin-top: 20rpx;
 		height: 80vh;
 		background: #FFFFFF;
 		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		position: relative;
+		position: fixed;
+		    left: 0;
+		    bottom: 0;
 	}
 	.popupTitleBox{
 		display: flex;
@@ -293,7 +334,8 @@ border-radius: 10rpx;margin-top: 20rpx;
 		border-bottom:none;
 	}
 	.plineBox{
-		padding: 24rpx;
+		padding: 20rpx 24rpx 0 24rpx;
+		    background: #F4F5F7;
 	}
 	.pline{
 		margin-bottom: 20rpx;
@@ -307,6 +349,9 @@ border-radius: 10rpx;margin-top: 20rpx;
 		width: 25%;
 		text-align: right;
 	}
+	.w75{
+		width: 75%;
+	}
 	.tableName{
 		display: flex;
 		

pages/index/coupon.vue

@@ -37,7 +37,7 @@
 						 <span class="price3">{{item.WhereMoney}}</span>
 					</view>
 					<view style="display: flex;">
-							<view class="chepai" v-if="item.applyCarPlateNumber">限{{tem.applyCarPlateNumber}}使用</view>
+							<view class="chepai" v-if="item.applyCarPlateNumber">限{{item.applyCarPlateNumber}}使用</view>
 							<view class="chepai" v-else>不限车牌</view>
 					</view>
 				
@@ -45,15 +45,29 @@
 					<view class="time" v-else>有效期：领取后{{item.EndOffsetDays}}天有效</view>
 				</view>
 				<view class="lineBottom">
-					{{item.overlyType == 0 ? '[不可叠加]' : '[可叠加]'}} 
+					 {{item.overlyType == 0 ? '[不可叠加]' : '[可叠加]'}} 
 					 {{item.shopLimit == 0 ? '[不限门店]' : '[限门店]'}}
-					 [使用说明]
+					 <span v-if="item.CouContent" @click="couFn(item.CouContent)"> [使用说明]</span>
+					<!-- <span v-else>[使用说明]</span> -->
+					
 				</view>
 				
 				
 			</view>
 		</view>
 	 
+		<view class="tkBox" v-if="couShow" @click="couHide">
+			<view class="popupBox" @click.stop="">
+				<view class="popupTitleBox">
+				  <view class="popupTitle">使用说明</view>
+				  <image src="../../static/img/cha.png" mode="" class="chaImg" @click="couHide"></image>
+				</view>
+				<view>
+				<rich-text :nodes="txt"></rich-text>
+				</view>
+			</view>
+			
+		</view>
 		
 	</view>
 </template>
@@ -67,12 +81,22 @@
 				 integral:'',
 				 levelName:'',
 				 nodataShow:false,
+				 couShow:false,
+				 txt:'',
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
+		  couFn(txt){
+			this.txt=txt;
+			console.log(this.txt)
+			this.couShow=true;
+		  },
+		  couHide(){
+			  this.couShow=false;
+		  },
            getdata(){
 			   var that=this;
 			   this.customerId=uni.getStorageSync('customerId')
@@ -204,4 +228,33 @@ color: #666666;
 	.nodataBox{
 		text-align: center;
 	}
+	.tkBox{
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: rgba(0,0,0,0.5);
+	}
+	.popupBox{
+			width: 750rpx;
+			height: 60vh;
+			background: #FFFFFF;
+			border-radius: 32rpx 32rpx 0rpx 0rpx;
+			position: absolute;
+			bottom: 0;
+		}
+		.popupTitleBox{
+			display: flex;
+			justify-content: space-between;
+			padding: 30rpx;
+		}
+		.popupTitle{
+			font-size: 30rpx;
+			color: #3C3C3C;
+			line-height: 42rpx;
+		}
+		.chaImg{
+			width: 27rpx;height: 27rpx;margin-top: 9rpx;
+		}
 </style>

pages/index/custom.vue

@@ -11,9 +11,12 @@
 		<view class="contLineBox" >
 			<view class="contLine" v-if="customerInfo.mobilePhone">
 				<view class="lineTitle" >手机号</view>
-				<view class="lineRgiht">{{customerInfo.mobilePhone}}</view>
+				<view class="lineRgiht lineRgihtSjh" @click="editIphone">
+					<span>{{customerInfo.mobilePhone}}</span> 
+				    <image class="jiantou" src="../../static/img/big_rightArrow.png" mode=""></image>
+				</view>
 			</view>
-			<view class="contLine" v-if="customerInfo.mobilePhone">
+			<view class="contLine" v-if="!customerInfo.mobilePhone">
 				<view class="lineTitle">手机号</view>
 				<view class="lineRgiht2" @click="editIphone">请输入手机号，以获取更多信息
 				
@@ -40,8 +43,8 @@
 			</view>
 			<view class="contLine">
 				<view class="lineTitle">客户类型</view>
-				<view class="lineRgiht" v-if="customerInfo.CusromerType==1">个人</view>
-				<view class="lineRgiht" v-if="customerInfo.CusromerType==2">单位</view>
+				<view class="lineRgiht" v-if="customerInfo.cusromerType==1">个人</view>
+				<view class="lineRgiht" v-if="customerInfo.cusromerType==2">单位</view>
 			</view>
 			<view class="contLine" v-if="customerInfo.cusromerType==2">
 				<view class="lineTitle">单位名称</view>
@@ -86,41 +89,47 @@
 			</view>
 		</view>
 		<view class="box" >
-			<view class="boxTitle2">信用额度
+			<view class="boxTitle2" @click="moreBtn">更多
 			   <image class="boxIcon" src="../../static/img/icon_arrow_up.png" mode=""></image>
 			</view>
-			<view class="contLine">
-				<view class="lineTitle">证件类型</view>
-				<view class="lineRgiht">{{customerInfo.idType}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">证件号码</view>
-				<view class="lineRgiht">{{customerInfo.idCode}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">所在地区</view>
-				<view class="lineRgiht">{{customerInfo.provinceName}}{{customerInfo.cityName}}{{customerInfo.areaName}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">详细地址</view>
-				<view class="lineRgiht">{{customerInfo.address}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">推广员工</view>
-				<view class="lineRgiht">{{customerInfo.proUserName}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">推广客户</view>
-				<view class="lineRgiht">{{customerInfo.proCustomerName}}</view>
-			</view>
-			<view class="contLine"  v-if="customerInfo">
-				<view class="lineTitle">生日</view>
-				<view class="lineRgiht" v-if="customerInfo.birthday">{{customerInfo.birthday.slice(0,10)}}</view>
-			</view>
-			<view class="contLine">
-				<view class="lineTitle">客户备注</view>
-				<view class="lineRgiht">{{customerInfo.comment}}</view>
+			<view v-if="moreShow">
+				<view class="contLine">
+					<view class="lineTitle">证件类型</view>
+					<view class="lineRgiht">{{customerInfo.idType}}</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">证件号码</view>
+					<view class="lineRgiht">{{customerInfo.idCode}}</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">所在地区</view>
+					<view class="lineRgiht">{{customerInfo.provinceName}}{{customerInfo.cityName}}{{customerInfo.areaName}}</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">详细地址</view>
+					<view class="lineRgiht">{{customerInfo.address}}</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">推广员工</view>
+					<view class="lineRgiht">{{customerInfo.proUserName}}</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">推广客户</view>
+					<view class="lineRgiht">{{customerInfo.proCustomerName}}</view>
+				</view>
+				<view class="contLine"  >
+					<view class="lineTitle">生日</view>
+					<view class="lineRgiht" v-if="customerInfo">
+						<span v-if="customerInfo.birthday">{{customerInfo.birthday.slice(0,10)}}</span>
+					
+					</view>
+				</view>
+				<view class="contLine">
+					<view class="lineTitle">客户备注</view>
+					<view class="lineRgiht">{{customerInfo.comment}}</view>
+				</view>
 			</view>
+			
 		</view>
 
 		<uni-popup ref="popup" type="bottom" >
@@ -155,6 +164,7 @@
 				customerId:'',
 				unionID:'',
 				keyongMoney:'',
+				moreShow:false,
 			}
 		},
 		onLoad() {
@@ -162,6 +172,9 @@
 		},
 		
 		methods: {
+			moreBtn(){
+				this.moreShow=!this.moreShow
+			},
 			getdata(){
 				this.extCustomerInfo()
 			},
@@ -311,7 +324,9 @@ width: 500rpx;
 		height: 809rpx;
 		background: #FFFFFF;
 		border-radius: 32rpx 32rpx 0rpx 0rpx;
-		position: relative;
+		position: fixed;
+		    left: 0;
+		    bottom: 0;
 	}
 	.popupTitleBox{
 		display: flex;
@@ -377,4 +392,11 @@ width: 500rpx;
 		font-size: 28rpx;
 		color: #FEFFFE;
 	}
+	.jiantou{
+		width: 30rpx;height: 30rpx;
+		margin-top: 6rpx;
+	}
+	.lineRgihtSjh{
+		display: flex;
+	}
 </style>

pages/index/index.vue

@@ -73,8 +73,10 @@
 			//this.userId='wmMGjbBgAA0JAbGD5Vu8BzEuYgZhvhOA'
 			//this.token='26AF53EA2DC528681ABD7B3AC46072E96F0A964431A2453CF0F1DA1C28732A1EAF945459643F62A3A6FD87751E6880BB'
 			
-		   /* this.userId='wmMGjbBgAALroygkoaVBN4-W2O1daIkg'
-			this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
+		   //this.userId='wmMGjbBgAALroygkoaVBN4-W2O1daIkg'
+			//this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
+			this.userId='wmMGjbBgAAeKTdCmEN0CLKPNwJ4ACTxw'
+			this.token='0A809B6077F4044EDECFC49762B59668E9508B2CA4C6C4791C8894B2B1A7338AAF945459643F62A3A6FD87751E6880BB'
 			 uni.setStorage({
 				key: 'token',
 				data: that.token,
@@ -89,7 +91,7 @@
 				 success: function () {	
 					
 				 }
-			}); */
+			}); 
 			/* this.code='aSBU0ums_4Z3ofjrfgSlYppwI9Cku5qtIg45ECkJTYY'
 			
 			 
@@ -104,7 +106,7 @@
 				 //this.init()
 			}
 			 */
-		   	this.authUserInfo()
+		   //	this.authUserInfo()
 			//this.extUserDetail()
 		},
 		methods: {
@@ -146,7 +148,7 @@
 						data: that.customerInfo.levelName,
 						 success: function () {	 }
 					});
-					var map=res.data.data.map
+					var map=res.data.map
 					var arr=[]
 					if(map.length){
 						map.forEach(item=>{

pages/index/package.vue

@@ -5,7 +5,7 @@
 			<view class="noTxt">暂无数据</view>
 		</view>
 	<view class="box" v-show="!nodataShow">
-		<view class="line" @click="detailFn(1,item.listCar)" v-for="(item,index) in czList">
+		<view class="line" v-for="(item,index) in czList">
 				 <view class="lineNameBox">
 					 <view class="lnameLeft">
 						 <view class="type">储值</view>
@@ -20,7 +20,7 @@
 				 </view>
 				 <view class="lShop">
 					 <view class="lShopName">可用门店：{{item.ShopName}}</view>
-					 <image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image>
+					<!-- <image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image> -->
 				 </view>
 		</view>
 		<view class="line" @click="detailFn(2,item.maps)" v-for="(item,index) in jcList">