登录

src/assets/styles/common.css

@@ -447,6 +447,9 @@ page {
 .q-pl-lg{
 	padding-left: 20px;
 }
+.q-pr-lg{
+	padding-right: 20px;
+}
 .q-py-lg{
 	padding-top: 20px;
 	padding-bottom: 20px;

src/plugins/icon.ts

@@ -145,7 +145,10 @@ import {
   ToBottom,
   PeopleSafe,
   StarOne,
-  CloudStorage
+  CloudStorage,
+  Mail,
+  Wechat,
+  User,
 } from '@icon-park/vue-next'
 
 export interface Icons {
@@ -295,7 +298,10 @@ export const icons: Icons = {
   IconToBottom:ToBottom,
   IconPeopleSafe:PeopleSafe,
   IconStarOne:StarOne,
-  IconCloudStorage:CloudStorage
+  IconCloudStorage:CloudStorage,
+  IconMail:Mail,
+  IconWechat:Wechat,
+  IconUser:User,
 }
 
 export default {

src/services/UserService.ts

@@ -58,9 +58,9 @@ class UserServices {
         return Api.Post("travel_set_signout", msg)
     }
 
-    static async wechatLoginAsync(account: string, code: string, v_token: string, tid: string = ''): Promise<HttpResponse> {
-        let msg = { account, code, v_token, tid }
-        return Api.Post("travel_login_password", msg)
+    static async GetShowQrcode(QrCodeType: string): Promise<HttpResponse> {
+        let msg = { QrCodeType }
+        return Api.Post("Wechat_QrCode_GetShowQrcode", msg)
     }
 
     static async VerifyLoginAsync(account: string, code: string, v_token: string, tid: string = ''): Promise<HttpResponse> {

src/views/Auth/components/passwordLogin.vue

@@ -4,23 +4,25 @@
             <el-input v-model="model.account" placeholder="账号/邮箱" />
         </el-form-item>
         <el-form-item label="" prop="password">
-            <el-input v-model="model.password" type="password" placeholder="密码" autocomplete="new-password" show-password  class="q-mt-lg"/>
+            <el-input v-model="model.password" type="password" placeholder="密码" autocomplete="new-password" show-password/>
         </el-form-item>
-        <el-form-item label="">
-            <div class="row q-mt-lg full-width">
+        <el-form-item label="" v-if="needVerify">
+            <div class="row full-width">
                 <div class="col">
                     <vue-hcaptcha ref="invisibleHcaptcha" sitekey="46e00e53-ddb2-4e7b-9c51-621534c2f1f5" @verify="verifyHandler" 
-                    v-if="needVerify"></vue-hcaptcha>
+                    ></vue-hcaptcha>
                 </div>
-                <el-button link type="primary" @click="redicetToForgot">忘记密码？</el-button>
             </div>
         </el-form-item>
-        <el-form-item>
-            <el-button type="primary" class="full-width q-mb-lg" @click="submitForm(loginFormRef)" :loading="loading">登录</el-button>
+        <el-form-item style="margin-bottom: 8px;">
+            <el-button type="primary" class="full-width" @click="submitForm(loginFormRef)" :loading="loading">登录</el-button>
         </el-form-item>
-        <div class="text-info text-small row flex-center">
-            <span>还没有账号？</span>
-            <el-button link type="primary" class="q-mb-lg" @click="redicetToRegist">立即注册</el-button>
+        <div class="text-info text-small row flex-between">
+            <div class="row items-center">
+                <!-- <span>还没有账号？</span>
+                <el-button link type="primary" @click="redicetToRegist">立即注册</el-button> -->
+            </div>
+            <el-button link type="primary" @click="redicetToForgot">忘记密码？</el-button>
         </div>
     </el-form>
 </template>

src/views/Auth/components/verifyLogin.vue

@@ -24,10 +24,10 @@
         <el-form-item>
             <el-button type="primary" class="full-width q-mb-lg" @click="submitForm(loginFormRef)" :loading="loading">登录</el-button>
         </el-form-item>
-        <div class="text-info text-small row flex-center">
+        <!-- <div class="text-info text-small row flex-center">
             <span>账户/邮箱登录？</span>
             <el-button link type="primary" class="q-mb-lg" @click="passwordLogin">立即登录</el-button>
-        </div>
+        </div> -->
     </el-form>
 </template>
 <script lang="ts" setup>

src/views/Auth/components/wechatLogin.vue

 <template>
-    <div class="wechatLoginForm" v-loading="qrLoading">
-        <!-- <QRCode :value="qrCode" style="width: 13.31vw;height: auto;border: 1px solid #1E3FE7;" v-if="!qrLoading"></QRCode>
-        <QRCode value="http://www.viitto.com" style="width: 13.31vw;height: auto;border: 0.1px solid #1E3FE7;" v-if="qrLoading"></QRCode> -->
-        <QRCode :value="qrCode" style="width: 256px;height: 256px;border: 1px solid #1E3FE7;" v-if="!qrLoading"></QRCode>
-        <QRCode value="http://www.viitto.com" style="width: 256px;height: 256px;border: 1px solid #1E3FE7;" v-if="qrLoading"></QRCode>
+    <div class="wechatLoginForm text-center q-mt-lg" v-loading="qrLoading">
+        <QRCode :value="qrCode" style="width: 159px;height: 159px;border: 1px solid #EBEBEB;" v-if="!qrLoading"></QRCode>
+        <QRCode value="http://www.viitto.com" style="width: 159px;height: 159px;border: 1px solid #EBEBEB;" v-if="qrLoading"></QRCode>
      </div>
-     <div class="text-info text-small row flex-center q-pt-lg">
+     <!-- <div class="text-info text-small row flex-center q-pt-lg">
         <span>账户/邮箱登录？</span>
         <el-button link type="primary" class="q-mb-lg" @click="passwordLogin">立即登录</el-button>
-    </div>
+    </div> -->
 </template>
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'