From d72db745739ac3d4ff8801c7dfa40731d07f41e7 Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Tue, 23 Jul 2024 17:59:01 +0800
Subject: [PATCH] 11

---
 page_user/bhks.vue    |  2 +-
 page_user/gzsb.vue    |  7 +++++--
 page_user/yj.vue      | 17 +++++++++--------
 pages/index/index.vue | 31 +++++++++++++++++++++++--------
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/page_user/bhks.vue b/page_user/bhks.vue
index 7c6b66b..0fa748f 100644
--- a/page_user/bhks.vue
+++ b/page_user/bhks.vue
@@ -50,7 +50,7 @@
 					if(uni.getStorageSync('token')){
 						this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
 							if (res.code === 200) {
-								uni.navigateTo({
+								uni.redirectTo({
 									url:'/pages/index/index?sn='+this.sn
 								})
 							}else{
diff --git a/page_user/gzsb.vue b/page_user/gzsb.vue
index 7fd11ed..0f29802 100644
--- a/page_user/gzsb.vue
+++ b/page_user/gzsb.vue
@@ -345,9 +345,12 @@
 
 	.page {
 		width: 750rpx;
-		padding-bottom: 150rpx;
+		padding-bottom: 200rpx;
 		.btn{
-			margin: 0 auto;
+			position: fixed;
+			left: 34rpx;
+			bottom: 80rpx;
+			// margin: 0 auto;
 			display: flex;
 			align-items: center;
 			justify-content: center;
diff --git a/page_user/yj.vue b/page_user/yj.vue
index cb43011..ccece33 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -171,19 +171,17 @@
 			
 		</view>
 		
-		<u-mask :show="loadingmask" :z-index='100' duration='0' />
+		<!-- <u-mask :show="loadingmask" :z-index='100' duration='0' />
 		<view class="pops" v-if="loadingmask" style="width: 500rpx;left:124rpx">
 			<view class="tit" style="font-weight: 600;">
 				加载中...
 			</view>
-			<!-- <u-loading size="50" mode="flower"></u-loading> -->
+			
 			<view class="loading_box">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uOQxwzp0Sj9l2WZ534zp" mode=""></image>
-				<!-- <view class="loader">
-					
-				</view> -->
+				
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -202,7 +200,7 @@
 				areaInfo: "",
 				isback:false,
 				showBack:false,
-				loadingmask:false,
+				loadingmask:true,
 				ispaid:false,
 				showtxtip:false,
 				showList:false
@@ -407,6 +405,9 @@
 									// })
 									that.ispaid=false
 									that.loadingmask=true
+									uni.showLoading({
+										title:'加载中'
+									})
 									setTimeout(() => {
 										
 										that.check()
@@ -415,7 +416,7 @@
 									setTimeout(() => {
 										
 										that.check()
-										
+										uni.hideLoading()
 									}, 4000)
 					
 								},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 85ae765..d453b5b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -298,11 +298,11 @@
 							</view>
 
 						</view>
-						<view class="changebiketip" @click="tochange()">
+						<!-- <view class="changebiketip" @click="tochange()">
 							换车骑行 <view class="iconfont icon-xiangyou1">
 
 							</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="bot" style="margin-top: 20rpx;" v-if="orderinfo.status==0">
 
@@ -319,7 +319,11 @@
 					</view>
 					<view class="bot" style="margin-top: 20rpx;" v-if="orderinfo.status==2">
 
-
+						<view class="changebiketip" @click="tochange()">
+							换车骑行 <view class="iconfont icon-xiangyou1">
+						
+							</view>
+						</view>
 						<view class="btn" style="	margin-right: 16rpx;"
 							v-if="OrderdeviceInfos.status==3||OrderdeviceInfos.status==6" @click="taploadmask (2)">
 							临时锁车
@@ -6122,7 +6126,7 @@
 					// display: flex;
 					// justify-content: center;
 					width: 750rpx;
-					height: 618rpx;
+					height: 640rpx;
 					// background: #fff;
 					// box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 					border-radius: 50rpx 50rpx 0 0;
@@ -6151,7 +6155,7 @@
 
 					.cardss {
 						position: absolute;
-						bottom: 220rpx;
+						bottom: 240rpx;
 						// margin-top: 20rpx;
 						padding: 20rpx 30rpx;
 						width: 695rpx;
@@ -6226,17 +6230,28 @@
 
 					.bot {
 						display: flex;
-						align-items: center;
+						// align-items: center;
 						justify-content: center;
 						position: absolute;
 						bottom: 0;
 						left: 0;
 						width: 750rpx;
-						height: 184rpx;
+						height: 220rpx;
 						background: #FFFFFF;
 						box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08), 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 						border-radius: 0rpx 0rpx 0rpx 0rpx;
-
+						padding-top: 30rpx;
+						.changebiketip {
+							bottom: 40rpx;
+							left: 320rpx;
+							position: absolute;
+							display: flex;
+							flex-wrap: nowrap;
+							align-items: center;
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #3D3D3D;
+						}
 						.btn {
 							display: flex;
 							justify-content: center;