Skip to content

C
cxerpapp
Commit 6b99c952 authored by 李苏's avatar 李苏 💬
Browse files
Options

调整

parent 79a25025
Hide whitespace changes
Inline Side-by-side
Showing with 446 additions and 20 deletions
common/router/index.js
View file @ 6b99c952
...@@ -10,7 +10,7 @@ const router = new Router({ ...@@ -10,7 +10,7 @@ const router = new Router({
routes: [...modules]//路由表 routes: [...modules]//路由表
}); });
console.log(router) console.log(router)
const whiteList = ['/pages/login/login'] const whiteList = ['/pages/login/login','/pages/login/cusmerLogin']
//全局路由前置守卫 //全局路由前置守卫
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
console.log(from) console.log(from)
......
common/router/modules/routes.js
View file @ 6b99c952
...@@ -324,6 +324,15 @@ const routes = [ ...@@ -324,6 +324,15 @@ const routes = [
title: '收发汇总明细查询', title: '收发汇总明细查询',
}, },
}, },
// 云erp
{
path: '/pages/login/cusmerLogin',
name: 'cusmerLogin',
meta: {
title: 'erplogin',
},
}
//
] ]
export default routes export default routes
\ No newline at end of file
pages.json
View file @ 6b99c952
{ {
"pages": [ "pages": [
// 云erp
{
"path": "pages/login/cusmerLogin",
"style": {}
},
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": {} "style": {}
......
pages/login/cusmerLogin.vue 0 → 100644
View file @ 6b99c952
<template >
<view class="zai-box dtxg" style="height: 100vh;">
<scroll-view scroll-y class="page">
<view class="text-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]">
<image src="http://119.3.92.249:18080/dmg/images/logo.ico" mode='aspectFit' class="zai-logo "></image>
<view class="zai-title text-shadow" style="margin-top: -20px;color: #FFFFFF;font-size:25px;">格物云ERP系统</view>
</view>
<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
<block v-if="loginWay==1">
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
<input placeholder="请输入账号" name="input" v-model="userName"></input>
</view>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
<view class="action text-lg">
<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
</view>
</view>
<view class="padding text-right" style="color: #EEEEEE;">
</view>
<view class="padding text-center ">
<button style="width: 100%;" class="cu-btn bg-blue lg margin-right shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@tap="onLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
</button>
<!-- <button class="cu-btn line-blue lg margin-left shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@tap="loginWay=3-loginWay">短信登录
</button> -->
</view>
</block>
<block v-else>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-mobile margin-right-xs"></text>手机号:</view>
<input placeholder="请输入手机号" type="number" maxlength="11" v-model="phoneNo"></input>
</view>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-lock margin-right-xs"></text>验证码:</view>
<input class="uni-input" placeholder="请输入验证码" v-model="smsCode"/>
<view class="action">
<button class="cu-btn line-blue sm" :disabled="!isSendSMSEnable" @click="onSMSSend"> {{ getSendBtnText }}</button>
</view>
</view>
<view class="padding text-center margin-top">
<button class="cu-btn bg-blue lg margin-right shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@tap="onSMSLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
</button>
<button class="cu-btn line-blue lg margin-left shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@tap="loginWay=1">账户登录
</button>
</view>
</block>
<!-- #ifdef APP-PLUS -->
<view class="padding flex flex-direction text-center">
当前版本:{{version}}
</view>
<!-- #endif -->
</view>
</scroll-view>
<!-- 登录加载弹窗 -->
<view class="cu-load load-modal" v-if="loading">
<!-- <view class="cuIcon-emojifill text-orange"></view> -->
<!-- <image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round"></image> -->
<view class="gray-text">登录中...</view>
</view>
<view @tap="changErp()" style="position: absolute;bottom: 20px;right: 10px;text-decoration:underline">
切换到格物erp登录
</view>
</view>
</template>
<script>
import md5 from '../../common/util/md5.js'
import { ACCESS_TOKEN,USER_NAME,USER_INFO } from "@/common/util/constants"
import { mapActions } from "vuex"
import configService from '@/common/service/config.service.js';
import http from '@/common/service/service.js';
export default {
data() {
return {
// 服务器——端口号
fwq:"",
dkh:"",
shape:'',//round 圆形
loading: false,
userName: '',
password: '',
phoneNo: '',
smsCode: '',
showPassword: false, //是否显示明文
loginWay: 1, //1: 账密，2：验证码
smsCountDown: 0,
loginurl:'',
smsCountInterval: null,
toggleDelay: false,
version:'',
//第三方登录相关信息
thirdType:"",
thirdLoginInfo:"",
thirdLoginState:false,
bindingPhoneModal:false,
loginBz:false,
thirdUserUuid:'',
url: {
bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
}
};
},
onLoad:function(da){
if(da&&da.query){
let infor=JSON.parse(da.query).infor
this.userName=infor.userName
this.password=infor.password
}
var that=this
uni.getStorage({
key:'userName',
success:function(e){
that.userName=e.data
},
fail() {
console.log("获取失败，请手动输入")
}
})
uni.getStorage({
key:'password',
success:function(e){
that.password=e.data
},
fail() {
console.log("获取失败，请手动输入")
}
})
// #ifdef APP-PLUS
var that=this
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
that.version=wgtinfo.version
});
// #endif
},
watch:{
loginBz:function(val){
let _this =this;
http.config.baseUrl = "http://192.168.20.214:9090/erp";
if(val){
this.$http.post(this.loginurl,{}).then((resp) => {
if(resp.data.success){
console.log("success")
uni.setStorage({
key: 'userid',
data: resp.data.data.userid,
success: function () {
console.log(resp.data.data.userid);
}
});
uni.setStorage({
key: 'username',
data: resp.data.data.username,
success: function () {
console.log(resp.data.data.username);
}
});
uni.setStorage({
key: 'ACCESS_TOKEN',
data: resp.data.data.token,
success: function () {
console.log(resp.data.data.token)
}
});
// 本地存储信息
uni.setStorage({
key: 'userName',
data: _this.userName,
success: function () {
console.log("用户名获取成功")
}
});
uni.setStorage({
key: 'password',
data: _this.password,
success: function () {
console.log("用户名获取成功")
}
});
//ACCESS_TOKEN
this.$tip.success('登录成功!')
this.$Router.replaceAll({name:'index'})
// #ifdef APP-PLUS
// this.saveClientId()
// #endif
// #ifndef APP-PLUS
this.$tip.success('登录成功!')
this.$Router.replaceAll({name:'index'})
// #endif
}else{
this.$tip.alert(resp.data.message||"登录失败");
}
})
}
}
},
computed: {
isSendSMSEnable() {
return this.smsCountDown <= 0 && this.phoneNo.length > 4;
},
getSendBtnText() {
if (this.smsCountDown > 0) {
return this.smsCountDown + '秒后发送';
} else {
return '发送验证码';
}
},
canSMSLogin() {
return this.userName.length > 4 && this.smsCode.length > 4;
},
canPwdLogin() {
return this.userName.length > 4 && this.password.length > 4;
},
},
methods: {
...mapActions([ "mLogin","PhoneLogin","ThirdLogin" ]),
changErp(){
this.$Router.replaceAll({name:'login'})
},
gofwqsz(){
this.$Router.push({
path: '/pages/login/fwqsz', query:{
infor:{
userName:this.userName,
password:this.password
}
},
})
},
onLogin: function (){
// http.config.baseUrl='http://'+this.fwq+'/'+this.dkh
let _this=this;
http.config.baseUrl = "http://192.168.20.214:9080/"
if(!this.userName || this.userName.length==0){
this.$tip.toast('请填写用户名');
return;
}
if(!this.password || this.password.length==0){
this.$tip.toast('请填写密码');
return;
}
let loginParams = {
username: this.userName.toLowerCase(),
password: this.password,
encodePWD:md5(this.userName.toLowerCase() + "USER" + this.password + "PASSWORD")
}
let params={
userid: loginParams.username,
password: loginParams.encodePWD,
newPassword:md5(this.password)
}
this.loading=true;
setTimeout(()=>{
if(this.loading==true){
this.loading=false
this.$tip.toast('请检查网络，或服务器设置');
}
},3000)
this.$http.post("/erp/clouderp/cusmer/login",params).then((resp) => {
if(resp.data.success){
this.loginBz=true;
this.loginurl =resp.data.data.records+"&&tp='1'";
}else{
this.$tip.alert(resp.data.message||"请求失败");
}
})
},
saveClientId(){
var info = plus.push.getClientInfo();
var cid = info.clientid;
this.$http.get("/sys/user/saveClientId",{params:{clientId:cid}}).then(res=>{
console.log("res::saveClientId>",res)
this.$tip.success('登录成功!')
this.$Router.replaceAll({name:'index'})
})
},
changePassword() {
this.showPassword = !this.showPassword;
},
onSMSSend() {
let smsParams = {};
smsParams.mobile=this.phoneNo;
smsParams.smsmode="0";
let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
if(!smsParams.mobile || smsParams.mobile.length==0){
this.$tip.toast('请输入手机号');
return false
}
if(!checkPhone.test(smsParams.mobile)){
this.$tip.toast('请输入正确的手机号');
return false
}
this.$http.post("/sys/sms",smsParams).then(res=>{
if(res.data.success){
this.smsCountDown = 60;
this.startSMSTimer();
}else{
this.smsCountDown = 0;
this.$tip.toast(res.data.message);
}
});
},
startSMSTimer() {
this.smsCountInterval = setInterval(() => {
this.smsCountDown--;
if (this.smsCountDown <= 0) {
clearInterval(this.smsCountInterval);
}
}, 1000);
},
onSMSLogin() {
let checkPhone = new RegExp(/^[1]([3-9])[0-9]{9}$/);
if(!this.phoneNo || this.phoneNo.length==0){
this.$tip.toast('请填写手机号');
return;
}
if(!checkPhone.test(this.phoneNo)){
this.$tip.toast('请输入正确的手机号');
return false
}
if(!this.smsCode || this.smsCode.length==0){
this.$tip.toast('请填短信验证码');
return;
}
let loginParams = {
mobile:this.phoneNo,
captcha:this.smsCode
};
this.PhoneLogin(loginParams).then((res) => {
console.log("res====》",res)
if(res.data.success){
this.$tip.success('登录成功!')
this.$Router.replaceAll({name:'index'})
}else{
this.$tip.error(res.data.message);
}
}).catch((err) => {
let msg = ((err.response || {}).data || {}).message || err.data.message || "请求出现错误，请稍后再试"
this.$tip.error(msg);
});
},
loginSuccess() {
// 登陆成功，重定向到主页
this.$Router.replace({name:'index'})
},
requestFailed(err) {
this.$message.warning("登录失败")
},
},
beforeDestroy() {
if (this.smsCountInterval) {
clearInterval(this.smsCountInterval);
}
},
}
</script>
<style>
.dtxg{
background:linear-gradient(to top,pink,blue);
}
/* uni-page-body{
height: 100%;
} */
.login-paddingtop {
padding-top: 100upx;
}
.zai-box {
padding: 0 20upx;
padding-top: 100upx;
position: relative;
}
.zai-logo {
width: 200upx;
height: 150px;
}
.zai-title {
font-size: 58upx;
color: #000000;
text-align: center;
}
.input-placeholder, .zai-input {
color: #94afce;
}
.zai-label {
padding: 60upx 0;
text-align: center;
font-size: 30upx;
color: #a7b6d0;
}
.zai-btn {
background: #ff65a3;
color: #fff;
border: 0;
border-radius: 100upx;
font-size: 36upx;
}
.zai-btn:after {
border: 0;
}
/*按钮点击效果*/
.zai-btn.button-hover {
transform: translate(1upx, 1upx);
}
</style>
pages/login/login.vue
View file @ 6b99c952
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
<!-- <image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round"></image> --> <!-- <image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round"></image> -->
<view class="gray-text">登录中...</view> <view class="gray-text">登录中...</view>
</view> </view>
<view @tap="changErp()" style="position: absolute;bottom: 20px;right: 10px;text-decoration:underline">
切换到格物云erp登录
</view>
</view> </view>
</template> </template>
...@@ -141,24 +144,6 @@ ...@@ -141,24 +144,6 @@
console.log("获取失败，请手动输入") console.log("获取失败，请手动输入")
} }
}) })
// uni.getStorage({
// key:'fwq',
// success:function(e){
// that.fwq=e.data
// },
// fail() {
// console.log("获取失败，请手动输入")
// }
// })
// uni.getStorage({
// key:'dkh',
// success:function(e){
// that.dkh=e.data
// },
// fail() {
// console.log("获取失败，请手动输入")
// }
// })
// #ifdef APP-PLUS // #ifdef APP-PLUS
var that=this var that=this
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) { plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
...@@ -186,7 +171,9 @@ ...@@ -186,7 +171,9 @@
}, },
methods: { methods: {
...mapActions([ "mLogin","PhoneLogin","ThirdLogin" ]), ...mapActions([ "mLogin","PhoneLogin","ThirdLogin" ]),
changErp(){
this.$Router.replaceAll({name:'cusmerLogin'})
},
gofwqsz(){ gofwqsz(){
this.$Router.push({ this.$Router.push({
path: '/pages/login/fwqsz', query:{ path: '/pages/login/fwqsz', query:{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment