企微

pages/index/car.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		
-		<view  class="nodataBox" v-show="nodataShow">
+		<view  class="nodataBox" v-show="nodataShow||carList.length==0">
 			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
@@ -24,13 +24,15 @@
 								
 							</view>
 						</view>
-						<view>
+						<view v-if="item.carDetailInfo.NextAuditTime&&item.carDetailInfo.InsuranceExpireDate">
 							<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">
-						<view class="carDataLine">最新里程：{{item.Milage}}km</view>
+						<view class="carDataLine" > 最新里程：
+						  <span v-if="item.Milage">{{item.Milage}}km</span>
+						</view>
 						<view class="carDataLine">累计消费：{{item.checkoutMoneySum}}</view>
 						
 					</view>
@@ -44,9 +46,12 @@
 						<view class="lineTop1">
 							<view class="lineTopNs">
 								<view class="nsTxt">年审日期</view>
-								<view class="nsStatus" v-if="!isDateGreater(item.carDetailInfo.NextAuditTime)">
-								  <span v-if="daysUntilDate(item.carDetailInfo.NextAuditTime)>30">已过期</span>
-								  <span v-else>即将过期</span>
+								<view  v-if="isDateGreater(item.carDetailInfo.NextAuditTime)">
+								  <span  v-if="daysUntilDate(item.carDetailInfo.NextAuditTime)>30"></span>
+								  <view class="nsStatus" v-else>即将过期</view>
+								</view>
+								<view class="nsStatus" v-else>
+									<span>已过期</span>
 								</view>
 							</view>
 							<view class="lineTimeBox">
@@ -56,11 +61,19 @@
 							</view>
 						</view>
 						<view class="lineTop2" v-show="item.show2">
+							<view class="chaoqi"  v-if="isDateGreater(item.carDetailInfo.NextAuditTime)">
+								<span >距离天数：</span>
+								{{daysUntilDate(item.carDetailInfo.NextAuditTime)}}天
+							</view>
+							
 							<view class="chaoqi">
 								<span v-if="!isDateGreater(item.carDetailInfo.NextAuditTime)">超期天数：{{daysUntilDate(item.carDetailInfo.NextAuditTime)}}天</span>
 								
 								</view>
-							<view class="lineBtn">发送提醒</view>
+								<view>
+									<view class="lineBtn" @click.stop="sendChat(item,1)">发送提醒</view>
+								</view>
+							
 						</view>
 					</view>
 					<view class="lineCont" v-show="item.carDetailInfo.InsuranceExpireDate" @click.stop="carDfn2(item)">
@@ -68,9 +81,9 @@
 							<view class="lineTop1">
 								<view class="lineTopNs">
 									<view class="nsTxt">保险提醒</view>
-									<view class="nsStatus"  v-if="isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
+									<view   v-if="isDateGreater(item.carDetailInfo.InsuranceExpireDate)">
 										<span v-if="daysUntilDate(item.carDetailInfo.InsuranceExpireDate)>30"></span>
-										<span v-else>即将过期</span>
+										<view class="nsStatus" v-else>即将过期</view>
 									</view>
 									<view class="nsStatus" v-else>
 										<span>已过期</span>
@@ -97,7 +110,9 @@
 										<span >超期天数：</span>
 										{{daysUntilDate(item.carDetailInfo.InsuranceExpireDate)}}天
 									</view>
-									<view class="lineBtn">发送提醒</view>
+									<view>
+										<view class="lineBtn" @click.stop="sendChat(item,2)">发送提醒</view>
+									</view>
 								</view>
 							</view>
 							
@@ -135,7 +150,9 @@
 							<view class="carnotes">上次到店：2022-01-21</view>
 							<view class="lineTop2">
 								<view class="chaoqi">超期天数：</view>
-								<view class="lineBtn">发送提醒</view>
+								<view>
+									<view class="lineBtn">发送提醒</view>
+								</view>
 							</view>
 						</view>
 						<view class="lcLine">
@@ -151,7 +168,9 @@
 							<view class="carnotes">上次到店：2022-01-21</view>
 							<view class="lineTop2">
 								<view class="chaoqi">超期天数：10</view>
-								<view class="lineBtn">发送提醒</view>
+								<view>
+									<view class="lineBtn">发送提醒</view>
+								</view>
 							</view>
 						</view>
 						
@@ -206,7 +225,7 @@
 		</view>
 	
 		
-	
+		<view style="height: 40rpx;background-color: #fff;"></view>
 		
 	</view>
 </template>
