fix

src/pages/client/clientUser/setting.vue

@@ -3,13 +3,32 @@
     <view class="main-out-box">
       <view class="main-inner-box">
         <u-cell-group :border="false">
-          <u-cell size="large" :border="false" icon="setting-fill" title="个人信息" isLink url="" />
-          <u-cell size="large" :border="false" icon="setting-fill" title="实名认证" isLink url="" />
-          <u-cell size="large" :border="false" icon="setting-fill" title="深色主题" isLink url="" />
-          <u-cell size="large" :border="false" icon="setting-fill" title="关于我们" isLink url="" />
-          <u-cell size="large" :border="false" icon="setting-fill" title="隐私条款" isLink url="" />
-          <u-cell icon="integral-fill" title="版本信息" value="V3.6.9" />
-          <u-cell size="large" :border="false" icon="setting-fill" title="注销账号" isLink url="" />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="account-fill"
+            title="个人信息"
+            isLink
+            url="/pages/client/clientUser/editData"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="github-circle-fill"
+            title="关于我们"
+            isLink
+            url="/pages/client/clientUser/aboutMine"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="file-text-fill"
+            title="用户协议"
+            isLink
+            url=""
+          />
+          <u-cell size="large" :border="false" icon="file-text" title="隐私政策" isLink url="" />
+          <u-cell icon="integral-fill" title="版本信息" value="V0.0.1" />
         </u-cell-group>
       </view>
     </view>
@@ -17,16 +36,58 @@
     <view class="policy-out-box">
       <view class="policy-inner-box">
         <u-cell-group :border="false">
-          <u-cell size="large" :border="false" icon="setting-fill" title="切换身份" isLink url="" />
+          <u-cell size="large" :border="false" icon="level" title="切换身份" isLink url="" />
         </u-cell-group>
       </view>
     </view>
     <view class="exit">
