Update style

nbtca · Nov 11, 2023 · 878cef2 · 878cef2
1 parent 7563cf8
commit 878cef2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/views/CallbackView.vue b/src/views/CallbackView.vue
@@ -107,7 +107,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="p-3 h-full bg-systemBackground-lightSecondary">
+  <div class="p-6 h-full w-full bg-systemBackground-lightSecondary">
     <p v-if="isLoading">页面跳转中。。。</p>
     <p v-if="authenticateFailed">认证失败，跳转至登入页面。</p>
     <div v-if="needBindMember" class="flex flex-col items-center justify-center h-full">

diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
@@ -24,7 +24,7 @@
         />
         <button class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md" type="submit">登入</button>
       </form> -->
-      <!-- <button
+      <button
         class="w-full btn bg-gradient-to-b from-primary/80 to-primary text-primaryContent shadow-md mt-10 w-84"
         type="submit"
         @click="onSighInWithLogto"
@@ -33,7 +33,7 @@
           <img src="../../assets/images/logto.svg" alt="" class="h-6 w-6" />
           <div>登入</div>
         </div>
-      </button> -->
+      </button>
     </div>
   </div>
 </template>
@@ -46,6 +46,7 @@ import md5 from "blueimp-md5"
 import MemberService from "@/services/member"
 import { useAccountStore } from "@/stores/account"
 import { useLogto } from "@logto/vue"
+import { convertToObject } from "typescript"
 
 const store = useAccountStore()
 
@@ -58,7 +59,7 @@ const isPasswordValid = ref("")
 
 const { signIn, isAuthenticated } = useLogto()
 const onSighInWithLogto = () => {
-  signIn(import.meta.env.VITE_LOGTO_CALLBACK_URL)
+  return signIn(import.meta.env.VITE_LOGTO_CALLBACK_URL)
 }
 
 const login = async () => {
@@ -98,7 +99,11 @@ const login = async () => {
     // console.log(error.response.data)
   }
 }
-onMounted(() => {
-  onSighInWithLogto()
-})
+// onMounted(() => {
+//   try {
+//     onSighInWithLogto()
+//   } catch (error) {
+//     console.log(error)
+//   }
+// })
 </script>
diff --git a/src/views/Login/LoginRegister.vue b/src/views/Login/LoginRegister.vue
@@ -77,7 +77,7 @@ onMounted(() => {
 })
 </script>
 <template>
-  <div class="flex flex-col items-center justify-center h-full p-4 bg-ligth-se">
+  <div class="flex flex-col items-center justify-center h-full w-full p-4 bg-systemBackground-lightSecondary">
     <div class="pb-10 text-lg flex flex-col items-center">
       <div class="text-2xl font-bold">在你可以使用维修平台之前，我们需要收集你的一些信息</div>
       <div class="mt-4">这些信息会被用来验证你的身份,请认真填写</div>