@@ -248,6 +267,65 @@
 			}
 		  },
 		methods: {
+		   sendChat(item,num){
+			   /* 保险：InsuranceExpireDate
+未过期：您的爱车桂A2AQ02车险到期时间为2022-12-04，还有26天即将到期，请及时续保~
+过期：您的爱车桂A2AQ02车险已于2022-11-05到期了，为了不影响车辆使用，请及时续保~
+年审：NextAuditTime
+未过期：您的爱车桂A2AQ02年审到期时间为2022-12-04，还有26天即将到期，请及时处理~
+过期：您的爱车桂A2AQ02年审已于2022-11-05到期了，为了不影响车辆使用，请及时处理~*/
+               var txt='';
+               if(num==1){
+				    var state= this.isDateGreater(item.carDetailInfo.NextAuditTime)
+					var day= this.daysUntilDate(item.carDetailInfo.NextAuditTime)
+					if(state){
+						txt='您的爱车'+item.PlateNumber+'车险到期时间为'+item.carDetailInfo.NextAuditTime+'，还有'+day+'天即将到期，请及时续保~'
+					}else{
+						txt='您的爱车'+item.PlateNumber+'车险已于'+item.carDetailInfo.NextAuditTime+'为了不影响车辆使用，请及时续保~'
+					}
+			   }
+			   if(num==2){ //保险
+			   		var state= this.isDateGreater(item.carDetailInfo.InsuranceExpireDate)
+			   		var day= this.daysUntilDate(item.carDetailInfo.InsuranceExpireDate)
+			   		if(state){
+			   			txt='您的爱车'+item.PlateNumber+'车险到期时间为'+item.carDetailInfo.InsuranceExpireDate+'，还有'+day+'天即将到期，请及时续保~'
+			   		}else{
+			   			txt='您的爱车'+item.PlateNumber+'车险已于'+item.carDetailInfo.InsuranceExpireDate+'为了不影响车辆使用，请及时续保~'
+			   		}		   
+			   }
+			   console.log(txt)
+			  
+			  
+			//console.log(this.isDateGreater(item.NextAuditTime))   
+			  // if(item.)
+			   
+			   
+			   this.$wx.invoke('sendChatMessage', {
+			    msgtype:"text", //消息类型，必填
+			   	enterChat: true, //为true时表示发送完成之后顺便进入会话，仅移动端3.1.10及以上版本支持该字段
+			   	text: {
+			   		content:txt, //文本内容
+			   	},
+			   /* news:
+			   	{
+			   		link: "http://qw.66km.com.cn", //H5消息页面url 必填
+			   		title: "2", //H5消息标题
+			   		desc: "23", //H5消息摘要
+			   		imgUrl: "", //H5消息封面图片URL
+			   	}, */
+			   
+			   }, function(res) {
+			   	if (res.err_msg == 'sendChatMessage:ok') {
+			   		//发送成功
+			   	}else{
+					uni.showToast({
+						title: '发送失败',
+						icon: 'none',
+						duration: 3000
+					 });
+				}
+			   })
+		   },
 		   carlineFn(item){
 			   item.show=!item.show
 		   },
@@ -349,7 +427,7 @@
 		color: #FFFFFF;
 		line-height: 38rpx;
 		padding: 0 10rpx;
-		margin-left: 20rpx;
+		margin-left: 10rpx;
 	}
 	.carA{
 		height: 36rpx;
@@ -359,12 +437,12 @@
 		color: #2A2623;
 		line-height: 38rpx;
 		padding: 0 10rpx;
-		margin-left: 20rpx;
+		margin-left: 10rpx;
 	}
 	.carMcTxt{
 		font-size: 24rpx;
 		color: #666666;
-		padding-top: 16rpx;
+		padding-top: 12rpx;
 		
 		  white-space: nowrap; /* 不换行 */
 		  overflow: hidden; /* 隐藏超出的内容 */
@@ -378,13 +456,13 @@
 		
 	}
 	.carTitle{
-		height: 36rpx;
+		/* height: 36rpx; */
 		border-radius: 4rpx;
 		border: 1px solid #FF8113;
-		line-height: 34rpx;
+	/* 	line-height: 34rpx; */
 		font-size: 24rpx;
 		color: #FF8113;
-		padding: 0 8rpx;
+		padding: 2rpx 8rpx;
 		margin-right: 10rpx;
 		margin-bottom: 10rpx;
 	}
