Browse Source

完善功能·

old
wangqing 5 years ago
parent
commit
486455c843
  1. 5
      src/views/account/login.vue
  2. 5
      src/views/form/write.vue
  3. 2
      vue.config.js

5
src/views/account/login.vue

@ -60,7 +60,8 @@
<el-tab-pane label="账号密码登录" name="account"> <el-tab-pane label="账号密码登录" name="account">
<el-form ref="accountLoginForm" label-position="top" size="small" :model="accountForm" <el-form ref="accountLoginForm" label-position="top" size="small" :model="accountForm"
:rules="accountLoginRules" :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-form-item label="手机号/邮箱登录" prop="account">
<el-input v-model="accountForm.account" placeholder="请输入手机号/邮箱" autocomplete="off" /> <el-input v-model="accountForm.account" placeholder="请输入手机号/邮箱" autocomplete="off" />
@ -223,7 +224,7 @@ export default {
{required: true, trigger: 'blur', message: '请输入邮箱'}, {required: true, trigger: 'blur', message: '请输入邮箱'},
{ {
pattern: /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/, 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}], password: [{required: true, trigger: 'blur', validator: validatePassword}],

5
src/views/form/write.vue

@ -32,7 +32,7 @@
import ProjectForm from './ProjectForm' import ProjectForm from './ProjectForm'
import loadWXJs from '@/utils/loadWxSdk' import loadWXJs from '@/utils/loadWxSdk'
import defaultValue from '@/utils/defaultValue' import defaultValue from '@/utils/defaultValue'
import {getQueryString} from '@/utils' import {getCurrentDomain, getQueryString} from '@/utils'
let wx let wx
@ -75,8 +75,7 @@ export default {
this.queryProjectSettingStatus() this.queryProjectSettingStatus()
this.queryProjectSetting() this.queryProjectSetting()
// //
let url = window.location.href.split(('#'))[0] this.$api.get('/wx/jsapi/signature', {params: {url: getCurrentDomain()}}).then(res => {
this.$api.get('/wx/jsapi/signature', {params: {url: url}}).then(res => {
this.wxSignature = res.data this.wxSignature = res.data
this.setWxConfig() this.setWxConfig()
}) })

2
vue.config.js

@ -59,7 +59,7 @@ module.exports = {
// 开发环境默认开启反向代理,如果不需要请自行注释 // 开发环境默认开启反向代理,如果不需要请自行注释
proxy: { proxy: {
'/tduck-api': { '/tduck-api': {
target: 'http://smalljop.test.utools.club', target: 'http://localhost:8999',
changeOrigin: true changeOrigin: true
} }
} }

Loading…
Cancel
Save