From 6374511f719f5c09654bbdc88688ab50ac5e862e Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Wed, 6 Aug 2025 18:14:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=95=86=E5=9F=8E=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=202=E3=80=81=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=203=E3=80=81?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A1=86=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=99=BD=E8=89=B2=204=E3=80=81=E8=B6=B3=E8=BF=B9?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E7=9A=84id=E5=80=BC?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=AD=A3=E7=A1=AE=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue |  6 +++---
 pages/index/index.vue    |  2 +-
 pages/index/user.vue     | 35 ++++++++++++++---------------------
 pages/user/goods-log.vue |  2 +-
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/pages/index/category.vue b/pages/index/category.vue
index e7c1931..42e1e6e 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -269,7 +269,7 @@
   }
   
   .car-show {
-  	height: 78rpx;
+  	height: 80rpx;
   	position: fixed;
   	bottom: 150rpx;
   	right: 0;
@@ -297,8 +297,8 @@
   	}
   
   	.cart-image {
-  		width: 130rpx;
-  		height: 130rpx;
+  		width: 80rpx;
+  		height: 80rpx;
   		position: absolute;
   		top: 45%;
   		right: 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 274f9d3..7aad1b4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,7 +19,7 @@
 						<view class="locTop-right" @click="toPage('/packageA/search/index')">
 							<uni-section style="border-radius: 192rpx;padding: 0;" type="line">
 								<uni-search-bar style="border-radius: 192rpx;" radius="23" placeholder="搜索您需要的信息"
-									bgColor="#EEEEEE" clearButton="none" cancelButton="none"
+									bgColor="#ffffff" clearButton="none" cancelButton="none"
 									:readonly="true" />
 							</uni-section>
 							<!-- @confirm="search"-->
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 609ddec..597f283 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -17,7 +17,7 @@
 						</view>
 						<view class="headAvatar-info justify-start">
 							<view class="info-name fs-36 weight8 flexD" v-if="isLogin == true">
-								<view style="font-weight: 800;">{{ userInfo.nickname}} </view>
+								<view style="font-weight: 800;" @click="sheep.$router.go('/pages/user/info')">{{ userInfo.nickname}} </view>
 								<view class="UnAuthenBox weight8 fs-20" v-if="authenInfo.status == -1 " @click="toPage('/pages/user/authentication')">未认证</view>
 								<view class="authenticationBox weight8 fs-20" v-if="authenInfo.status == 1 ">已认证</view>
 							</view>
@@ -168,22 +168,14 @@
 				<view style="height: 180rpx;width: 100%;"></view>
 			</view>
 
-
-
-			<!-- 授权登录 
-				<u-popup :show="showLogin == true" type="center" round="20"
-					:customStyle="{ 'width': '644rpx', 'height': '426rpx','position': 'relative'}" :closeable="false"
-					@close="closeLogin" @open="openLogin">
-					<view class="popup">
-						<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-							授权登录
-						</button>
-					</view>
-				</u-popup>-->
-
-			<su-popup :show="showLogin == true" type="center" round="10" :isMaskClick="false">
+			<su-popup :show="showLogin == true" type="center" round="10" :isMaskClick="false" >
 				<view class="popup">
+					<!-- <view class="texbut" @click="getPhoneNumber">
+						<image style="width: 500rpx;height: 136rpx;margin-top: 84rpx;" src="https://jiangxiaoxian.0rui.cn/loginBtn.png"></image>
+					</view> -->
+					
 					<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+						<!-- <image style="width: 500rpx;height: 136rpx;" src="https://jiangxiaoxian.0rui.cn/loginBtn.png"></image> -->
 						授权登录
 					</button>
 				</view>
@@ -704,15 +696,16 @@
 
 		.texbut {
 			width: 507rpx;
-			height: 90rpx;
-			border-radius: 45rpx;
-			background: #ffbd25;
-			font-size: 34rpx;
-			color: #3d3d3d;
-			font-weight: bold;
+			height: 120rpx;
+			// border-radius: 45rpx;
+			// background: #ffbd25;
+			// font-size: 34rpx;
+			// color: #3d3d3d;
+			// font-weight: bold;
 			display: flex;
 			justify-content: center;
 			align-items: center;
+			margin: 0 auto;
 		}
 	}
 	
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 90dafff..3847866 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -195,7 +195,7 @@
 	function toDetail(e) {
 		console.log('跳转详情', e);
 		uni.navigateTo({
-			url: '/pages/canteenRent/rentDetail?id=' + e.id
+			url: '/pages/canteenRent/rentDetail?id=' + e.information.id
 		})
 	}