From 486455c84329b960eee593f9b55378883b274ba2 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Mon, 7 Dec 2020 18:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/login.vue | 5 +++--
 src/views/form/write.vue    | 5 ++---
 vue.config.js               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index b3e9171..3daf79e 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -60,7 +60,8 @@
                     <el-tab-pane label="账号密码登录" name="account">
                         <el-form ref="accountLoginForm" label-position="top" size="small" :model="accountForm"
                                  :rules="accountLoginRules"
-                                 class="account-login-form" status-icon hide-required-asterisk
+                                 class="account-login-form"
+                                 status-icon hide-required-asterisk @key.enter.native="loginHandle"
                         >
                             <el-form-item label="手机号/邮箱登录" prop="account">
                                 <el-input v-model="accountForm.account" placeholder="请输入手机号/邮箱" autocomplete="off" />
@@ -223,7 +224,7 @@ export default {
                     {required: true, trigger: 'blur', message: '请输入邮箱'},
                     {
                         pattern: /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/,
-                        message: '请输入正确的邮箱'
+                        message: '请输入正确的邮箱,多个使用;分隔'
                     }
                 ],
                 password: [{required: true, trigger: 'blur', validator: validatePassword}],
diff --git a/src/views/form/write.vue b/src/views/form/write.vue
index 6a2d8db..5d8f191 100644
--- a/src/views/form/write.vue
+++ b/src/views/form/write.vue
@@ -32,7 +32,7 @@
 import ProjectForm from './ProjectForm'
 import loadWXJs from '@/utils/loadWxSdk'
 import defaultValue from '@/utils/defaultValue'
-import {getQueryString} from '@/utils'
+import {getCurrentDomain, getQueryString} from '@/utils'
 
 let wx
 
@@ -75,8 +75,7 @@ export default {
         this.queryProjectSettingStatus()
         this.queryProjectSetting()
         //加载微信相关 获取签名
-        let url = window.location.href.split(('#'))[0]
-        this.$api.get('/wx/jsapi/signature', {params: {url: url}}).then(res => {
+        this.$api.get('/wx/jsapi/signature', {params: {url: getCurrentDomain()}}).then(res => {
             this.wxSignature = res.data
             this.setWxConfig()
         })
diff --git a/vue.config.js b/vue.config.js
index 8be63b1..493edc9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -59,7 +59,7 @@ module.exports = {
         // 开发环境默认开启反向代理，如果不需要请自行注释
         proxy: {
             '/tduck-api': {
-                target: 'http://smalljop.test.utools.club',
+                target: 'http://localhost:8999',
                 changeOrigin: true
             }
         }