@@ -431,6 +509,7 @@
 		font-size: 30rpx;
 		color: #3C3C3C;
 		line-height: 36rpx;
+		font-weight: 600;
 	}
 	.nsStatus{
 		font-size: 24rpx;
@@ -451,13 +530,14 @@
 	.lineTop2{
 		display: flex;justify-content: space-between;
 	    padding-bottom: 20rpx; 
+		margin-top: 4rpx;
 	}
 	.lineBtn{
-		height: 52rpx;
+		/* height: 52rpx; */
 		border-radius: 28rpx;
-		border: 1rpx solid #DDDDDD;
-		line-height: 54rpx;
-		padding: 0 20rpx;
+		border: 1px solid #DDDDDD;
+		/* line-height: 56rpx; */
+		padding: 10rpx 20rpx;
 		font-size: 26rpx;
 		color: #3C3C3C;
 	}
@@ -490,6 +570,7 @@ color: #FF0000;
 	}
 	.nodataBox{
 		text-align: center;
+		background: #fff;
 	}
 	.carLine{
 		margin-bottom: 20rpx;

pages/index/consumption.vue

@@ -12,7 +12,7 @@
 				<image class="carUpimg" src="../../static/img/icon_arrow_down.png" mode=""></image> -->
 			</view>
 		</view>
-		<view  class="nodataBox" v-show="nodataShow">
+		<view  class="nodataBox" v-show="nodataShow||list.length==0">
 			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
@@ -49,7 +49,7 @@
 				
 			</view>
 		</view>
-	 
+	 <view style="height: 40rpx;background: #FFFFFF;"></view>
 		<uni-popup ref="popup" type="bottom" >
 			<view class="popupBox">
 			  <view class="popupTitleBox">
@@ -253,14 +253,14 @@ padding-bottom: 20rpx;
 }
 .km{
 	border-radius: 4rpx;
-	border: 1rpx solid #DDDDDD;
-	height: 36rpx;
-	padding: 0rpx 10rpx;
+	border: 2rpx solid #DDDDDD;
+	/* height: 36rpx; */
+	padding: 2rpx 10rpx;
 	margin-left: 20rpx;
-	line-height: 38rpx;
+	/* line-height: 40rpx; */
 }
 .cp{
-	line-height: 36rpx;
+	line-height: 40rpx;
 	font-size: 30rpx;
 	color: #333333;
 	font-weight: 600;
@@ -333,7 +333,7 @@ padding-bottom: 20rpx;
 	}
 	.popupLcBox{
 		display: flex;justify-content: space-between;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #999999;
 		padding: 10rpx 30rpx 34rpx 30rpx;
 		border-bottom: 1px solid #EEEEEE;
@@ -381,7 +381,7 @@ padding-bottom: 20rpx;
 		background: #FF8113;
 		border-radius: 4rpx;
 		text-align: center;
-		line-height: 28rpx;
+		line-height: 30rpx;
 		font-size: 22rpx;
 		color: #FFFFFF;
 		margin-right: 10rpx;
@@ -410,7 +410,7 @@ padding-bottom: 20rpx;
 		padding-top: 50rpx;
 	}
 	.nodataBox{
-		text-align: center;
+		text-align: center;background: #fff;
 	}
 	.mxJt{
 		width: 30rpx;height: 30rpx;

pages/index/coupon.vue

@@ -1,9 +1,6 @@
 <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 style="margin-top: -26rpx;"></view>
 		<view class="topbox" v-show="!nodataShow">
 			<view class="top">
@@ -23,6 +20,10 @@
 				</view>
 			</view>
 		</view>
+		<view  class="nodataBox" v-show="nodataShow||list.length==0">
+			<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="cBox"  v-show="!nodataShow">
 			<view class="line" v-for="(item,index) in list">
 				<view class="lineTop">
@@ -56,6 +57,7 @@
 				
 			</view>
 		</view>
+		<view style="height: 40rpx;background: #FFFFFF;"></view>
 	 
 		<view class="tkBox" v-if="couShow" @click="couHide">
 			<view class="popupBox" @click.stop="">
@@ -162,7 +164,7 @@
 	padding: 0 24rpx;
 }
 .line{
-	padding: 30rpx 0rpx;background: #FFFFFF;
+	padding: 30rpx 0rpx 16rpx 0;background: #FFFFFF;
 border-radius: 10rpx;margin-top: 20rpx;
 }
 .nameBox{
@@ -171,16 +173,18 @@ border-radius: 10rpx;margin-top: 20rpx;
 .type{
 	font-size: 24rpx;
 	color: #2B2219;
-	padding-top: 2rpx;
-	padding-bottom: 2rpx;
+	/* padding-top: 2rpx;
+	padding-bottom: 2rpx; */
 	background: linear-gradient( 128deg, #FFE4C5 0%, #FDC692 100%);
 	border-radius: 4rpx;
 	width: 82rpx;
 	text-align: center;
+	line-height: 38rpx;
+	height: 36rpx;
 	
 }
 .name{
-	line-height: 36rpx;padding-left: 10rpx;font-weight: 500;
+	line-height: 38rpx;padding-left: 10rpx;font-weight: 500;
 font-size: 28rpx;
 color: #333333;
 }
@@ -200,26 +204,26 @@ color: #FF0000;
 }
 .price3{
 font-weight: 400;
-font-size: 22rpx;
+font-size: 26rpx;
 color: #666666;
 }
 .chepai{
-	height: 36rpx;
+	/* height: 36rpx; */
 	background:rgba(255, 129, 19, 0.1);
 	border-radius: 4rpx;
 	font-size: 22rpx;
 	color: #FF8113;
-	line-height: 36rpx;
-	padding: 0 10rpx;
-	margin-top: 14rpx;
+	/* line-height: 38rpx; */
+	padding: 4rpx 10rpx;
+	margin-top: 10rpx;
 }
 .time{
-	font-size: 22rpx;
+	font-size: 26rpx;
 	color: #666666;padding-top: 10rpx;
 	padding-bottom: 15rpx;
 }
 .lineBottom{
-	font-size: 22rpx;
+	font-size: 26rpx;
 	color: #666666;
 	padding: 15rpx 24rpx;
 	padding-bottom: 0;
@@ -234,7 +238,7 @@ color: #666666;
 		padding-top: 50rpx;
 	}
 	.nodataBox{
-		text-align: center;
+		text-align: center;background: #fff;
 	}
 	.tkBox{
 		width: 100%;

pages/index/custom.vue

@@ -132,6 +132,7 @@
 			</view>
 			
 		</view>
+		<view style="height: 40rpx;"></view>
 
 		<uni-popup ref="popup" type="bottom" >
 			<view class="popupBox">
@@ -141,8 +142,9 @@
 			  </view>
 			  <view class="popupMs">此处修改手机号后，将根据新手机号重新匹配客户信息</view>
 			  <view class="inputBox">
-				  <view class="inputMs">手机号</view>
-				  <input type="text" v-model="extUserMobile" class="iphoneInput" placeholder="请输入" />
+				  <!-- <view class="inputMs">手机号</view> -->
+				  <input type="text" v-model="extUserMobile" class="iphoneInput" placeholder="请输入手机号" />
+			      <image v-show="extUserMobile" src="../../static/img/icon_delete.png" mode="" class="delInput" @click="extUserMobile=''"></image>
 			  </view>
 			  
 			  <view class="pBottom">
@@ -224,6 +226,7 @@
 					  });
 					  this.pBcancel()
 					  this.extCustomerInfo()
