bug修改

pages/activity/jkDetail.vue

@@ -72,7 +72,7 @@
 				<img :src="item.img" alt="" class="detailImg" mode="widthFix">
 			</view>
 		</view>
-		
+		<view class="companyName">©{{info.supportInfo}}</view>
 		<view style="height: 200rpx;padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);"></view>
 		<view class="bottom">
@@ -867,6 +867,15 @@
 </script>
 
 <style scoped>
+	.companyName{
+		font-size: 24rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #666666;
+		line-height: 33rpx;
+		text-align: center;
+		padding: 40rpx;
+	}
 	.shareBtn{
 			/* width: 100rpx; */
 			background: #F4F5F7;

pages/index/confirmRescue.vue

@@ -1,6 +1,8 @@
 <template>
 <view class="box">
-  <view class="top-box" :style="{background:'#'+themeColor}"> </view>
+  <view class="top-box" :style="{background:'#'+themeColor}">
+	  <view class="topTis">需提前2小时取消订单，不足2小时需联系门</view>
+  </view>
   <view class="topTime">
 	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
 	  <view class="topTimeNum">{{opt.time}}</view>
@@ -69,7 +71,7 @@
 	  		  <view class="kklineLeft">
 	  			<span class="stars">*</span> <span>车型</span>
 	  		  </view>
-	  		  <view class="kklineRight3" >
+	  		  <view class="kklineRight3" @click="goCarlist">
 	  			  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
 	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 	  		  </view>
@@ -86,7 +88,7 @@
 	  		  <view class="kklineLeft">
 	  			<span class="stars">*</span><span>手机号</span>
 	  		  </view>
-	  		  <view class="kklineRight">15588753378</view>
+	  		  <view class="kklineRight"><input type="text" placeholder="请输入"></view>
 	  </view>
   </view>
   
@@ -240,6 +242,13 @@
 </script>
 
 <style scoped lang="less">
+	.topTis{
+		font-weight: 400;
+		color: #FFFFFF;
+		font-size: 26rpx;
+		text-align: center;
+		padding-top: 24rpx;
+	}
 .tcBox{
 	width: 702rpx;
     margin-top: 20rpx;
@@ -301,7 +310,7 @@
 	color: #FF2400;
 }
 .tcLeft{
-   width: 524rpx;padding-left: 13rpx;
+   width: 524rpx;padding-left: 20rpx;
 }
 .tcStartTxt2{
 	width: 550rpx;
@@ -349,8 +358,10 @@
 	color: #FF0000;
 	line-height: 33rpx;
 	font-size: 24rpx;
-	padding-top: 82rpx;
+	padding-top: 30rpx;
 	padding-left: 10rpx;
+	display: flex;
+	align-items: center;
 }
 .kkline{
 	display: flex;

pages/index/rescue.vue

@@ -58,7 +58,8 @@
 				<view class="left">
 					<view class="graypoint"></view>
 					<view class="leftTitle">终点</view>
-					<view class="content">{{endAddress}}</view>
+					<view class="content" v-if="endAddress">{{endAddress}}</view>
+					<view class="Nocontent" v-else>请选择</view>
 				</view>
 				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
 			
@@ -237,6 +238,18 @@
 					}
 					var time=this.yytime
 				}
+				
+				if(this.typeIndex==2){
+					if(this.endAddress==''){
+						uni.showToast({
+							 title: '请选择终点',
+							 icon:'none',
+							 duration: 3000
+						});
+						return false;
+					}
+				}
+				
 				uni.navigateTo({
 					url:'confirmRescue?lat='+this.latitude+"&lng="+this.longitude+"&shopId="+this.shopInfo.id+'&shopName='+this.shopInfo.shopName+'&type='+this.typeIndex+'&time='+time+'&currentAddress='+this.currentAddress+'&endAddress='+this.endAddress+'&endLat='+this.endLat+'&endLng='+this.endLng
 				})
@@ -629,11 +642,16 @@
 	}
     .content{
 		width: 540rpx;
+		font-size: 30rpx;
 		word-wrap: break-word; /*强制换行*/
 		  overflow: hidden; /*超出隐藏*/
 		  text-overflow: ellipsis;/*隐藏后添加省略号*/
 		  white-space: nowrap;/*强制不换行*/
 	}
+	.Nocontent{
+		font-size: 30rpx;
+		color: #999999;
+	}
 	.sure {
 
 		background-color: #D53533;

pages/user/user.vue

@@ -192,7 +192,7 @@
 			</view> -->
 
 		</view>
-
+        <view class="releaseVersion">版本号：{{release_version}}</view>
 
 		<!-- <view class="signOut" @click="signOut">退出登录</view> -->
 		<!-- 手机号授权 -->
@@ -231,8 +231,8 @@
 				nickName:'',
 				phone:'',
 				ext:'',
-				 themeColor:'',
-
+				themeColor:'',
+                release_version:'',
 			}
 		},
 		onLoad(opt) {
@@ -266,6 +266,7 @@
 				frontColor: "#ffffff",
 				backgroundColor:'#'+ this.themeColor
 			})
+			this.getVersionInfo()
 			// const accountInfo = wx.getAccountInfoSync();
 			// var version_number = accountInfo.miniProgram.version;
 			// console.log(version_number)
@@ -288,6 +289,14 @@
 
 		},
 		methods: {
+			getVersionInfo(){
+				this.$http('miniApp2/sys/getVersionInfo', {
+					appId: this.ext.appId,
+					
+				}, 'POST').then(res => {
+					this.release_version=res.data.release_version
+				})
+			},
 			updateUserInfo(){
 				var that=this;
 				uni.getUserProfile({
@@ -445,6 +454,14 @@
 </script>
 
 <style scoped>
+	.releaseVersion{
+		font-size: 24rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		padding: 40rpx;
+		text-align: center;
+	}
 	button::after{
 	 	border: none;
 	}