From fba84d4581d3c68d5938d0460883551499a59d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 10 Nov 2022 23:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E5=92=8C?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/user/Login.vue    | 10 ++++++----
 jshERP-web/src/views/user/Register.vue | 14 +++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index b9dd1ab8..4a17e2b3 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -7,7 +7,7 @@
           size="large"
           v-decorator="['loginName',{initialValue:'', rules: validatorRules.loginName.rules}]"
           type="text"
-          @focus="initWeixin"
+          @mouseover="initWeixin"
           placeholder="请输入用户名">
           <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
         </a-input>
@@ -18,6 +18,7 @@
           v-decorator="['password',{initialValue:'', rules: validatorRules.password.rules}]"
           size="large"
           type="password"
+          @mouseover="initWeixin"
           autocomplete="false"
           placeholder="密码">
           <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
@@ -38,6 +39,7 @@
           htmlType="submit"
           class="login-button"
           :loading="loginBtn"
+          @mouseover="initWeixin"
           @click.stop.prevent="handleSubmit"
           :disabled="loginBtn">确定
         </a-button>
@@ -48,13 +50,13 @@
           <a-col>
             © 2015-2030 {{systemTitle}} - Powered By
             <a style="color:#00458a;" :href="systemUrl" target="_blank">官方网站</a>
-            <span v-if="showWeixinSpan()" class="weixin" @mouseover="showWeixin" @click="changeWeixinStatus">微信小程序</span>
           </a-col>
         </a-row>
       </div>
 
-      <div v-if="showWeixinFlag" style="text-align: center; padding-top: 10px;">
-        <img src="/static/weixin.jpg" style="width:258px" />
+      <div v-if="showWeixinFlag" style="text-align: center; padding-top: 20px;">
+        <img src="/static/weixin.jpg" style="width:160px" />
+        <div style="font-size:16px;padding-top:10px;font-weight:bold">欢迎【扫一扫】<br/>{{systemTitle}}微信小程序</div>
       </div>
     </a-form>
   </div>
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index 60fd0267..2cbb37a9 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -5,7 +5,8 @@
       <a-form-item
         fieldDecoratorId="username"
         :fieldDecoratorOptions="{rules: [{ required: true, message: '用户名不能为空'}, { validator: this.handleUserName}], validateTrigger: ['change', 'blur'], validateFirst: true}">
-        <a-input size="large" type="text" @focus="initWeixin" autocomplete="false" placeholder="请输入用户名"></a-input>
+        <a-input size="large" type="text" @focus="initWeixin" @mouseover="initWeixin" autocomplete="false"
+                 placeholder="请输入用户名"></a-input>
       </a-form-item>
 
       <a-popover placement="rightTop" trigger="click" :visible="state.passwordLevelChecked">
@@ -21,7 +22,8 @@
         <a-form-item
           fieldDecoratorId="password"
           :fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePasswordLevel }], validateTrigger: ['change', 'blur'], validateFirst: true}">
-          <a-input size="large" type="password" @click="handlePasswordInputClick" autocomplete="false" placeholder="至少6位密码，区分大小写"></a-input>
+          <a-input size="large" type="password" @click="handlePasswordInputClick" @mouseover="initWeixin"
+                   autocomplete="false" placeholder="至少6位密码，区分大小写"></a-input>
         </a-form-item>
       </a-popover>
 
@@ -40,6 +42,7 @@
               size="large"
               type="text"
               default-value=""
+              @mouseover="initWeixin"
               placeholder="请输入验证码">
               <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
             </a-input>
@@ -58,6 +61,7 @@
           htmlType="submit"
           class="register-button"
           :loading="registerBtn"
+          @mouseover="initWeixin"
           @click.stop.prevent="handleSubmit"
           :disabled="registerBtn">注册租户
         </a-button>
@@ -69,13 +73,13 @@
           <a-col>
             © 2015-2030 {{systemTitle}} - Powered By
             <a style="color:#00458a;" :href="systemUrl" target="_blank">官方网站</a>
-            <span v-if="showWeixinSpan()" class="weixin" @mouseover="showWeixin" @click="changeWeixinStatus">微信小程序</span>
           </a-col>
         </a-row>
       </div>
 
-      <div v-if="showWeixinFlag" style="text-align: center; padding-top: 10px;">
-        <img src="/static/weixin.jpg" style="width:258px" />
+      <div v-if="showWeixinFlag" style="text-align: center; padding-top: 20px;">
+        <img src="/static/weixin.jpg" style="width:160px" />
+        <div style="font-size:16px;padding-top:10px;font-weight:bold">欢迎【扫一扫】<br/>{{systemTitle}}微信小程序</div>
       </div>
     </a-form>
   </div>