圣诞快乐

# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调,短信API更新,首页用户访问量,系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
stivepeim
2020-12-23 15:56:45 +08:00
parent d5fc46a211
commit 099fc3de81
768 changed files with 40200 additions and 46123 deletions

View File

@@ -5,7 +5,7 @@
<el-form ref="formInline" size="small" :model="formInline" :rules="ruleInline" class="login-form"
autocomplete="on" label-position="left">
<div class="title-container">
<h3 class="title">短信账户登录</h3>
<h3 class="title mb15">短信账户登录</h3>
</div>
<el-form-item prop="account">
<el-input
@@ -19,14 +19,14 @@
autocomplete="off"
/>
</el-form-item>
<el-form-item prop="token">
<el-form-item prop="password">
<el-input
:key="passwordType"
ref="token"
v-model="formInline.token"
ref="password"
v-model="formInline.password"
:type="passwordType"
placeholder="密码"
name="token"
name="password"
tabindex="2"
auto-complete="off"
prefix-icon="el-icon-lock"
@@ -38,7 +38,7 @@
<el-button size="mini" :loading="loading" type="primary" style="width:100%;margin-bottom:20px;"
@click="handleSubmit('formInline')">登录
</el-button>
<el-button size="mini" type="text" style="width: 100%;" @click="changeReg">注册账户</el-button>
<el-button size="mini" type="text" style="width: 100%;margin-left: 0" @click="changeReg">注册账户</el-button>
</el-form>
</el-col>
</el-row>
@@ -53,13 +53,13 @@ export default {
return {
formInline: {
account: '',
token: ''
password: ''
},
ruleInline: {
account: [
{ required: true, message: '请输入用户名', trigger: 'blur' }
],
token: [
password: [
{ required: true, message: '请输入密码', trigger: 'blur' }
]
},
@@ -90,12 +90,14 @@ export default {
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid) {
this.loading = true;
configApi(this.formInline).then(async res => {
this.$message.success('登录成功!')
this.$store.dispatch('user/isLogin')
this.$emit('on-Login')
}).catch(res => {
this.$message.error(res.message)
this.loading = false;
}).catch(()=>{
this.loading = false;
})
} else {
return false