+					  this.$emit('getUser')
 				  }
 			     
 				  
@@ -271,13 +274,13 @@ width: 500rpx;justify-content: flex-end;
 		
 	}
 	.title{
-		height: 36rpx;
+		/* height: 36rpx; */
 		border-radius: 4rpx;
 		border: 1px solid #FF8113;
-		line-height: 34rpx;
+	/* 	line-height: 36rpx; */
 		font-size: 24rpx;
 		color: #FF8113;
-		padding: 0 8rpx;
+		padding: 4rpx 8rpx;
 		margin-right: 10rpx;
 		margin-bottom: 10rpx;
 		
@@ -343,6 +346,7 @@ width: 500rpx;justify-content: flex-end;
 		font-size: 30rpx;
 		color: #3C3C3C;
 		line-height: 42rpx;
+		font-weight: 600;
 	}
 	.chaImg{
 		width: 27rpx;height: 27rpx;margin-top: 9rpx;
@@ -363,9 +367,12 @@ width: 500rpx;justify-content: flex-end;
 	.iphoneInput{
 		line-height: 1;
 		height: 98rpx;
-		padding-left: 40rpx;
+		/* padding-left: 40rpx; */
 		 -webkit-text-size-adjust: none;
 	}
+	.iphoneInput{
+		line-height: 98rpx;
+	}
 	.pBottom{
 		position: absolute;
 		left: 0;
@@ -401,9 +408,17 @@ width: 500rpx;justify-content: flex-end;
 	}
 	.jiantou{
 		width: 30rpx;height: 30rpx;
-		margin-top: 6rpx;
+		margin-top: 4rpx;
 	}
 	.lineRgihtSjh{
 		display: flex;
 	}
+	.delInput{
+		width: 30rpx;
+		height: 30rpx;
+		margin-top: 30rpx;
+	}
+	.inputBox{
+		justify-content: space-between;
+	}
 </style>

pages/index/index.vue

@@ -21,7 +21,7 @@
 			</view>
 		</view>
 		<view class="indexCont">
-			<custom ref="customView" :token="token" v-show="tabIndex==1"></custom>
+			<custom ref="customView" :token="token" @getUser="getUser" 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>
@@ -76,13 +76,13 @@
 			this.token=uni.getStorageSync('token')
 			this.corpID=uni.getStorageSync('corpID')
 			this.agentId=uni.getStorageSync('agentId')
-			//this.userId='wmMGjbBgAA0JAbGD5Vu8BzEuYgZhvhOA'
-			//this.token='26AF53EA2DC528681ABD7B3AC46072E96F0A964431A2453CF0F1DA1C28732A1EAF945459643F62A3A6FD87751E6880BB'
+			this.userId='wmMGjbBgAA0JAbGD5Vu8BzEuYgZhvhOA'
+			this.token='26AF53EA2DC528681ABD7B3AC46072E96F0A964431A2453CF0F1DA1C28732A1EAF945459643F62A3A6FD87751E6880BB'
 			
-		   //this.userId='wmMGjbBgAALroygkoaVBN4-W2O1daIkg'
-			this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
-			 this.userId='wmMGjbBgAAeKTdCmEN0CLKPNwJ4ACTxw'
-			this.token='0A809B6077F4044EDECFC49762B59668E9508B2CA4C6C4791C8894B2B1A7338AAF945459643F62A3A6FD87751E6880BB'
+		     //this.userId='wmMGjbBgAALroygkoaVBN4-W2O1daIkg'
+			 //this.token='065BAA93971FEB1A37A08D682FCDB41CC69E76FC36BB038790FB99C5CD71C28EAF945459643F62A3A6FD87751E6880BB'
+		    //this.userId='wmMGjbBgAAeKTdCmEN0CLKPNwJ4ACTxw'
+			//this.token='0A809B6077F4044EDECFC49762B59668E9508B2CA4C6C4791C8894B2B1A7338AAF945459643F62A3A6FD87751E6880BB'
 			 uni.setStorage({
 				key: 'token',
 				data: that.token,
@@ -112,7 +112,7 @@
 				 //this.init()
 			}
 			 */
-		   //	this.authUserInfo()
+			 //this.authUserInfo()
 			//this.extUserDetail()
 		},
 		methods: {
@@ -172,6 +172,7 @@
 			},
 			extUserDetail(){
 				var that=this;
+				
 				this.$http('enterpriseWechat/auth/extUserDetail', {
 				   corpID:'wpMGjbBgAA_zIu6wbKy48zFSbGiGeP8g',
 				  // extUserId:'wmMGjbBgAA0JAbGD5Vu8BzEuYgZhvhOA'
@@ -182,6 +183,19 @@
 					this.$refs.customView.getdata()
 				})
 			},
+			getUser(){
+				var that=this;
+				this.extCustomerInfo()
+				this.$http('enterpriseWechat/auth/extUserDetail', {
+				   corpID:'wpMGjbBgAA_zIu6wbKy48zFSbGiGeP8g',
+				  // extUserId:'wmMGjbBgAA0JAbGD5Vu8BzEuYgZhvhOA'
+				  extUserId:this.userId
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.userDetail=res.data
+					
+				})
+			},
 			authUserInfo(){
 				var that=this;
 				uni.showLoading({
@@ -231,7 +245,7 @@
 					    timestamp: res.data.timestamp, // 必填，生成签名的时间戳
 					    nonceStr: res.data.nonceStr, // 必填，生成签名的随机串
 					    signature: res.data.signature,// 必填，签名，见附录-JS-SDK使用权限签名算法
-					    jsApiList: ['getCurExternalContact','getContext'], //必填，传入需要使用的接口名称
+					    jsApiList: ['getCurExternalContact','getContext','sendChatMessage'], //必填，传入需要使用的接口名称
 					    success: function(res) {
 						   console.log(res)
 						  /* uni.showToast({
@@ -476,13 +490,13 @@
 		width: 500rpx;
 	}
 	.title{
-		height: 36rpx;
+		/* height: 36rpx; */
 		border-radius: 4rpx;
 		border: 1px solid #FF8113;
-		line-height: 34rpx;
+		/* line-height: 36rpx; */
 		font-size: 24rpx;
 		color: #FF8113;
-		padding: 0 8rpx;
+		padding: 4rpx 8rpx;
 		margin-right: 10rpx;
 		margin-bottom: 10rpx;
 	}

pages/index/package.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view  class="nodataBox" v-show="nodataShow">
+		<view  class="nodataBox" v-show="nodataShow||czList.length==0">
 			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
@@ -15,11 +15,14 @@
 				 </view>
 				 <view class="lprice">
 					 <span class="price1">￥</span>
-					 <span class="price2">4566</span>
+					 <span class="price2">{{item.Money}}</span>
 					 <span class="price3">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
 				 </view>
 				 <view class="lShop">
-					 <view class="lShopName">可用门店：{{item.ShopName}}</view>
+					<view class="lShopName" v-if="item.shoplist.length==0">可用门店：全部</view>
+					<view class="lShopName" v-else>可用门店：
+					   <span v-for="(s,i) in item.shoplist">{{s.shopName}}</span>
+					</view>
 					<!-- <image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image> -->
 				 </view>
 		</view>
@@ -41,11 +44,14 @@
 					 <view class="lShopName" v-else>可用门店：
 					    <span v-for="(s,i) in item.shoplist">{{s.shopName}}</span>
 					 </view>
-					 <image class="carUpimg" src="../../static/img/icon_arrow_up.png" mode=""></image>
+					
+					<image class="carUpimg" src="../../static/img/icon_arrow_down.png" mode=""></image>
+					
+					
 				 </view>
 		</view>
 	</view>
-	 
+	 <view style="height: 40rpx;background: #FFFFFF;"></view>
 	 
 	 
 	 <uni-popup ref="popup" type="bottom" >
@@ -94,9 +100,10 @@
 		 	  <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 style="padding: 0 24rpx;line-height: 42rpx;" v-if="txt">
+		 	    <rich-text :nodes="txt"></rich-text>
 		 	</view>
+			<view style="padding: 0 24rpx;line-height: 42rpx;" v-else>暂无使用条款</view>
 		 </view>
 	 </uni-popup>
 		
@@ -175,6 +182,7 @@
 <style scoped>
 .carUpimg{
 		width: 26rpx;height: 16rpx;
+		margin-top: 10rpx;
 	}
 .box{
 	padding: 0 24rpx;
@@ -187,21 +195,22 @@
 }
 .lineNameBox{
 	display: flex;justify-content: space-between;
-	padding-bottom: 6rpx;
+	padding-bottom: 2rpx;
 }
 .lnameLeft{
 	display: flex;
 }
 .type{
-	width: 64rpx;
+/* 	width: 64rpx; */
 	height: 36rpx;
 	background: #FF8113;
-	border-radius: 5rpx;
+	border-radius: 8rpx;
 	font-size: 24rpx;
 	color: #FFFFFF;
 	text-align: center;
 	line-height: 38rpx;
-	margin-top: 8rpx;
+	margin-top: 6rpx;
+	padding: 0 10rpx;
 }
 .lname{
 	font-size: 30rpx;
@@ -220,7 +229,7 @@
 	font-size: 24rpx;
 	color: #3C3C3C;
 	text-align: center;
-	line-height: 52rpx;
+	line-height: 54rpx;
 }
 .price1{
 	font-size: 24rpx;
@@ -233,7 +242,7 @@
 	font-weight: 600;
 }
 .price3{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #3C3C3C;
 }
 .lShop{
@@ -242,8 +251,9 @@
 	padding-top: 10rpx;
 }
 .lShopName{
-	font-size: 24rpx;
+	font-size: 26rpx;
 	color: #999999;
+	width: 600rpx;
 }
 .popupBox{
 		width: 750rpx;
@@ -315,11 +325,11 @@
 		padding-top: 16rpx;
 	}
 	.jcYxq{
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #999999;
 	}
 	.jcNum{
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #999999;
 	}
 	.nodataImg{
@@ -332,6 +342,6 @@
 		padding-top: 50rpx;
 	}
 	.nodataBox{
-		text-align: center;
+		text-align: center;background: #fff;
 	}
 </style>