-      <u-button type="primary" shape="circle" text="退出登录" />
+      <u-row class="button" justify="center" align="center">
+        <u-col span="24">
+          <u-button type="info" shape="circle" text="注销账号" :style="{ width: '500rpx' }" />
+        </u-col>
+      </u-row>
+      <u-row class="button" justify="center" align="center">
+        <u-col span="24">
+          <u-button type="primary" shape="circle" text="退出登录" :style="{ width: '500rpx' }" />
+        </u-col>
+      </u-row>
     </view>
   </view>
 </template>
 
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  mounted() {},
+
+  methods: {
+    // 获取当前用户信息
+    handlerInitUserMessage() {
+      maintainUserInfo().then(res => {
+        this.user_info = res.data;
+      });
+    },
+
+    // 点击跳转到全部订单
+    gotoOrder(item) {
+      uni.navigateTo({
+        url: `/pages/client/clientPackage/orderAll?type=${item.type}`,
+      });
+    },
+
+    // 点击跳转到我的收益
+    handlerSkipMyProfit() {
+      uni.navigateTo({
+        url: '/pages/client/clientUser/myProfit',
+      });
+    },
+  },
+};
+</script>
+
 <style lang="scss" scoped>
 .container {
   min-height: 100vh;
@@ -49,6 +110,13 @@
   }
 }
 .exit {
-  padding: 200rpx 16rpx;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.button {
+  margin-top: 35rpx;
 }
 </style>

src/pages/client/tabBar/mine.vue

@@ -2,25 +2,34 @@
   <view class="container">
     <view class="head-wrap">
       <view class="content">
-        <view class="avatar-wrap" @tap="$Router.push('/pages/client/clientUser/personal')">
-          <u-avatar :src="user_info.avatar" size="80"></u-avatar>
+        <view class="avatar-wrap">
+          <u-avatar :src="user_info.avatar" @click="onClickAvatar" size="80"></u-avatar>
+        </view>
+        <view class="user-nickname">
+          <u--text
+            size="18"
+            bold
+            :text="user_info.nickname ? user_info.nickname : 'fadsfdaf'"
+          ></u--text>
+          <u--text size="12" text="欢迎加入车旅程"></u--text>
         </view>
         <view>
           <!-- 已登录 -->
-          <view class="user-base" v-if="user_info.nickname">
-            <view class="user-nickname">{{ user_info.nickname }}</view>
+          <!-- <view class="user-base" v-if="user_info.nickname"> -->
+          <view class="user-base">
             <view class="btn-wrap">
-              <view class="btn-content" @tap="$Router.push('/pages/client/clientUser/setting')">
-                设置
-              </view>
-              <view class="btn-content">认证</view>
+              <u-icon
+                size="30"
+                @tap="$Router.push('/pages/client/clientUser/setting')"
+                name="setting"
+              ></u-icon>
             </view>
           </view>
 
           <!-- 未登录 -->
-          <view class="clickLogin" v-else @tap="$Router.push('/pages/login/index')">
+          <!-- <view class="clickLogin" v-else @tap="$Router.push('/pages/login/index')">
             点击登录/注册
-          </view>
+          </view> -->
         </view>
       </view>
 
@@ -84,7 +93,7 @@
     <!-- 预约列表 -->
     <view class="appointList">
       <u-cell icon="setting-fill" title="预约列表" isLink url="/pages/client/clientUser/appoint" />
-      <u-cell icon="setting-fill" title="我的店铺" isLink  />
+      <u-cell icon="setting-fill" title="我的店铺" isLink />
     </view>
 
     <view class="other-out-box">
@@ -183,13 +192,19 @@ export default {
         {
           id: '2',
           icon: 'setting-fill',
-          title: '关于我们',
-          url: '/pages/client/clientUser/aboutMine',
+          title: '客服中心',
+          url: '/pages/client/clientUser/serviceCenter',
         },
         {
           id: '3',
           icon: 'setting-fill',
-          title: '客服中心',
+          title: '商务合作',
+          url: '/pages/client/clientUser/serviceCenter',
+        },
+        {
+          id: '3',
+          icon: 'setting-fill',
+          title: '意见反馈',
           url: '/pages/client/clientUser/serviceCenter',
         },
       ],
@@ -208,6 +223,9 @@ export default {
       });
     },
 
+    // 点击头像
+    onClickAvatar() {},
+
     // 点击跳转到全部订单
     gotoOrder(item) {
       uni.navigateTo({
@@ -224,6 +242,7 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .container {
   min-height: 100vh;
@@ -232,15 +251,21 @@ export default {
 
 /* 顶部登录 */
 .head-wrap {
-  background-color: #347caf;
+  background-color: #c8c9cc;
   height: 390rpx;
   padding-top: 40rpx;
 
   .content {
     display: flex;
+    justify-content: space-between;
     padding: 38rpx 0 0 36rpx;
     box-sizing: border-box;
 
+    .user-nickname {
+      margin-left: -185rpx;
+      margin-top: 50rpx;
+    }
+
     .clickLogin {
       font-size: 48rpx;
       color: #ffffff;
@@ -259,24 +284,9 @@ export default {
       flex-direction: column;
       justify-content: space-evenly;
 
-      .user-nickname {
-        margin-top: 20rpx;
-        font-size: 40rpx;
-        color: #ffffff;
-      }
-
       .btn-wrap {
         width: 160rpx;
-        margin-top: 20rpx;
-        display: flex;
-        justify-content: space-between;
-
-        .btn-content {
-          font-size: 24rpx;
-          padding: 0 16rpx;
-          border-radius: 16rpx;
-          background-color: #ffffff;
-        }
+        margin-top: 40rpx;
       }
     }
   }

src/pages/login/index.vue

@@ -145,10 +145,11 @@ export default {
 }
 
 .login-logo {
-  width: 300rpx;
-  height: 260rpx;
+  width: 250rpx;
+  height: 250rpx;
   background-color: pink;
   margin-top: 100rpx;
+  margin-bottom: 100rpx;
   image {
     width: 100%;
     height: 100%;