bug修改

pages/subPack/depositList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'我的订单'" :cj="4"></homenav>
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'寄存订单'" :cj="4"></homenav>
 		<view class="cont">
 			<view class="line" @click="goDetail(item)" v-for="(item,index) in items">
 				<view class="lineLeft">

pages/subPack/rescueOrder.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'我的订单'" :cj="4"></homenav>
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'救援订单'" :cj="4"></homenav>
 		<view class="tab">
 			<view class="tabLine" :class="{tabActive:tabIndex==-1}" @click="tabClick(-1)">全部</view>
 			<view class="tabLine" :class="{tabActive:tabIndex==0}" @click="tabClick(0)">待确认</view>

pages/user/historyDetail.vue

@@ -125,7 +125,7 @@
 				<view class="detailedLineBox">
 					<view class="detailedLine" v-for="(item,index) in orderData.listItems">
 
-						<view class="detailedName"><span :class="{kaColor:item.CardDetailID}">卡</span>{{item.ItemName}}
+						<view class="detailedName"><span v-if="item.CardDetailID" class="kaColor">卡</span>{{item.ItemName}}
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listItems.length-1}">
 							<view class="comment" v-if="ItemComment">{{item.Comment}}</view>
@@ -151,8 +151,8 @@
 
 
 						<view class="goodTop">
-							<view class="detailedName"><span
-									:class="{kaColor:item.CardDetailID}">卡</span>{{item.GoodsName}}</view>
+							<view class="detailedName"><span v-if="item.CardDetailID"
+									class="kaColor">卡</span>{{item.GoodsName}}</view>
 							<view class="qty">x{{item.SaleQty}}</view>
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listParts.length-1}">

pages/user/user.vue

@@ -10,50 +10,56 @@
 				<view class="mes">
 					<view class="nick">
 						<view class="nickName" v-if="nickName">{{nickName}}</view>
-						<view class="grade" @click="gonavigateTo('../index/vipCard')" v-if="numList.levelName&&showSetting.isShowLevel">{{numList.levelName}} ></view>
-					    <view class="cardNameBOx" v-if="numList.f2ccard.cardName">
+						<!-- <view class="grade" @click="gonavigateTo('../index/vipCard')" v-if="numList.levelName&&showSetting.isShowLevel">{{numList.levelName}} ></view>-->
+					   <view class="cardNameBOx" v-if="numList.levelName&&showSetting.isShowLevel" @click="gonavigateTo('../subPack/vipCard')"> 
+						  <image class="cardNameIcon" src="http://dmsphoto.66km.com.cn/thFiles/E3F78C8A-CF4F-40DD-B050-689CFCEA2F4C.png" mode=""></image>
+						   <view class="cardNameTb">{{numList.levelName}}</view>
+						   <image src="../../static/timg/icon_arrow.png" mode="" class="cardNameIcon2"></image>
+					   </view>
+						<view class="cardNameBOx" v-if="numList.f2ccard.cardName">
 							<image class="cardNameIcon" src="http://dmsphoto.66km.com.cn/thFiles/E3F78C8A-CF4F-40DD-B050-689CFCEA2F4C.png" mode=""></image>
 						    <view class="cardNameTb">{{numList.f2ccard.cardName}}</view>
-							<image src="../../static/timg/icon_arrow.png" mode="" class="cardNameIcon2"></image>
 						</view>
 					</view>
 					<view class="phone">{{phone}}  <span @click="seeQr">{{numList.customerInfo.wxMiniV2OpenID?' / 已绑定微信>':' / 未绑定微信>'}}</span> </view>
 				</view>
 			</view>
 
-			<view class="headerBox">
-				<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
-					<view class="numStr">{{numList.count?numList.count:0}}</view>
-					<view class="nameStr">优惠券</view>
-				</view>
-				<view class="quan" v-if="showSetting.isShowIntergral" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
-					<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
-					<view class="nameStr">积分</view>
-				</view>
-				<view class="quan" v-if="showSetting.isShowCard" @click="gonavigateTo('../index/vipCard')">
-					<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
-					<view class="nameStr">会员卡</view>
-				</view>
+			
 
+		</view>
+		<!-- <view v-if="numList.remindType==0" class="marginTop2"></view>v-if="numList.remindType!=0" -->
+		<view class="marginTop" ></view>
+		<view class="headerBox">
+			<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
+				<view class="numStr">{{numList.count?numList.count:0}}</view>
+				<view class="nameStr">优惠券</view>
 			</view>
