|
@@ -1,11 +1,11 @@
|
|
<template>
|
|
<template>
|
|
<view class="login-wrap">
|
|
<view class="login-wrap">
|
|
<view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view>
|
|
<view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view>
|
|
- <image src="../../static/logo-h.png" class="logo"></image>
|
|
|
|
|
|
+ <image src="../../static/logo.jpg" class="logo"></image>
|
|
<form class="login-form" @submit="formSubmit">
|
|
<form class="login-form" @submit="formSubmit">
|
|
<view class="form-item">
|
|
<view class="form-item">
|
|
<u-icon size="34" color="#999" name="account"></u-icon>
|
|
<u-icon size="34" color="#999" name="account"></u-icon>
|
|
- <input v-model="form.username" class="item-inp" name="username" type="number" maxlength="11" placeholder="请输入用户名" />
|
|
|
|
|
|
+ <input v-model="form.loginName" class="item-inp" name="loginName" type="number" maxlength="11" placeholder="请输入用户名" />
|
|
</view>
|
|
</view>
|
|
<view class="form-item">
|
|
<view class="form-item">
|
|
<u-icon size="34" color="#999" name="lock"></u-icon>
|
|
<u-icon size="34" color="#999" name="lock"></u-icon>
|
|
@@ -13,14 +13,8 @@
|
|
</view>
|
|
</view>
|
|
<view class="flex-box" style="margin-top: 60upx;">
|
|
<view class="flex-box" style="margin-top: 60upx;">
|
|
<view class="remember-pass">
|
|
<view class="remember-pass">
|
|
- <checkbox-group @change="rememberChange">
|
|
|
|
- <label>
|
|
|
|
- <checkbox value="true" :checked="isRemember" class="login-form-checkbox" />
|
|
|
|
- <text>记住密码</text>
|
|
|
|
- </label>
|
|
|
|
- </checkbox-group>
|
|
|
|
|
|
+ <u-checkbox v-model="isRemember" value="true" :size="30" :label-size="26" active-color="#2ab4e5" class="login-form-checkbox" @change="rememberChange">记住密码</u-checkbox>
|
|
</view>
|
|
</view>
|
|
- <!-- <view class="forget-pass" @click="forgetPass">忘记密码</view> -->
|
|
|
|
</view>
|
|
</view>
|
|
<view class="form-btn-con">
|
|
<view class="form-btn-con">
|
|
<button class="form-btn" form-type="submit">登录</button>
|
|
<button class="form-btn" form-type="submit">登录</button>
|
|
@@ -28,13 +22,8 @@
|
|
</view>
|
|
</view>
|
|
</form>
|
|
</form>
|
|
<view class="authUserYs">
|
|
<view class="authUserYs">
|
|
- <checkbox-group @change="authuserChange">
|
|
|
|
- <label>
|
|
|
|
- <checkbox value="true" :checked="isAuthuserYs" class="login-form-checkbox" />
|
|
|
|
- 登录代表同意
|
|
|
|
- <text @click="toYsPage()">章鱼车管家用户协议及隐私保护政策</text>
|
|
|
|
- </label>
|
|
|
|
- </checkbox-group>
|
|
|
|
|
|
+ <u-checkbox v-model="isAuthuserYs" value="true" :size="30" :label-size="26" active-color="#2ab4e5" class="login-form-checkbox" @change="authuserChange">登录代表同意</u-checkbox>
|
|
|
|
+ <text @click="toYsPage()" style="vertical-align: text-top;font-size: 26rpx;text-decoration: underline;">乐色助手用户协议及隐私保护政策</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
@@ -49,13 +38,13 @@ export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
form: {
|
|
form: {
|
|
- username: this.$store.state.vuex_user.account,
|
|
|
|
|
|
+ loginName: this.$store.state.vuex_user.account,
|
|
password: this.$store.state.vuex_user.password
|
|
password: this.$store.state.vuex_user.password
|
|
},
|
|
},
|
|
isRemember: true, // 是否记住密码
|
|
isRemember: true, // 是否记住密码
|
|
isAuthuserYs: false, // 是否同意隐私政策
|
|
isAuthuserYs: false, // 是否同意隐私政策
|
|
envTips: '',
|
|
envTips: '',
|
|
- buildType: ''
|
|
|
|
|
|
+ buildType: '',
|
|
};
|
|
};
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
@@ -82,6 +71,22 @@ export default {
|
|
//#endif
|
|
//#endif
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 获取微信login code
|
|
|
|
+ getWechatCode(){
|
|
|
|
+ const _this = this
|
|
|
|
+ wx.login({
|
|
|
|
+ success (res) {
|
|
|
|
+ if (res.code) {
|
|
|
|
+ //发起网络请求
|
|
|
|
+ let formData = JSON.parse(JSON.stringify(_this.form))
|
|
|
|
+ formData.code = res.code
|
|
|
|
+ _this.submitForm(formData)
|
|
|
|
+ } else {
|
|
|
|
+ console.log('登录失败,点击“登录”重试!' + res.errMsg)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 安卓版本更新
|
|
// 安卓版本更新
|
|
AndroidCheckUpdate(){
|
|
AndroidCheckUpdate(){
|
|
let _this = this
|
|
let _this = this
|
|
@@ -126,11 +131,11 @@ export default {
|
|
formSubmit() {
|
|
formSubmit() {
|
|
const _this = this;
|
|
const _this = this;
|
|
// 表单校验
|
|
// 表单校验
|
|
- if (_this.form.username == '') {
|
|
|
|
|
|
+ if (_this.form.loginName == '') {
|
|
uni.showToast({ icon: 'none', title: '请输入用户名' });
|
|
uni.showToast({ icon: 'none', title: '请输入用户名' });
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (!isvalidPhone(_this.form.username)) {
|
|
|
|
|
|
+ if (!isvalidPhone(_this.form.loginName)) {
|
|
uni.showToast({ icon: 'none', title: '请输入正确的手机号码' });
|
|
uni.showToast({ icon: 'none', title: '请输入正确的手机号码' });
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -149,27 +154,37 @@ export default {
|
|
uni.showLoading({
|
|
uni.showLoading({
|
|
title: '正在登录...'
|
|
title: '正在登录...'
|
|
});
|
|
});
|
|
|
|
+ // #ifdef MP-WEIXIN
|
|
|
|
+ // 获取微信login code
|
|
|
|
+ this.getWechatCode()
|
|
|
|
+ // #endif
|
|
|
|
+ // #ifndef MP-WEIXIN
|
|
|
|
+ this.submitForm(_this.form)
|
|
|
|
+ // #endif
|
|
|
|
+ },
|
|
|
|
+ submitForm(formData){
|
|
|
|
+ const _this = this;
|
|
// 登录
|
|
// 登录
|
|
- login(_this.form).then(ret => {
|
|
|
|
|
|
+ login(formData).then(res => {
|
|
uni.hideLoading();
|
|
uni.hideLoading();
|
|
- let res = ret.data ? ret.data : ret;
|
|
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
- _this.$u.vuex('vuex_token', 'Bearer ' + res.access_token);
|
|
|
|
- _this.$u.vuex('vuex_userData', _this.fiterAuthCode(res.auth_user));
|
|
|
|
- getApp().globalData.token = 'Bearer ' + res.access_token;
|
|
|
|
|
|
+ _this.$u.vuex('vuex_token', res.data);
|
|
|
|
+ // _this.$u.vuex('vuex_userData', _this.fiterAuthCode(res.auth_user));
|
|
|
|
+ getApp().globalData.token = res.data;
|
|
//登录成功将用户名密码存储到用户本地
|
|
//登录成功将用户名密码存储到用户本地
|
|
if (_this.isRemember) {
|
|
if (_this.isRemember) {
|
|
//用户勾选“记住密码”
|
|
//用户勾选“记住密码”
|
|
- _this.$u.vuex('vuex_user.account', _this.form.username);
|
|
|
|
|
|
+ _this.$u.vuex('vuex_user.account', _this.form.loginName);
|
|
_this.$u.vuex('vuex_user.password', _this.form.password);
|
|
_this.$u.vuex('vuex_user.password', _this.form.password);
|
|
} else {
|
|
} else {
|
|
//用户没有勾选“记住密码”
|
|
//用户没有勾选“记住密码”
|
|
_this.$u.vuex('vuex_user.account', '');
|
|
_this.$u.vuex('vuex_user.account', '');
|
|
_this.$u.vuex('vuex_user.password', '');
|
|
_this.$u.vuex('vuex_user.password', '');
|
|
- _this.form.username = '';
|
|
|
|
|
|
+ _this.form.loginName = '';
|
|
_this.form.password = '';
|
|
_this.form.password = '';
|
|
}
|
|
}
|
|
uni.setStorageSync('loginTimeOut', 'NO');
|
|
uni.setStorageSync('loginTimeOut', 'NO');
|
|
|
|
+ console.log('登陆成功')
|
|
_this.toMain();
|
|
_this.toMain();
|
|
} else {
|
|
} else {
|
|
uni.showToast({ icon: 'none', title: res.message });
|
|
uni.showToast({ icon: 'none', title: res.message });
|
|
@@ -177,9 +192,10 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
toMain() {
|
|
toMain() {
|
|
|
|
+ console.log('跳转')
|
|
// 跳转到首页
|
|
// 跳转到首页
|
|
- uni.redirectTo({
|
|
|
|
- url: '/pages/index'
|
|
|
|
|
|
+ uni.switchTab({
|
|
|
|
+ url: '/pages/index/index'
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// 申请试用
|
|
// 申请试用
|
|
@@ -191,21 +207,23 @@ export default {
|
|
// 忘记密码
|
|
// 忘记密码
|
|
forgetPass() {
|
|
forgetPass() {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: '/pages/login/forget-pass?username=' + this.form.username
|
|
|
|
|
|
+ url: '/pages/login/forget-pass?username=' + this.form.loginName
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// 判断是否记住密码
|
|
// 判断是否记住密码
|
|
rememberChange(e) {
|
|
rememberChange(e) {
|
|
- this.isRemember = e.detail.value.length > 0;
|
|
|
|
|
|
+ this.isRemember = e.value;
|
|
|
|
+ // this.isRemember = e.detail.value.length > 0;
|
|
},
|
|
},
|
|
// 隐私
|
|
// 隐私
|
|
authuserChange(e) {
|
|
authuserChange(e) {
|
|
- this.isAuthuserYs = e.detail.value.length > 0;
|
|
|
|
|
|
+ this.isAuthuserYs = e.value;
|
|
|
|
+ // this.isAuthuserYs = e.detail.value.length > 0;
|
|
this.$u.vuex('vuex_isUsrAuthYs', this.isAuthuserYs);
|
|
this.$u.vuex('vuex_isUsrAuthYs', this.isAuthuserYs);
|
|
},
|
|
},
|
|
toYsPage() {
|
|
toYsPage() {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: '/pages/login/userAuthYs'
|
|
|
|
|
|
+ url: '/pages/agreement/agreement'
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|