Merge branch 'admin_dev' of http://112.213.107.185:3000/cwg-crm/gypsy-crm-frontend-vu into admin_dev

pages/login/reset.vue

@@ -12,19 +12,22 @@
 
 
       <view class="reset-container">
+        <view class="company u-flex-y u-flex-y-center">
+          <image src="/static/images/logo-full.svg" class="company-icon" mode="widthFix"></image>
+        </view>
         <uni-row class="content">
           <uni-col :span="20" :offset="2" :sm="{ span: 14, offset: 5 }">
             <view class="reset-title">{{ t('pages.login.resetTitle') }}</view>
             <view class="reset-form">
-              <view class="form-label">{{ t('newSignup.item7') }}</view>
-              <uni-easyinput v-model="email" :placeholder="t('forget.form')" class="custom-input">
+              <view class="form-label">{{ t('forget.form') }}</view>
+              <uni-easyinput v-model="email" :placeholder="t('newSignup.item7')" class="custom-input">
               </uni-easyinput>
 
               <view class="reset-button">
                 <button class="btn" block :loading="loading" @click="handleReset">{{ t('forget.forget') }}</button>
               </view>
               <view class="login-link">
-                <text @click="handleLogin" class="link-text">{{ t('signin.login') }}</text>
+                <button @click="handleLogin" class="link-text">{{ t('forget.cancel') }}</button>
               </view>
             </view>
           </uni-col>
@@ -39,7 +42,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import useRouter from '@/hooks/useRouter'
 import { userApi } from '@/api/user'
@@ -110,6 +113,9 @@ function handleLogin() {
 <style scoped lang="scss">
 @import "@/uni.scss";
 
+.company{
+  margin-bottom: px2rpx(24);
+}
 .chat-icon {
   width: px2rpx(50);
   height: px2rpx(50);
@@ -201,6 +207,8 @@ function handleLogin() {
   font-weight: bold;
   color: #141d22;
   margin-bottom: px2rpx(40);
+  width: 100%;
+  text-align: center;
 }
 
 .reset-form {
@@ -230,8 +238,8 @@ function handleLogin() {
     width: 100%;
     height: px2rpx(44);
     line-height: px2rpx(44);
-    border-radius: px2rpx(4);
-    background-color: var(--color-error); // 主题黄
+    border-radius: px2rpx(22);
+    background-color: var(--color-error);
     border: none;
     color: #fff;
     font-size: px2rpx(16);
@@ -252,10 +260,20 @@ function handleLogin() {
   text-align: center;
 
   .link-text {
-    font-size: px2rpx(14);
-    color: #005bbb;
-    cursor: pointer;
-    text-decoration: none;
+    width: 100%;
+    height: px2rpx(44);
+    line-height: px2rpx(44);
+    border-radius: px2rpx(22);
+    background-color: var(--color-white);
+    border: 1px solid #e4e4e4;
+    color: #333;
+    font-size: px2rpx(16);
+    font-weight: 500;
+    margin: 0;
+
+    &::after {
+      border: none;
+    }
   }
 }
 </style>