diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..7f81dcb 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -1,16 +1,25 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-ios"
+        },
+        {
+            "openVueDevtools" : true,
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }
diff --git a/README.md b/README.md
index b2b425e..ee9c7c3 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,11 @@
 - 状态管理：[pinia](https://pinia.vuejs.org/zh/)
 - 组件库：[uni-ui](https://uniapp.dcloud.net.cn/component/uniui/uni-ui.html)
 
-## 资料说明
+资料说明
+
+- 账号：18387785159
+
+- 密码：Hhkj@123456
 
 ### 📗 接口文档
 
diff --git a/src/App.vue b/src/App.vue
index d3769e0..1ec8d2e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,8 +14,8 @@ onHide(() => {
 
 <style lang="scss">
 // 字体图标
-// @import '@/styles/fonts.scss';
 @import '@/static/scss/index.scss';
+// @import '@/styles/fonts.scss';
 
 // 使用 vw 配置 rem
 html {
diff --git a/src/components/XtxGuess.vue b/src/components/XtxGuess.vue
new file mode 100644
index 0000000..9efdf79
--- /dev/null
+++ b/src/components/XtxGuess.vue
@@ -0,0 +1,164 @@
+<script setup lang="ts">
+// import { getHomeGoodsGuessLikeAPI } from '@/services/home'
+// import type { PageParams } from '@/types/global'
+// import type { GuessItem } from '@/types/home'
+import { ref } from 'vue'
+import { onMounted } from 'vue'
+
+// 猜你喜欢的列表
+const guessList: any = ref([])
+
+// 分页参数
+const pageParams: Required<any> = ref({
+  page: 1,
+  pageSize: 10,
+})
+
+// 重置数据
+const resetData = () => {
+  pageParams.value.page = 1
+  guessList.value = []
+  finish.value = false
+}
+
+// 分页已经结束标记
+const finish = ref(false)
+
+//获取猜你喜欢请求数据
+// const getHomeGoodsGuessLikeData = async () => {
+//   // 退出判断
+//   if (finish.value) {
+//     uni.showToast({
+//       icon: 'none',
+//       title: '没有更多数据~',
+//     })
+//     return
+//   }
+
+//   // 请求
+//   const res = await getHomeGoodsGuessLikeAPI(pageParams)
+
+//   // 数组追加
+//   guessList.value.push(...res.result.items)
+
+//   //分页条件判断 条件判断
+//   if (pageParams.page < res.result.pages) {
+//     // 页码累加
+//     pageParams.page++
+//   } else {
+//     finish.value = true
+//   }
+// }
+
+// 组件挂载完毕
+onMounted(() => {
+  // getHomeGoodsGuessLikeData()
+})
+
+// 子组件暴露方法--属性
+defineExpose({
+  // getMore: getHomeGoodsGuessLikeData,
+  resetData,
+})
+</script>
+
+<template>
+  <!-- 猜你喜欢 -->
+  <view class="caption">
+    <text class="text">接单历史</text>
+  </view>
+  <view class="guess">
+    <navigator
+      class="guess-item"
+      v-for="item in guessList"
+      :key="item.id"
+      :url="`/pages/goods/goods?id=4007498`"
+    >
+      <image class="image" mode="aspectFill" :src="item.picture"></image>
+      <view class="name"> {{ item.name }}</view>
+      <view class="price">
+        <text class="small">¥</text>
+        <text>{{ item.price }}</text>
+      </view>
+    </navigator>
+  </view>
+  <view class="loading-text"> {{ finish ? '没有更多数据~' : '正在加载...' }} </view>
+</template>
+
+<style lang="scss">
+:host {
+  display: block;
+}
+/* 分类标题 */
+.caption {
+  display: flex;
+  justify-content: center;
+  line-height: 1;
+  padding: 36rpx 0 40rpx;
+  font-size: 32rpx;
+  color: #262626;
+  .text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 0 28rpx 0 30rpx;
+
+    &::before,
+    &::after {
+      content: '';
+      width: 20rpx;
+      height: 20rpx;
+      background-image: url(@/static/images/bubble.png);
+      background-size: contain;
+      margin: 0 10rpx;
+    }
+  }
+}
+
+/* 猜你喜欢 */
+.guess {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 0 20rpx;
+  .guess-item {
+    width: 345rpx;
+    padding: 24rpx 20rpx 20rpx;
+    margin-bottom: 20rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+    background-color: #fff;
+  }
+  .image {
+    width: 304rpx;
+    height: 304rpx;
+  }
+  .name {
+    height: 75rpx;
+    margin: 10rpx 0;
+    font-size: 26rpx;
+    color: #262626;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+  .price {
+    line-height: 1;
+    padding-top: 4rpx;
+    color: #cf4444;
+    font-size: 26rpx;
+  }
+  .small {
+    font-size: 80%;
+  }
+}
+// 加载提示文字
+.loading-text {
+  text-align: center;
+  font-size: 28rpx;
+  color: #666;
+  padding: 20rpx 0;
+}
+</style>
diff --git a/src/manifest.json b/src/manifest.json
index 2689535..c8cff63 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,72 +1,78 @@
 {
-  "name": "鸿森通货运",
-  "appid": "__UNI__D787228",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": 1,
-  "transformPx": false,
-  /* 5+App特有相关 */
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    "name" : "鸿森通货运",
+    "appid" : "__UNI__D787228",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : 1,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {
+                    "univerify" : {}
+                }
+            }
+        }
     },
-    /* 模块配置 */
-    "modules": {},
-    /* 应用发布信息 */
-    "distribute": {
-      /* android打包配置 */
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      /* ios打包配置 */
-      "ios": {},
-      /* SDK配置 */
-      "sdkConfigs": {}
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  /* 小程序特有相关 */
-  "mp-weixin": {
-    "appid": "wx79b61e386979fc3a",
-    "setting": {
-      "urlCheck": false
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx79b61e386979fc3a",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3"
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3"
 }
diff --git a/src/pages.json b/src/pages.json
index 0ab70f1..c8aec54 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,90 +1,104 @@
 {
-	// 组件自动导入
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			// uni-ui 规则如下配置
-			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
-			//组件自动导入 以小兔仙Xtx开头组件,在@src文件内components 文件夹查找 提取出来的用$1补位
-			"^Xtx(.*)": "@/components/Xtx$1.vue"
-		}
-	},
-	"pages": [
-		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "抢单"
-			}
-		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				"navigationBarTitleText": "运单"
-			}
-		},
-		{
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/login/loginPassword/loginPassword",
-			"style": {
-				"navigationBarTitleText": "忘记密码"
-			}
-		},
-		{
-			"path": "pages/login/loginPassword/loginPasswordItem/loginPasswordItem",
-			"style": {
-				"navigationBarTitleText": "忘记密码填写"
-			}
-		},
-		{
-			"path": "pages/login/appleId/appleId",
-			"style": {
-				"navigationBarTitleText": "注册账号"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	// 设置 TabBar
-	"tabBar": {
-		"color": "#333",
-		"selectedColor": "#27ba9b",
-		"backgroundColor": "#fff",
-		"borderStyle": "white",
-		"list": [
-			{
-				"text": "抢单",
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabs/home_default.png",
-				"selectedIconPath": "static/tabs/home_selected.png"
-			},
-			{
-				"text": "运单",
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabs/category_default.png",
-				"selectedIconPath": "static/tabs/category_selected.png"
-			},
-			{
-				"text": "我的",
-				"pagePath": "pages/my/my",
-				"iconPath": "static/tabs/user_default.png",
-				"selectedIconPath": "static/tabs/user_selected.png"
-			}
-		]
-	}
-}
\ No newline at end of file
+  // 组件自动导入
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      // uni-ui 规则如下配置
+      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
+      //组件自动导入 以小兔仙Xtx开头组件,在@src文件内components 文件夹查找 提取出来的用$1补位
+      "^Xtx(.*)": "@/components/Xtx$1.vue"
+    }
+  },
+  "pages": [
+    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "抢单"
+      }
+    },
+    {
+      "path": "pages/category/category",
+      "style": {
+        "navigationBarTitleText": "运单"
+      }
+    },
+    {
+      "path": "pages/my/my",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
+    {
+      "path": "pages/login/login",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/login/loginPassword/loginPassword",
+      "style": {
+        "navigationBarTitleText": "忘记密码"
+      }
+    },
+    {
+      "path": "pages/login/loginPassword/loginPasswordItem/loginPasswordItem",
+      "style": {
+        "navigationBarTitleText": "忘记密码填写"
+      }
+    },
+    {
+      "path": "pages/login/appleId/appleId",
+      "style": {
+        "navigationBarTitleText": "注册账号"
+      }
+    },
+    {
+      "path": "pages/message/setting",
+      "style": {
+        "navigationBarTitleText": "设置"
+      }
+    },
+    {
+      "path" : "pages/login/OneClickLogin/OneClickLogin",
+      "style" : 
+      {
+        "navigationBarTitleText" : "一键登录",
+        "enablePullDownRefresh" : false
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  // 设置 TabBar
+  "tabBar": {
+    "color": "#333",
+    "selectedColor": "#27ba9b",
+    "backgroundColor": "#fff",
+    "borderStyle": "white",
+    "list": [
+      {
+        "text": "抢单",
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabs/home_default.png",
+        "selectedIconPath": "static/tabs/home_selected.png"
+      },
+      {
+        "text": "运单",
+        "pagePath": "pages/category/category",
+        "iconPath": "static/tabs/category_default.png",
+        "selectedIconPath": "static/tabs/category_selected.png"
+      },
+      {
+        "text": "我的",
+        "pagePath": "pages/my/my",
+        "iconPath": "static/tabs/user_default.png",
+        "selectedIconPath": "static/tabs/user_selected.png"
+      }
+    ]
+  }
+}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 9de248d..bf074c8 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -64,13 +64,13 @@
 import deiverPendingOrders from './componets/deiverPendingOrders.vue'
 import { queryList } from '@/services/home'
 import { ENV } from '@/utils/env'
-import { onLoad } from '@dcloudio/uni-app' //要用这个导入 ---用的这个--自动引入时是这个
+import { onShow } from '@dcloudio/uni-app' //要用这个导入 ---用的这个--自动引入时是这个
 import { onMounted } from 'vue'
 import { ref } from 'vue'
 import { decrypt } from '@/utils/decrypt'
 
 // 生命周期 --页面加载的时候
-onLoad(() => {
+onShow(() => {
   // getHomeBannerData()
   queryLists()
 })
diff --git a/src/pages/login/OneClickLogin/OneClickLogin.vue b/src/pages/login/OneClickLogin/OneClickLogin.vue
new file mode 100644
index 0000000..8f1d931
--- /dev/null
+++ b/src/pages/login/OneClickLogin/OneClickLogin.vue
@@ -0,0 +1,101 @@
+<template>
+  <view> </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+onShow(() => {
+  loginFun()
+})
+// 登录预设
+const loginFun = () => {
+  uni.login({
+    provider: 'univerify',
+    univerifyStyle: {
+      fullScreen: true, // 是否全屏显示，默认值： false
+      backgroundColor: '#ffffff', // 授权页面背景颜色，默认值：#ffffff
+      backgroundImage: '', // 全屏显示的背景图片，默认值："" （仅支持本地图片，只有全屏显示时支持）
+      icon: {
+        path: 'static/images/blank_cart.png', // 自定义显示在授权框中的logo，仅支持本地图片 默认显示App logo
+        width: '60px', //图标宽度 默认值：60px
+        height: '60px', //图标高度 默认值：60px
+      },
+      closeIcon: {
+        path: 'static/xxx.png', // 自定义关闭按钮，仅支持本地图片。 HBuilderX3.3.7+版本支持
+      },
+      phoneNum: {
+        color: '#202020', // 手机号文字颜色 默认值：#202020
+      },
+      slogan: {
+        color: '#BBBBBB', //  slogan 字体颜色 默认值：#BBBBBB
+      },
+      authButton: {
+        normalColor: '#3479f5', // 授权按钮正常状态背景颜色 默认值：#3479f5
+        highlightColor: '#2861c5', // 授权按钮按下状态背景颜色 默认值：#2861c5（仅ios支持）
+        disabledColor: '#73aaf5', // 授权按钮不可点击时背景颜色 默认值：#73aaf5（仅ios支持）
+        textColor: '#ffffff', // 授权按钮文字颜色 默认值：#ffffff
+        title: '本机号码一键登录', // 授权按钮文案 默认值：“本机号码一键登录”
+        borderRadius: '24px', // 授权按钮圆角 默认值："24px" （按钮高度的一半）
+      },
+      otherLoginButton: {
+        visible: true, // 是否显示其他登录按钮，默认值：true
+        normalColor: '', // 其他登录按钮正常状态背景颜色 默认值：透明
+        highlightColor: '', // 其他登录按钮按下状态背景颜色 默认值：透明
+        textColor: '#656565', // 其他登录按钮文字颜色 默认值：#656565
+        title: '其他登录方式', // 其他登录方式按钮文字 默认值：“其他登录方式”
+        borderColor: '', //边框颜色 默认值：透明（仅iOS支持）
+        borderRadius: '0px', // 其他登录按钮圆角 默认值："24px" （按钮高度的一半）
+      },
+      privacyTerms: {
+        defaultCheckBoxState: true, // 条款勾选框初始状态 默认值： true
+        isCenterHint: false, //未勾选服务条款时点击登录按钮的提示是否居中显示 默认值: false (3.7.13+ 版本支持)
+        uncheckedImage: '', // 可选 条款勾选框未选中状态图片（仅支持本地图片 建议尺寸 24x24px）(3.2.0+ 版本支持)
+        checkedImage: '', // 可选 条款勾选框选中状态图片（仅支持本地图片 建议尺寸24x24px）(3.2.0+ 版本支持)
+        checkBoxSize: 12, // 可选 条款勾选框大小
+        textColor: '#BBBBBB', // 文字颜色 默认值：#BBBBBB
+        termsColor: '#5496E3', //  协议文字颜色 默认值： #5496E3
+        prefix: '我已阅读并同意', // 条款前的文案 默认值：“我已阅读并同意”
+        suffix: '并使用本机号码登录', // 条款后的文案 默认值：“并使用本机号码登录”
+        privacyItems: [
+          // 自定义协议条款，最大支持2个，需要同时设置url和title. 否则不生效
+          {
+            url: 'https://hongsentong.com/#/serviceProtocol', // 点击跳转的协议详情页面
+            title: '用户服务协议', // 协议名称
+          },
+        ],
+      },
+      buttons: {
+        // 自定义页面下方按钮仅全屏模式生效（3.1.14+ 版本支持）
+        iconWidth: '45px', // 图标宽度（高度等比例缩放） 默认值：45px
+        list: [
+          {
+            provider: 'apple',
+            iconPath: '/static/apple.png', // 图标路径仅支持本地图片
+          },
+          {
+            provider: 'weixin',
+            iconPath: '/static/wechat.png', // 图标路径仅支持本地图片
+          },
+        ],
+      },
+    },
+    success(res: any) {
+      // 登录成功
+      console.log(res.authResult) // {openid:'登录授权唯一标识',access_token:'接口返回的 token'}
+      // loginForm.value.jsCode = res.authResult?.openid
+    },
+    fail(res) {
+      // 登录失败
+      console.log(res.errCode)
+      console.log(res.errMsg)
+      uni.redirectTo({
+        url: '/pages/login/login',
+      })
+      // uni.closeAuthView() //关闭授权登录界面
+    },
+  })
+}
+</script>
+
+<style></style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index b05f0d5..f2586d4 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -102,6 +102,7 @@ import { ENV } from '@/utils/env'
 import { useMemberStore } from '@/stores'
 import { onMounted } from 'vue'
 import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
 
 const feilUrl = ref()
 const feilUrl1 = ref()
@@ -126,6 +127,19 @@ const UniCode = ref() // 记录
 const canclick = ref(true) // 记录具体倒计时时间
 const clock = ref() //时间标记
 
+onLoad(() => {
+  // uni.login({
+  //   provider: 'weixin', //使用微信登录
+  //   success: function (loginRes: any) {
+  //     console.log(loginRes, 'weixin登录')
+  //     uni.showToast({
+  //       title: `${loginRes.authResult?.openid}`,
+  //       icon: 'success',
+  //     })
+  //   },
+  // })
+})
+
 // 判断 是否以读协议
 const agreementSearchItem = (e: any) => {
   if (agreementSearch.value[0]) {
@@ -186,15 +200,13 @@ const handleLogin = async () => {
     return
   } else {
     // 先发送请求
-    loginForm.value.jsCode = UniCode.value
+    // loginForm.value.jsCode = UniCode.value
     let URL = '/pages/index/index'
     loginUser(loginForm.value)
       .then((res: any) => {
+        console.log(res, 'res登录获取到的token')
         if (res.code == 200) {
           // 存储 vuex token
-          // setToken(res.data.access_token)
-          // setExpiresIn(res.data.expires_in)
-          // 保存会员信息
           const memberStore = useMemberStore()
           memberStore.setProfile(res.data.access_token)
 
diff --git a/src/pages/message/setting.vue b/src/pages/message/setting.vue
new file mode 100644
index 0000000..211083e
--- /dev/null
+++ b/src/pages/message/setting.vue
@@ -0,0 +1,230 @@
+<template>
+  <view>
+    <view>
+      <headTabbar tabbarName="个人设置"></headTabbar>
+      <view>
+        <!-- 外壳 -->
+        <view class="main" style="">
+          <!-- 内容区 -->
+          <view class="content" style="">
+            <!-- 头像区域 -->
+            <view class="mainItem">
+              <view>头像</view>
+              <view>
+                <uni-file-picker
+                  @select="(even) => imgSuccess(even)"
+                  limit="1"
+                  :del-icon="false"
+                  disable-preview
+                  :imageStyles="imageStyles"
+                  file-mediatype="image"
+                >
+                  <image
+                    style="width: 50px; height: 50px"
+                    mode="scaleToFill"
+                    :src="feilUrl + dataInfo.avatar"
+                  ></image>
+                </uni-file-picker>
+              </view>
+            </view>
+
+            <!-- 昵称 -->
+            <view class="mainItem">
+              <view>昵称</view>
+              <view>{{ dataInfo.userName }}</view>
+            </view>
+
+            <!-- 性别 -->
+            <view class="mainItem" @click="showGender = true">
+              <view>性别</view>
+              <view style="display: flex">
+                <text>{{ dataInfo.gender }}</text>
+                <view style="padding-top: 1px">
+                  <uni-icons type="right" size="16" color="#b5b5b5"></uni-icons>
+                </view>
+              </view>
+            </view>
+
+            <!-- 手机号 -->
+            <view class="mainItem" style="border-bottom: none">
+              <view>手机号</view>
+              <view>{{ dataInfo.userPhone }}</view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 保存信息 -->
+        <view class="btnSave" style="" @click="getupdateBaseInfo">
+          <view class="saveItem" style="">保存信息</view>
+        </view>
+
+        <!-- 退出登录 -->
+        <view @click="goBack" class="btnSave" style="color: #878787">
+          <view class="saveItem">退出登录</view>
+        </view>
+
+        <view>
+          <view @click="clickNativeRule" style="text-align: center; color: #008bd1; font-size: 14px"
+            >《鸿森通用户服务协议》</view
+          >
+        </view>
+
+        <!-- <u-action-sheet
+          :closeOnClickOverlay="true"
+          :closeOnClickAction="true"
+          @select="selectClick"
+          :actions="list"
+          :show="showGender"
+        ></u-action-sheet> -->
+      </view>
+    </view>
+  </view>
+</template>
+<script setup lang="ts">
+import { uploadAtt } from '@/services/common'
+import { baseInfo, logout, updateBaseInfo } from '@/services/home'
+import { ENV } from '@/utils/env'
+import { onLoad } from '@dcloudio/uni-app'
+import { ref } from 'vue'
+
+const feilUrl = ref()
+const showGender = ref(false)
+const dataInfo = ref({
+  gender: '男',
+  avatar: '',
+  userName: '',
+  userPhone: '',
+})
+const imageStyles = ref({
+  width: 50,
+  height: 50,
+  border: {
+    radius: '50%',
+  },
+})
+const list = ref([
+  {
+    name: '男',
+    fontSize: '20',
+    value: 1,
+  },
+  {
+    name: '女',
+    fontSize: '20',
+    value: 0,
+  },
+])
+
+onLoad(() => {
+  feilUrl.value = ENV.APP_FILE_URL
+  // getbaseInfo()
+})
+
+// 获取信息-生日-头像-
+const getbaseInfo = () => {
+  let _this = this
+  baseInfo().then((res: any) => {
+    console.log(res)
+    dataInfo.value = res.data
+    dataInfo.value.gender = '男'
+  })
+}
+
+// 更新信息
+const getupdateBaseInfo = () => {
+  let obj = {
+    avatar: dataInfo.value.avatar,
+    birthday: '2023-10-31 20:24:00',
+    userNickname: dataInfo.value.userName,
+  }
+  updateBaseInfo(obj).then((res: any) => {
+    console.log('更新成功')
+    uni.navigateBack({
+      delta: 1,
+    })
+  })
+}
+
+// 选择性别接受的数据
+const selectClick = (val: any) => {
+  showGender.value = false
+  dataInfo.value.gender = val.name
+}
+
+// 上传照片成功回调函数
+const imgSuccess = async (event: any) => {
+  const tempFilePaths = event.tempFilePaths
+  uploadAtt(tempFilePaths[0]).then((res: any) => {
+    if (res.code == 200) {
+      dataInfo.value.avatar = res.data.url
+    }
+  })
+}
+
+// 规则跳转
+const clickNativeRule = () => {
+  uni.navigateTo({
+    url: '/pageOthers/pageLoginAccent/pageLoginAccent',
+  })
+}
+
+// 退出登录
+const goBack = () => {
+  uni.showModal({
+    title: '提示',
+    content: '是否退出登录',
+    success: (res) => {
+      if (res.confirm) {
+        console.log('用户点击确定')
+        logout().then((res: any) => {
+          uni.reLaunch({
+            url: '/pages/login/OneClickLogin/OneClickLogin',
+          })
+        })
+      } else if (res.cancel) {
+        console.log('用户点击取消')
+      }
+    },
+  })
+}
+</script>
+
+<style lang="scss">
+page {
+  background-color: #eaeaea;
+}
+.main {
+  width: 100vw;
+  padding: 10px 10px;
+  font-size: 14px;
+
+  .content {
+    padding: 0 20px;
+    border-radius: 5px;
+    background-color: #fff;
+  }
+
+  .mainItem {
+    padding: 10px 0;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #e6e6e6;
+    height: 45px;
+    align-items: center;
+  }
+}
+
+.btnSave {
+  width: 100vw;
+  font-size: 14px;
+  padding: 0 10px 10px 10px;
+  color: #ff557f;
+
+  .saveItem {
+    border-radius: 5px;
+    background-color: #fff;
+    padding: 10px 0;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 3605665..0f00df9 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -32,7 +32,7 @@ const orderTypes = [
       </view>
       <!-- 情况2：未登录 -->
       <view class="overview" v-else>
-        <navigator url="/pages/login/login" hover-class="none">
+        <navigator url="/pages/login/OneClickLogin/OneClickLogin" hover-class="none">
           <image
             class="avatar gray"
             mode="aspectFill"
@@ -40,7 +40,11 @@ const orderTypes = [
           ></image>
         </navigator>
         <view class="meta">
-          <navigator url="/pages/login/login" hover-class="none" class="nickname">
+          <navigator
+            url="/pages/login/OneClickLogin/OneClickLogin"
+            hover-class="none"
+            class="nickname"
+          >
             未登录
           </navigator>
           <view class="extra">
@@ -48,16 +52,14 @@ const orderTypes = [
           </view>
         </view>
       </view>
-      <navigator class="settings" url="/pagesMember/settings/settings" hover-class="none">
-        设置
-      </navigator>
+      <navigator class="settings" url="/pages/message/setting" hover-class="none"> 设置 </navigator>
     </view>
     <!-- 我的订单 -->
     <view class="orders">
       <view class="title">
         我的订单
         <navigator class="navigator" url="/pagesOrder/list/list?type=0" hover-class="none">
-          查看全部订单<text class="icon-right"></text>
+          查看全部订单<uni-icons type="right" color="#939393" size="14"></uni-icons>
         </navigator>
       </view>
       <view class="section">
@@ -77,14 +79,18 @@ const orderTypes = [
       </view>
     </view>
     <!-- 猜你喜欢 -->
-    <view class="guess">
-      <!-- <XtxGuess ref="guessRef" /> -->
-      <view> 其他信息 </view>
+    <view>
+      <view class="guess">
+        <XtxGuess ref="guessRef" />
+      </view>
     </view>
   </scroll-view>
 </template>
 
 <style lang="scss">
+// 引入字体图标
+@import '@/styles/fonts.scss';
+
 page {
   height: 100%;
   overflow: hidden;
diff --git a/src/services/common.ts b/src/services/common.ts
new file mode 100644
index 0000000..1bb520e
--- /dev/null
+++ b/src/services/common.ts
@@ -0,0 +1,13 @@
+// 存放路径: src/services/home.ts
+import { http, uploadRequest } from '@/utils/http'
+
+/**
+ * 上传图片接口
+ * @param data
+ */
+export function uploadAtt(filePath: any) {
+  return uploadRequest({
+    url: '/file/upload',
+    filePath: filePath,
+  })
+}
diff --git a/src/services/home.ts b/src/services/home.ts
index f9f8026..4afdeb1 100644
--- a/src/services/home.ts
+++ b/src/services/home.ts
@@ -2,20 +2,6 @@
 import type { BannerItem } from '@/types/home'
 import { http } from '@/utils/http'
 
-/**
- * 首页-广告区域-小程序
- * @param distributionSite 广告区域展示位置（投放位置 投放位置，1为首页，2为分类商品页） 默认是1
- */
-// export const getHomeBannerAPI = (distributionSite = 1) => {
-//   return http<BannerItem[]>({
-//     method: 'GET',
-//     url: '/home/banner',
-//     data: {
-//       distributionSite,
-//     },
-//   })
-// }
-
 // 查询车型
 export const queryList = () => {
   return http({
@@ -73,6 +59,7 @@ export function updStatusRefuse(data: any) {
   })
 }
 
+// 登录接口
 export const loginUser = (data: any) => {
   // 如果index是1 就是登录/找回密码
   return http({
@@ -121,3 +108,28 @@ export const loginRegistered = (data: any) => {
     data,
   })
 }
+
+// 退出登录
+export const logout = () => {
+  return http({
+    method: 'GET',
+    url: `/auth/weiXin/logout`,
+  })
+}
+
+// 用户查询用户头像、昵称、生日等信息
+export function baseInfo() {
+  return http({
+    url: '/system/member/client/baseInfo',
+    method: 'GET',
+  })
+}
+
+// 更新 用户头像、昵称、生日等信息
+export function updateBaseInfo(data: any) {
+  return http({
+    url: '/system/member/client/updateBaseInfo',
+    method: 'POST',
+    data: data,
+  })
+}
diff --git a/src/static/iconfont.css b/src/static/iconfont.css
index 29d4ec2..ec71870 100644
--- a/src/static/iconfont.css
+++ b/src/static/iconfont.css
@@ -30,4 +30,4 @@
 
 .icon-jine:before {
   content: "\e84f";
-}
\ No newline at end of file
+}
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 6900874..3a39be5 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -51,32 +51,48 @@ type Data<T> = {
   msg: string
   data: T
 }
-// 2.2 添加类型，支持泛型
+// 公共请求  2.2 添加类型，支持泛型
 export const http = <T>(options: UniApp.RequestOptions) => {
+  uni.showLoading({
+    title: '加载中...',
+    mask: true,
+  })
   // 1. 返回 Promise 对象
   return new Promise<Data<T>>((resolve, reject) => {
     uni.request({
       ...options,
       // 响应成功
       success(res: any) {
+        uni.hideLoading()
         console.log('500请求错误', res)
         // 状态码 2xx，参考 axios 的设计
         if (res.statusCode >= 200 && res.statusCode < 300) {
           // 2.1 提取核心数据 res.data
-          resolve(res.data as Data<T>)
+          // resolve(res.data as Data<T>)
 
           // ---------------响应是200 但数据内部是500|400----------------------------
           const resList = res.data
 
+          if (resList.code === 200) {
+            // uni.showToast({
+            //   icon: 'none',
+            //   title: '请求成功',
+            // })
+            resolve(res.data as Data<T>)
+            return
+          }
+
           if (resList.code === 401) {
             // 401错误  -> 清理用户信息，跳转到登录页
             uni.showToast({
-              title: resList?.msg || '请求错误',
+              title: '请求错误',
               icon: 'error',
             })
             const memberStore = useMemberStore()
             memberStore.clearProfile()
-            uni.navigateTo({ url: '/pages/login/login' })
+            setTimeout(() => {
+              uni.navigateTo({ url: '/pages/login/OneClickLogin/OneClickLogin' })
+            }, 1000)
             reject(resList)
           } else {
             console.log('500请求错误', res.data)
@@ -97,7 +113,7 @@ export const http = <T>(options: UniApp.RequestOptions) => {
           })
           const memberStore = useMemberStore()
           memberStore.clearProfile()
-          uni.navigateTo({ url: '/pages/login/login' })
+          uni.navigateTo({ url: '/pages/login/OneClickLogin/OneClickLogin' })
           reject(res)
         } else {
           console.log('500请求错误', res.data)
@@ -120,3 +136,25 @@ export const http = <T>(options: UniApp.RequestOptions) => {
     })
   })
 }
+
+// 上传图片接口
+export const uploadRequest = <T>(options: any) => {
+  // 1. 返回 Promise 对象
+  return new Promise((resolve, reject) => {
+    uni.uploadFile({
+      url: baseURL + options.url, // 仅为示例，非真实的接口地址
+      filePath: options.filePath,
+      name: 'file',
+      formData: {
+        user: '',
+      },
+      success: (res) => {
+        resolve(JSON.parse(res.data))
+      },
+      fail: (error) => {
+        console.log('err' + error)
+        reject(error)
+      },
+    })
+  })
+}