-			<view class="remindBox" v-if="numList.remindType!=0">
-			  <view class="remindLeft" style="display: flex;">
-				  <image style="width: 24rpx;height: 24rpx;margin-top: 2rpx;" src="http://dmsphoto.66km.com.cn/thFiles/BA87B937-90F3-420C-A21C-A5B7BE7E8B07.png" mode=""></image>
-				  <span style="padding-left: 10rpx;">您有</span>
-				  <span style="color: #FFFD00;font-weight: 500;">{{numList.remindIntegral}}</span>
-				  <span v-if="numList.remindType==1">积分将于本月过期</span>
-				  <span v-if="numList.remindType==2">积分将于30天内过期</span>
-			  </view>
-			  <view class="useremind" @click="useremind">去使用></view>
+			<view class="quan" v-if="showSetting.isShowIntergral" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
+				<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
+				<view class="nameStr">积分</view>
 			</view>
-
+			<view class="quan" v-if="showSetting.isShowCard" @click="gonavigateTo('../index/vipCard')">
+				<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
+				<view class="nameStr">会员卡</view>
+			</view>
+		
+		</view>
+		<view class="remindBox" v-if="numList.remindType!=0">
+		  <view class="remindLeft" style="display: flex;">
+			  <image style="width: 24rpx;height: 24rpx;margin-top: 2rpx;" src="http://dmsphoto.66km.com.cn/thFiles/BA87B937-90F3-420C-A21C-A5B7BE7E8B07.png" mode=""></image>
+			  <span style="padding-left: 10rpx;">您有</span>
+			  <span style="color: #FFFD00;font-weight: 500;">{{numList.remindIntegral}}</span>
+			  <span v-if="numList.remindType==1">积分将于本月过期</span>
+			  <span v-if="numList.remindType==2">积分将于30天内过期</span>
+		  </view>
+		  <view class="useremind" @click="useremind">去使用></view>
 		</view>
-		<view v-if="numList.remindType==0" class="marginTop2"></view>
-		<view class="marginTop" v-if="numList.remindType!=0"></view>
+		
         <!-- 卡制度-->
 		<view v-if="showSetting.isShowCardSystem">
 				<view >
-				<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
+				<swiper class="swiper2"  :autoplay="false" :interval="interval"
 								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				
 					<swiper-item v-for="(item,index) in f2csystemlist">
@@ -70,7 +76,7 @@
 								  <view class="cardtimeLeft">高于该等级</view>
 							  </view>
 							  <view class="cardtimeBox" v-if="item.growthState==3">
-							  	 <view class="cardtimeLeft">还需{{item.addGrowth}}成长值</view>
+							  	 <view class="cardtimeLeft">还需{{item.addGrowth}}成长值可升级</view>
 							  </view>
 						  </view>
 						  <view class="cardCont">
@@ -283,7 +289,7 @@
 					<image src="../../static/timg/icon_qingchu.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">{{showSetting.telTitle}}</view>
 				</view>
-				<view class="rowRight" style="color: #1677FF;" @click="makePhoneCall(showSetting.tel)">{{showSetting.tel}}</view>
+				<view class="rowRight" style="color:#666666;" @click="makePhoneCall(showSetting.tel)">{{showSetting.tel}}</view>
 			</view>
 			<view class="rowBox" v-if="showSetting.isShowMember" @click="gomember(showSetting.memberTitle)">
 				<view class="leftView">
@@ -750,24 +756,25 @@ padding-right: 10rpx;
 		color: #FFFFFF;
 		line-height: 30rpx;
 		border-radius: 8rpx;
+		margin-bottom: 20rpx;
 }
 .useremind{
 	font-weight: 500;
 	color: #FFFD00;
 }
 .swiper2{
-		min-height: 550rpx;
+		min-height: 510rpx;
 	/* 	margin-top: -100rpx; */
 }
 .marginTop{
-	margin-top: -90rpx;
+	margin-top: -270rpx;
 }
 .marginTop2{
 	margin-top: -120rpx;
 }
 .cardBox{
 	width: 702rpx;
-	min-height: 550rpx;
+	min-height: 510rpx;
 	background: #FFFFFF;
 	border-radius: 22rpx;
 	margin-left:24rpx ;
@@ -794,10 +801,18 @@ padding-right: 10rpx;
 .cardlineTitle{
 	color: #3C3C3C;font-size: 24rpx;
 	line-height: 33rpx;padding-top: 10rpx;
+	overflow:hidden;
+	  white-space: nowrap;
+	  text-overflow: ellipsis;
+	  -o-text-overflow:ellipsis;
 }
 .cardlineTitle2{
 	color: #999999;font-size: 24rpx;
 	line-height: 33rpx;padding-top: 10rpx;
+	overflow:hidden;
+	  white-space: nowrap;
+	  text-overflow: ellipsis;
+	  -o-text-overflow:ellipsis;
 }
 .cardLine{
 	width: 25%;
@@ -1258,6 +1273,7 @@ padding-right: 10rpx;
 		position: fixed;
 		top: 0;
 		left: 0;
+		z-index: 11;
 	}
 
 	.authorizCont {