From edde5f8a88d5eec166aed93305d7a4c5b818bd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Thu, 13 Oct 2022 11:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=99=BB=E5=BD=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/launchSettings.json            |   3 +-
 .../yi-sqlsugar-dev.db                        | Bin 221184 -> 229376 bytes
 Yi.Vue3.x.Vant/src/main.ts                    |   2 +
 Yi.Vue3.x.Vant/src/permission.ts              |  47 +--
 Yi.Vue3.x.Vant/src/router/index.ts            |   3 +-
 Yi.Vue3.x.Vant/src/store/modules/user.ts      |   8 +-
 Yi.Vue3.x.Vant/src/utils/myaxios.ts           | 125 +++---
 Yi.Vue3.x.Vant/src/view/login.vue             | 205 +++++-----
 Yi.Vue3.x.Vant/src/view/main/recommend.vue    |   4 +-
 Yi.Vue3.x.Vant/src/view/main/square.vue       | 124 +-----
 Yi.Vue3.x.Vant/src/view/my.vue                | 370 ++++++++++--------
 11 files changed, 421 insertions(+), 470 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Properties/launchSettings.json b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Properties/launchSettings.json
index 07a01e59..d49e5e26 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Properties/launchSettings.json
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Properties/launchSettings.json
@@ -2,7 +2,8 @@
   "profiles": {
     "Yi.Framework.ApiMicroservice": {
       "commandName": "Project",
-      "launchBrowser": true,
+      //开发环境根据情况是否自动启动浏览器，个人感觉开开关关比较麻烦
+      "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 75ca88740a27f0e864cdee7dfa9f3c27c6cbf92a..7db5d9d9be44f02461713c7286dd1189b47f568a 100644
GIT binary patch
delta 3534
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
MHe3#&pHk}o4-kSwZU6uP

delta 108
zcmZo@;A=R*J3)$#=@A11gV{s{J0_+_jR~y@j9U|!mfYuJ<o^v6XE5Uby`66Z(_4OC
zAV)`yi~kFQ1J4$Q>0Azs4by`Xn3FaeD4gP+Uca7^b^FdgOy0uG(k$nvvkNerZ&nnT
M$g=&s2(zI#0O6V-b^rhX

diff --git a/Yi.Vue3.x.Vant/src/main.ts b/Yi.Vue3.x.Vant/src/main.ts
index 4582cc72..324a16a3 100644
--- a/Yi.Vue3.x.Vant/src/main.ts
+++ b/Yi.Vue3.x.Vant/src/main.ts
@@ -1,6 +1,8 @@
 import { createApp } from 'vue'
 import './style.css'
 import 'vant/es/image-preview/style';
+import 'vant/es/toast/style';
+import 'vant/es/dialog/style';
 import router from './router'
 import store from './store'
 import './permission'
diff --git a/Yi.Vue3.x.Vant/src/permission.ts b/Yi.Vue3.x.Vant/src/permission.ts
index 596daa6c..00dae628 100644
--- a/Yi.Vue3.x.Vant/src/permission.ts
+++ b/Yi.Vue3.x.Vant/src/permission.ts
@@ -4,59 +4,44 @@ import router from './router'
 // import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 // import { isHttp } from '@/utils/validate'
-// import { isRelogin } from '@/utils/request'
 import useUserStore from '@/store/modules/user'
+import { isRelogin } from '@/utils/myaxios'
 // import useSettingsStore from '@/store/modules/settings'
 // import usePermissionStore from '@/store/modules/permission'
 
 // NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/square', '/auth-redirect', '/bind', '/register'];
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
 
 router.beforeEach((to, from, next) => {
   // NProgress.start()
   if (getToken()) {
     // to.meta.title && useSettingsStore().setTitle(to.meta.title)
     /* has token*/
-    if (to.path === '/square') {
+    if (to.path === '/login') {
       next({ path: '/' })
       // NProgress.done()
     } else {
-      useUserStore().getInfo();
-      next()
-      // if (useUserStore().roles.length === 0)
-      //  {
-      //   // isRelogin.show = true
-      //   // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
-      //   useUserStore().getInfo().then(() => {
-      //     // isRelogin.show = false
-      //     next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
-      //     // usePermissionStore().generateRoutes().then(accessRoutes => {
-      //     //   // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
-      //     //   accessRoutes.forEach(route => {
-      //     //     if (!isHttp(route.path)) {
-      //     //       router.addRoute(route) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
-      //     //     }
-      //     //   })
-          
-      //     // })
-      //   }).catch(err => {
-      //     useUserStore().logOut().then(() => {
-      //       // ElMessage.error(err)
-      //       next({ path: '/' })
-      //     })
-      //   })
-      // } else {
-      //   next()
-      // }
+      if (useUserStore().roles.length === 0) {
+        isRelogin.show = true
+        useUserStore().getInfo().then((response: any) => {
+          next()
+        });
+
+      }
+      else
+      {
+        next()
+      }
     }
   } else {
+
     // 娌℃湁token
     if (whiteList.indexOf(to.path) !== -1) {
       // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
       next()
     } else {
-      next(`/square?redirect=${to.fullPath}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+      next(`/login?redirect=${to.fullPath}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
       // NProgress.done()
     }
   }
diff --git a/Yi.Vue3.x.Vant/src/router/index.ts b/Yi.Vue3.x.Vant/src/router/index.ts
index 8fb7fea6..4337c530 100644
--- a/Yi.Vue3.x.Vant/src/router/index.ts
+++ b/Yi.Vue3.x.Vant/src/router/index.ts
@@ -2,6 +2,7 @@ import { createWebHistory, createRouter } from 'vue-router';
 import Layout from '@/layout/index.vue';
 
 export const constantRoutes = [
+  
     {
       name:'Layout',
       path: '/',
@@ -45,7 +46,7 @@ export const constantRoutes = [
     },
     {
       path: '/login',
-      component: () => import('@/view/Login.vue'),
+      component: () => import('@/view/login.vue'),
       name: 'Login',
     },
   ];
diff --git a/Yi.Vue3.x.Vant/src/store/modules/user.ts b/Yi.Vue3.x.Vant/src/store/modules/user.ts
index fc5f83a6..2d43fc5e 100644
--- a/Yi.Vue3.x.Vant/src/store/modules/user.ts
+++ b/Yi.Vue3.x.Vant/src/store/modules/user.ts
@@ -24,7 +24,7 @@ const useUserStore = defineStore(
           login(username, password, code, uuid).then(res => {
             setToken(res.data.token);
             this.token = res.data.token;
-            resolve();
+            resolve(res);
           }).catch(error => {
             reject(error)
           })
@@ -37,7 +37,7 @@ const useUserStore = defineStore(
             const res=response.data;
             const user = res.user
             // const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
-    
+            const avatar=""
             if (res.roleCodes && res.roleCodes.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
               this.roles = res.roleCodes
               this.permissions = res.permissionCodes
@@ -63,12 +63,12 @@ const useUserStore = defineStore(
       // 閫�鍑虹郴缁�
       logOut() {
         return new Promise((resolve, reject) => {
-          logout(this.token).then(() => {
+          logout(this.token).then((response) => {
             this.token = ''
             this.roles = []
             this.permissions = []
             removeToken()
-            resolve()
+            resolve(response)
           }).catch(error => {
             reject(error)
           })
diff --git a/Yi.Vue3.x.Vant/src/utils/myaxios.ts b/Yi.Vue3.x.Vant/src/utils/myaxios.ts
index 2da5e11c..b6ad7d08 100644
--- a/Yi.Vue3.x.Vant/src/utils/myaxios.ts
+++ b/Yi.Vue3.x.Vant/src/utils/myaxios.ts
@@ -3,7 +3,10 @@ import axios from 'axios'
 // import vm from '../main'
 import JsonBig from 'json-bigint'
 import { getToken } from '@/utils/auth'
+import { useRouter } from "vue-router";
+import useUserStore from '@/store/modules/user'
 // import VuetifyDialogPlugin from 'vuetify-dialog/nuxt/index';
+export let isRelogin = { show: false };
 const myaxios = axios.create({
         // baseURL:'/'// 
         baseURL: import.meta.env.VITE_APP_BASE_API, // /dev-apis
@@ -35,64 +38,88 @@ myaxios.interceptors.request.use(function(config) {
 
 // 鍝嶅簲鎷︽埅鍣�
 myaxios.interceptors.response.use(async function(response) {
+//鎴愬姛
     const resp = response.data
-    if (resp.code == undefined && resp.message == undefined) {
-        // vm.$dialog.notify.error("閿欒浠ｇ爜锛氭棤锛屽師鍥狅細涓庢湇鍔″櫒澶卞幓杩炴帴", {
-        //     position: "top-right",
-        //     timeout: 5000,
-        // });
-    } else if (resp.code == 401) {
-        // const res = await vm.$dialog.error({
-        //     text: `閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}<br>鏄惁閲嶆柊杩涜鐧诲綍锛焋,
-        //     title: '閿欒',
-        //     actions: {
-        //         'false': '鍙栨秷',
-        //         'true': '璺宠浆'
-        //     }
-        // });
-        // if (res) {
-        //     vm.$router.push({ path: "/login" });
-        // }
+    // if (resp.code == undefined && resp.message == undefined) {
+    //     alert("鐩存帴鐖嗙偢")
+    //     // vm.$dialog.notify.error("閿欒浠ｇ爜锛氭棤锛屽師鍥狅細涓庢湇鍔″櫒澶卞幓杩炴帴", {
+    //     //     position: "top-right",
+    //     //     timeout: 5000,
+    //     // });
+    // } else if (resp.code == 401) {
+    //     alert("鐧诲綍杩囨湡锛侀噸鏂扮櫥褰�");
 
-    } else if (resp.code !== 200) {
-        // vm.$dialog.notify.error(`閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}`, {
-        //     position: "top-right",
-        //     timeout: 5000,
-        // });
-    }
+    //     const router = useRouter();
+    //     router.push({ path:"/login" });
+
+    //     // const res = await vm.$dialog.error({
+    //     //     text: `閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}<br>鏄惁閲嶆柊杩涜鐧诲綍锛焋,
+    //     //     title: '閿欒',
+    //     //     actions: {
+    //     //         'false': '鍙栨秷',
+    //     //         'true': '璺宠浆'
+    //     //     }
+    //     // });
+    //     // if (res) {
+    //     //     vm.$router.push({ path: "/login" });
+    //     // }
+
+    // } else if (resp.code !== 200) {
+    //     // vm.$dialog.notify.error(`閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}`, {
+    //     //     position: "top-right",
+    //     //     timeout: 5000,
+    //     // });
+    // }
 
     // store.dispatch("closeLoad");
     return resp;
 }, async function(error) {
-    // const resp = error.response.data
-    // if (resp.code == undefined && resp.message == undefined) {
-    //     vm.$dialog.notify.error("閿欒浠ｇ爜锛氭棤锛屽師鍥狅細涓庢湇鍔″櫒澶卞幓杩炴帴", {
-    //         position: "top-right",
-    //         timeout: 5000,
-    //     });
-    // } else if (resp.code == 401) {
-    //     const res = await vm.$dialog.error({
-    //         text: `閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}<br>鏄惁閲嶆柊杩涜鐧诲綍锛焋,
-    //         title: '閿欒',
-    //         actions: {
-    //             'false': '鍙栨秷',
-    //             'true': '璺宠浆'
-    //         }
-    //     });
-    //     if (res) {
-    //         vm.$store.dispatch("Logout").then((resp) => {
-    //             vm.$router.push({ path: "/login" });
-    //         });
-    //     }
+//鏈巿鏉冦�佸け璐�
+const resp = error.response.data
 
-    // } else if (resp.code !== 200) {
-    //     vm.$dialog.notify.error(`閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}`, {
-    //         position: "top-right",
-    //         timeout: 5000,
-    //     });
+
+if (resp.code == undefined && resp.message == undefined) {
+    alert("鐩存帴鐖嗙偢")
+    // vm.$dialog.notify.error("閿欒浠ｇ爜锛氭棤锛屽師鍥狅細涓庢湇鍔″櫒澶卞幓杩炴帴", {
+    //     position: "top-right",
+    //     timeout: 5000,
+    // });
+} else if (resp.code == 401) {
+    if (!isRelogin.show) {
+
+     
+
+    alert("鐧诲綍杩囨湡锛侀噸鏂扮櫥褰�");
+    //鐧诲嚭
+    useUserStore().logOut().then(() => {
+        location.href = '/';
+      })
+
+      isRelogin.show = false;
+    }
+    // const router = useRouter();
+    // router.push({ path:"/login" });
+
+    // const res = await vm.$dialog.error({
+    //     text: `閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}<br>鏄惁閲嶆柊杩涜鐧诲綍锛焋,
+    //     title: '閿欒',
+    //     actions: {
+    //         'false': '鍙栨秷',
+    //         'true': '璺宠浆'
+    //     }
+    // });
+    // if (res) {
+    //     vm.$router.push({ path: "/login" });
     // }
 
-    // store.dispatch("closeLoad");
+} else if (resp.code !== 200) {
+    alert("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�")
+    // vm.$dialog.notify.error(`閿欒浠ｇ爜锛�${resp.code}锛屽師鍥狅細${resp.message}`, {
+    //     position: "top-right",
+    //     timeout: 5000,
+    // });
+}
+
     return Promise.reject(error);
 });
 export default myaxios
\ No newline at end of file
diff --git a/Yi.Vue3.x.Vant/src/view/login.vue b/Yi.Vue3.x.Vant/src/view/login.vue
index 7376c6de..6c7f50ff 100644
--- a/Yi.Vue3.x.Vant/src/view/login.vue
+++ b/Yi.Vue3.x.Vant/src/view/login.vue
@@ -1,100 +1,129 @@
 <template>
-
-   <div class="div-top">
- 
-     <span class="title">鍐滃か灞辨硥</span>
-     <br>
-     <span class="subtitle">鍐滃か灞辨硥鏈夌偣鐢�</span>
+  <div class="div-top">
+    <span class="title">鍐滃か灞辨硥</span>
+    <br />
+    <span class="subtitle">鍐滃か灞辨硥鏈夌偣鐢�</span>
   </div>
   <div class="div-bottom">
-   <h5>瀵嗙爜鐧诲綍</h5>
-     <van-field class="van-field-username" v-model="value" label="鐢ㄦ埛" placeholder="璇疯緭鍏ョ敤鎴峰悕" />
-     <van-field class="van-field-password" v-model="value" label="瀵嗙爜" placeholder="璇疯緭鍏ュ瘑鐮�" />
-     <van-button type="primary">杩涘叆鍐滃か灞辨硥</van-button>
-     <p>鍏朵粬鏂瑰紡鐧诲綍<van-icon name="arrow" /></p>
- 
-     <van-row style="margin-top: 6rem;" >
-       <van-col span="24"><p> 绗笁鏂圭櫥褰�</p></van-col>
-       <van-col span="3"></van-col>
-       <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
-       <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
-       <van-col span="6"><van-icon name="like" size="2rem"/></van-col>
-       <van-col span="3"></van-col>
-     </van-row>
- 
+    <h5>瀵嗙爜鐧诲綍</h5>
+    <van-field
+      class="van-field-username"
+      v-model="loginForm.username"
+      label="鐢ㄦ埛"
+      placeholder="璇疯緭鍏ョ敤鎴峰悕"
+    />
+    <van-field
+      class="van-field-password"
+      v-model="loginForm.password"
+      label="瀵嗙爜"
+      placeholder="璇疯緭鍏ュ瘑鐮�"
+    />
+    <van-button type="primary" @click="login">杩涘叆鍐滃か灞辨硥</van-button>
+    <p>鍏朵粬鏂瑰紡鐧诲綍<van-icon name="arrow" /></p>
+
+    <van-row style="margin-top: 6rem">
+      <van-col span="24"><p>绗笁鏂圭櫥褰�</p></van-col>
+      <van-col span="3"></van-col>
+      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
+      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
+      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
+      <van-col span="3"></van-col>
+    </van-row>
   </div>
- 
- 
- 
- 
- 
- </template>
- <script setup lang="ts">
- import {ref} from 'vue';
- const value=ref("")
- 
- </script>
- <style scoped>
- .div-top{
-   background-color: aqua;
-   position:absolute;
-   top: 0;
-   left: 0;
+</template>
+<script setup lang="ts">
+import { ref } from "vue";
+import { useRouter } from "vue-router";
+import useUserStore from "@/store/modules/user";
+import { Toast } from "vant";
+
+const router = useRouter();
+const redirect = ref(undefined);
+const loginForm = ref({
+  username: "cc",
+  password: "123456",
+  rememberMe: false,
+  code: "",
+  uuid: "",
+});
+const userStore = useUserStore();
+const login = () => {
+  // 璋冪敤action鐨勭櫥褰曟柟娉�
+  userStore
+    .login(loginForm.value)
+    .then((response: any) => {
+      Toast({
+        message: response.message,
+        position: "bottom",
+      });
+      router.push({ path: redirect.value || "/" });
+    })
+    .catch((response:any) => {
+      Toast({
+        message: response.message,
+        position: "bottom",
+      });
+      // loading.value = false;
+      // // 閲嶆柊鑾峰彇楠岃瘉鐮�
+      // if (captchaEnabled.value) {
+      //   getCode();
+      // }
+    });
+};
+</script>
+<style scoped>
+.div-top {
+  background-color: aqua;
+  position: absolute;
+  top: 0;
+  left: 0;
   right: 0;
   bottom: 60%;
- 
- }
- .div-bottom{
+}
+.div-bottom {
   background-color: bisque;
-  position:absolute;
-   top: 25%;
-   left: 0;
+  position: absolute;
+  top: 25%;
+  left: 0;
   right: 0;
   bottom: 0;
   border-radius: 3rem 3rem 0rem 0rem;
   padding: 1rem 2rem 2rem 2rem;
- 
+
   /* min-height: 70%; */
- }
- .title{
-   position: absolute;
-   top: 15%;
-   transform: translateX(-50%);
-   font-size: 1.8rem;
-   font-weight: bolder;
- }
- .subtitle
- {
-   transform: translateX(-50%);
-   position: absolute;
-   top: 30%;
-   font-weight:lighter;
- }
- .van-field-username
- {
-   margin-top:2rem;
- }
- .van-field-password
- {
-   margin-top: 1rem;
- }
- h5{
-   text-align: left;
-   font-size: 1.2rem;
-   font-weight: bolder;
- }
- .div-bottom .van-button
- {
-   margin-top: 1rem;
-   width: 100%;
-   border-radius: 0.4rem;
- }
- .div-bottom p{
-   text-align: center;
- 
- };
- .row-bottom{
- 
- 
- }
- </style>
\ No newline at end of file
+}
+.title {
+  position: absolute;
+  top: 15%;
+  transform: translateX(-50%);
+  font-size: 1.8rem;
+  font-weight: bolder;
+}
+.subtitle {
+  transform: translateX(-50%);
+  position: absolute;
+  top: 30%;
+  font-weight: lighter;
+}
+.van-field-username {
+  margin-top: 2rem;
+}
+.van-field-password {
+  margin-top: 1rem;
+}
+h5 {
+  text-align: left;
+  font-size: 1.2rem;
+  font-weight: bolder;
+}
+.div-bottom .van-button {
+  margin-top: 1rem;
+  width: 100%;
+  border-radius: 0.4rem;
+}
+.div-bottom p {
+  text-align: center;
+}
+.row-bottom {
+}
+</style>
\ No newline at end of file
diff --git a/Yi.Vue3.x.Vant/src/view/main/recommend.vue b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
index cd11abd6..3b364a25 100644
--- a/Yi.Vue3.x.Vant/src/view/main/recommend.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
@@ -30,7 +30,7 @@
 
         <van-col class="rowBody" span="24">{{ item.content }}</van-col>
 
-        <van-col
+        <!-- <van-col
           span="8"
           v-for="(image, imageIndex) in item.images"
           :key="imageIndex"
@@ -42,7 +42,7 @@
             :src="url + image"
             radius="5"
           />
-        </van-col>
+        </van-col> -->
 
         <van-col span="24" class="bottomRow">
           <van-grid direction="horizontal" :column-num="3">
diff --git a/Yi.Vue3.x.Vant/src/view/main/square.vue b/Yi.Vue3.x.Vant/src/view/main/square.vue
index f5acd48a..2515880a 100644
--- a/Yi.Vue3.x.Vant/src/view/main/square.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/square.vue
@@ -1,123 +1 @@
-<template>
-  <div class="div-top">
-    <span class="title">鍐滃か灞辨硥</span>
-    <br />
-    <span class="subtitle">鍐滃か灞辨硥鏈夌偣鐢�</span>
-  </div>
-  <div class="div-bottom">
-    <h5>瀵嗙爜鐧诲綍</h5>
-    <van-field
-      class="van-field-username"
-      v-model="loginForm.username"
-      label="鐢ㄦ埛"
-      placeholder="璇疯緭鍏ョ敤鎴峰悕"
-    />
-    <van-field
-      class="van-field-password"
-      v-model="loginForm.password"
-      label="瀵嗙爜"
-      placeholder="璇疯緭鍏ュ瘑鐮�"
-    />
-    <van-button type="primary" @click="login">杩涘叆鍐滃か灞辨硥</van-button>
-    <p>鍏朵粬鏂瑰紡鐧诲綍<van-icon name="arrow" /></p>
-
-    <van-row style="margin-top: 6rem">
-      <van-col span="24"><p>绗笁鏂圭櫥褰�</p></van-col>
-      <van-col span="3"></van-col>
-      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
-      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
-      <van-col span="6"><van-icon name="like" size="2rem" /></van-col>
-      <van-col span="3"></van-col>
-    </van-row>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from "vue";
-import { useRouter } from "vue-router";
-import useUserStore from "@/store/modules/user";
-const router = useRouter();
-const redirect = ref(undefined);
-const loginForm = ref({
-  username: "cc",
-  password: "123456",
-  rememberMe: false,
-  code: "",
-  uuid: "",
-});
-const userStore = useUserStore();
-const login=()=>{
-
- // 璋冪敤action鐨勭櫥褰曟柟娉�
-userStore
-  .login(loginForm.value)
-  .then(() => {
-    alert("鐧诲綍鎴愬姛");
-    router.push({ path: redirect.value || "/" });
-  })
-  .catch(() => {
-    alert("鐧诲綍澶辫触");
-    // loading.value = false;
-    // // 閲嶆柊鑾峰彇楠岃瘉鐮�
-    // if (captchaEnabled.value) {
-    //   getCode();
-    // }
-  }); 
-}
-
-</script>
-<style scoped>
-.div-top {
-  background-color: aqua;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 60%;
-}
-.div-bottom {
-  background-color: bisque;
-  position: absolute;
-  top: 25%;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border-radius: 3rem 3rem 0rem 0rem;
-  padding: 1rem 2rem 2rem 2rem;
-
-  /* min-height: 70%; */
-}
-.title {
-  position: absolute;
-  top: 15%;
-  transform: translateX(-50%);
-  font-size: 1.8rem;
-  font-weight: bolder;
-}
-.subtitle {
-  transform: translateX(-50%);
-  position: absolute;
-  top: 30%;
-  font-weight: lighter;
-}
-.van-field-username {
-  margin-top: 2rem;
-}
-.van-field-password {
-  margin-top: 1rem;
-}
-h5 {
-  text-align: left;
-  font-size: 1.2rem;
-  font-weight: bolder;
-}
-.div-bottom .van-button {
-  margin-top: 1rem;
-  width: 100%;
-  border-radius: 0.4rem;
-}
-.div-bottom p {
-  text-align: center;
-}
-.row-bottom {
-}
-</style>
\ No newline at end of file
+<template>杩欓噷鏄箍鍦�</template>
\ No newline at end of file
diff --git a/Yi.Vue3.x.Vant/src/view/my.vue b/Yi.Vue3.x.Vant/src/view/my.vue
index 78969a13..fe7006e0 100644
--- a/Yi.Vue3.x.Vant/src/view/my.vue
+++ b/Yi.Vue3.x.Vant/src/view/my.vue
@@ -1,211 +1,239 @@
 <template>
+  <van-row class="headRow">
+    <van-col span="2"><van-icon name="scan" size="1.5rem" /></van-col>
+    <van-col span="20"></van-col>
+    <van-col span="2"
+      ><van-icon name="setting-o" size="1.5rem" @click="show = true"
+    /></van-col>
+  </van-row>
 
+  <van-row class="bodyRow">
+    <van-col span="6" class="leftCol">
+      <van-image
+        round
+        width="4rem"
+        height="4rem"
+        src="https://fastly.jsdelivr.net/npm/@vant/assets/cat.jpeg"
+      />
+    </van-col>
+    <van-col span="12" class="title"><span>澶х櫧涓嶅湪瀹�</span></van-col>
+    <van-col span="6" class="subtitle"
+      ><span>涓汉涓婚〉<van-icon name="arrow" /></span
+    ></van-col>
 
+    <van-col span="6" class="bodyCol"
+      ><div><span>6</span><br />鍏虫敞</div></van-col
+    >
+    <van-col span="6" class="bodyCol"
+      ><div><span>3</span><br />绮変笣</div></van-col
+    >
+    <van-col span="6" class="bodyCol"
+      ><div><span>0</span><br />浜烘皵</div></van-col
+    >
+    <van-col span="6" class="bodyCol"
+      ><div><span>3</span><br />閽遍挶</div></van-col
+    >
 
-    <van-row class="headRow">
-        <van-col span="2"><van-icon name="scan" size="1.5rem"/></van-col>
-        <van-col span="20"></van-col>
-        <van-col span="2"><van-icon name="setting-o" size="1.5rem" @click="show=true"/></van-col>
-    </van-row>   
+    <van-col span="24">
+      <van-row class="btnRow">
+        <van-col span="12">
+          <van-button class="btn">
+            <van-icon name="bag" size="1.8rem" /> 鎴戠殑璐墿<van-icon
+              name="arrow"
+              size="1.2rem" /></van-button
+        ></van-col>
 
-    <van-row class="bodyRow">
-        <van-col span="6" class="leftCol">
-          <van-image
-            round
-            width="4rem"
-            height="4rem"
-            src="https://fastly.jsdelivr.net/npm/@vant/assets/cat.jpeg"
-          />
-          </van-col>
-          <van-col span="12" class="title"><span >澶х櫧涓嶅湪瀹�</span></van-col>
-          <van-col span="6" class="subtitle"><span >涓汉涓婚〉<van-icon name="arrow" /></span></van-col>
+        <van-col span="12">
+          <van-button class="btn"
+            ><van-icon name="send-gift" size="1.8rem" />鎴戠殑绛惧埌<van-icon
+              name="arrow"
+              size="1.2rem" /></van-button
+        ></van-col>
+      </van-row>
+    </van-col>
 
+    <AppGrid class="grid" :data="data1"></AppGrid>
+    <AppGrid class="grid" :data="data2"></AppGrid>
+    <AppGrid class="grid" :data="data3"></AppGrid>
+  </van-row>
 
-          <van-col span="6" class="bodyCol"><div><span>6</span><br>鍏虫敞</div></van-col>
-          <van-col span="6" class="bodyCol"><div><span>3</span><br>绮変笣</div></van-col>
-          <van-col span="6" class="bodyCol"><div><span>0</span><br>浜烘皵</div></van-col>
-          <van-col span="6" class="bodyCol"><div><span>3</span><br>閽遍挶</div></van-col>
+  <van-popup
+    v-model:show="show"
+    position="right"
+    :style="{ height: '100%', width: '100%', backgroundColor: '#F8F8F8' }"
+  >
+    <van-nav-bar
+      title="璁剧疆"
+      left-text="杩斿洖"
+      left-arrow
+      @click-left="show = false"
+    />
+    <van-cell-group>
+      <van-cell title="璐︽埛涓庡畨鍏�" is-link />
+      <van-cell title="榛戝悕鍗�" is-link />
+      <van-cell title="鎺ㄩ�佽缃�" is-link />
+      <van-cell title="闅愮绠＄悊" is-link />
+      <van-cell title="閫氱敤璁剧疆" is-link />
+    </van-cell-group>
+    <van-cell-group class="group">
+      <van-cell title="瀹跺涵鍏ラ┗" is-link />
+      <van-cell title="绀惧尯鍏ラ┗" is-link />
+    </van-cell-group>
 
-          <van-col span="24">
-        <van-row class="btnRow">
-            <van-col span="12" >   <van-button class="btn"  > <van-icon name="bag"  size="1.8rem"/> 鎴戠殑璐墿<van-icon name="arrow" size="1.2rem" /></van-button></van-col>
+    <van-cell-group class="group">
+      <van-cell title="娓呯悊缂撳瓨" is-link />
+      <van-cell title="妫�娴嬫洿鏂�" is-link />
+      <van-cell title="鍏充簬鎴戜滑" is-link />
+      <van-cell title="缁欎釜濂借瘎" is-link />
+    </van-cell-group>
 
-            <van-col span="12">   <van-button class="btn"><van-icon name="send-gift" size="1.8rem" />鎴戠殑绛惧埌<van-icon name="arrow" size="1.2rem"/></van-button></van-col>
-        </van-row>
-          </van-col >
-
-
-          <AppGrid class="grid" :data='data1'></AppGrid>
-          <AppGrid class="grid" :data='data2'></AppGrid>
-          <AppGrid class="grid" :data='data3'></AppGrid>
-    </van-row>
-
-    <van-popup v-model:show="show" position="right" :style="{ height:'100%',width:'100%',backgroundColor:'#F8F8F8' }" >
-
-      <van-nav-bar
-  title="璁剧疆"
-  left-text="杩斿洖"
-  left-arrow
-  @click-left="show=false"
-/>
-      <van-cell-group>
-        <van-cell title="璐︽埛涓庡畨鍏�" is-link />
-        <van-cell title="榛戝悕鍗�" is-link />
-        <van-cell title="鎺ㄩ�佽缃�" is-link />
-        <van-cell title="闅愮绠＄悊" is-link />
-        <van-cell title="閫氱敤璁剧疆" is-link />
-      </van-cell-group>
-      <van-cell-group class="group">
-        <van-cell title="瀹跺涵鍏ラ┗" is-link />
-        <van-cell title="绀惧尯鍏ラ┗" is-link />
-      </van-cell-group>
-
-      <van-cell-group class="group">
-        <van-cell title="娓呯悊缂撳瓨" is-link />
-        <van-cell title="妫�娴嬫洿鏂�" is-link />
-        <van-cell title="鍏充簬鎴戜滑" is-link />
-        <van-cell title="缁欎釜濂借瘎" is-link />
-      </van-cell-group>
-
-      <van-button type="danger">閫�鍑虹櫥褰�</van-button>
-    </van-popup>
-    <!-- <van-popup v-model:show="show" position="right">
+    <van-button type="danger" @click="outLog">閫�鍑虹櫥褰�</van-button>
+  </van-popup>
+  <!-- <van-popup v-model:show="show" position="right">
      <div class="body-div"> 鍐呭</div>
       </van-popup> -->
 </template>
 <script setup lang="ts">
-import AppGrid from '@/components/AppGrid.vue'
-import {AppGridData} from '@/type/class/AppGridData.ts'
-import {ref} from 'vue'
-const show=ref<boolean>(false);
-let data1 :AppGridData={
-  head:"涓汉涓績",
-  body:[
-  {
-    title:"鎴戠殑娑堟伅",
-    icon:"comment-o"
-  },
-  {
-    title:"鎴戠殑鑱婂ぉ",
-    icon:"chat-o"
-  },
-  {
-    title:"鎴戠殑鍠滄",
-    icon:"like-o"
-  },
-  {
-    title:"鎴戠殑鍏虫敞",
-    icon:"user-o"
-  },
-]
+import AppGrid from "@/components/AppGrid.vue";
+import { AppGridData } from "@/type/class/AppGridData.ts";
+import { ref } from "vue";
+import { Dialog } from "vant";
+import useUserStore from "@/store/modules/user";
+const show = ref<boolean>(false);
+let data1: AppGridData = {
+  head: "涓汉涓績",
+  body: [
+    {
+      title: "鎴戠殑娑堟伅",
+      icon: "comment-o",
+    },
+    {
+      title: "鎴戠殑鑱婂ぉ",
+      icon: "chat-o",
+    },
+    {
+      title: "鎴戠殑鍠滄",
+      icon: "like-o",
+    },
+    {
+      title: "鎴戠殑鍏虫敞",
+      icon: "user-o",
+    },
+  ],
 };
-let data2 :AppGridData={
-  head:"鍔熻兘",
-  body:[
-  {
-    title:"鎺掕姒�",
-    icon:"medal-o"
-  },
-  {
-    title:"娲诲姩鎶ュ悕",
-    icon:"balance-list-o"
-  },
-  {
-    title:"閽遍挶鍏戞崲",
-    icon:"gem-o"
-  },
-  {
-    title:"鍏ㄧ綉涓婃柊",
-    icon:"gift-card-o"
-  },
-]
+let data2: AppGridData = {
+  head: "鍔熻兘",
+  body: [
+    {
+      title: "鎺掕姒�",
+      icon: "medal-o",
+    },
+    {
+      title: "娲诲姩鎶ュ悕",
+      icon: "balance-list-o",
+    },
+    {
+      title: "閽遍挶鍏戞崲",
+      icon: "gem-o",
+    },
+    {
+      title: "鍏ㄧ綉涓婃柊",
+      icon: "gift-card-o",
+    },
+  ],
 };
-let data3 :AppGridData={
-  head:"鏈嶅姟",
-  body:[
-  {
-    title:"瀹㈡湇",
-    icon:"service-o"
-  },
-  {
-    title:"灏忛粦灞�",
-    icon:"wap-home-o"
-  },
-  {
-    title:"閭�璇峰ソ鍙�",
-    icon:"friends-o"
-  }
-]
+let data3: AppGridData = {
+  head: "鏈嶅姟",
+  body: [
+    {
+      title: "瀹㈡湇",
+      icon: "service-o",
+    },
+    {
+      title: "灏忛粦灞�",
+      icon: "wap-home-o",
+    },
+    {
+      title: "閭�璇峰ソ鍙�",
+      icon: "friends-o",
+    },
+  ],
+};
+const outLog = () => {
+  Dialog.confirm({
+    title: "鎻愮ず",
+    message: "纭畾閫�鍑哄綋鍓嶇敤鎴峰悧锛�",
+  })
+    .then(() => {
+      useUserStore()
+        .logOut()
+        .then((response: any) => {
+          location.href = "/";
+        });
+    })
+    .catch(() => {
+      // on cancel
+    });
 };
 </script>
 <style scoped>
-.grid{
-    width: 100%;
-    margin-top: 1rem;
+.grid {
+  width: 100%;
+  margin-top: 1rem;
 }
-.headRow{
-    padding: 0.5rem 0.5rem 0.5rem 0.5rem;
+.headRow {
+  padding: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
-.bodyRow
-{
-    text-align: left;
-    margin-top: 1.5rem;
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;;
-    padding-bottom: 4rem;
+.bodyRow {
+  text-align: left;
+  margin-top: 1.5rem;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-bottom: 4rem;
 }
 
-.title
-{
-    font-size: 1.5rem;
-    line-height: 4rem;
-}
-.subtitle
-{
+.title {
+  font-size: 1.5rem;
   line-height: 4rem;
-    color:#CBCBCB ;
 }
-.bodyCol{
-    text-align: center;
-    font-size: 1.2rem;
-    margin-top: 1rem;
+.subtitle {
+  line-height: 4rem;
+  color: #cbcbcb;
 }
-.btn{
-    width: 100%;
-    margin: 0;
-    padding: 0;
-    background-color: #FFFFFF;
-    border:none;
-    color: black;
+.bodyCol {
+  text-align: center;
+  font-size: 1.2rem;
+  margin-top: 1rem;
 }
-.btnRow{
-    margin-top: 1.5rem;
-    box-shadow: 0rem 0rem 0.2rem 0.2rem #f3f3f3;
+.btn {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #ffffff;
+  border: none;
+  color: black;
 }
-.btnRow .van-button
-{
+.btnRow {
+  margin-top: 1.5rem;
+  box-shadow: 0rem 0rem 0.2rem 0.2rem #f3f3f3;
+}
+.btnRow .van-button {
   font-size: 1.2rem;
 }
-.van-icon-send-gift
-{
+.van-icon-send-gift {
   margin-right: 0.5rem;
 }
-.btnRow .van-icon-arrow
-{
+.btnRow .van-icon-arrow {
   margin-left: 0.45rem;
 }
-.van-cell
-{
+.van-cell {
   text-align: left;
 }
-.group
-{
-margin-top: 1rem;
+.group {
+  margin-top: 1rem;
 }
-.van-popup .van-button
-{
+.van-popup .van-button {
   width: 90%;
   margin-top: 2rem;
 }
-
 </style>
\ No newline at end of file