From 8b47a6acff1683df5764c5df1b2460110255f544 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 四月 2024 17:16:33 +0800
Subject: [PATCH] 登录时将获取的mac地址例如：78b8d67511ca 作为client_info传进api/user/ace/VerifyPassword接口里
---
store/index.js | 145 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 139 insertions(+), 6 deletions(-)
diff --git a/store/index.js b/store/index.js
index a7dacb3..8d2cdac 100644
--- a/store/index.js
+++ b/store/index.js
@@ -11,6 +11,7 @@
},
state: {
hasLogin: false,
+ deviceId:'',
apkVersionInfo: "",
loginProvider: "",
areaFunc:'',
@@ -38,6 +39,9 @@
OIMongodbSvr: '' //115.29.185.26:5201
},
mutations: {
+ setDeviceId(state, ret) {
+ state.deviceId = ret;
+ },
setUrl(state, url) {
state.url = url;
},
@@ -124,6 +128,9 @@
},
},
getters: {
+ getDeviceId(state, ret) {
+ return state.deviceId
+ },
GetApkServionInfo(state) {
return state.apkVersionInfo
},
@@ -264,10 +271,14 @@
app_type: "mobox",
user_login: Base64.encode(univerifyInfo.uname),
user_psw: Base64.encode(univerifyInfo.pwd),
+ client_info:{
+ type: 3, //瀹㈡埛绔被鍨嬶細0鈥揚C锛�鈥揥EB锛�鈥撳畨鍗擄紝3鈥撳畨鍗揚AD锛�鈥搃Phone锛�5鈥搃Pad锛�6鈥撳叾瀹�+ num: state.deviceId //PDA鐨勮澶囧彿
+ }
};
header={};
}
-
+ console.log(univerifyInfo);
uni.request({
url: url,
data: univerifyInfo,
@@ -275,7 +286,7 @@
dataType:"json",
header: header,
success: (res) => {
- // console.log(res);
+ console.log(res);
const ret = res.data
if (ret.code=='00000' || ret.err_code == 0) {
commit("login",ret);
@@ -298,6 +309,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.loginProvider.loginid.result.session_id);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
var url = state.url + "PDA/PDAArea";
var header = {'content-type': 'application/x-www-form-urlencoded'};
if(state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
@@ -319,7 +337,13 @@
if(res.statusCode==404){
reject({"errMsg":"鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細"+ openinfo});
}
- const ret = res.data
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
+ const ret = res.data;
if (ret.code=='00000' || ret.err_code == 0) {
commit("areaFunc",ret);
resolve(ret);
@@ -370,6 +394,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAAttrList",
@@ -381,6 +412,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
commit("classAttrList",ret);
@@ -403,6 +440,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAGridStyleGetInfo",
@@ -414,6 +458,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
// var data ={};
@@ -438,6 +488,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAAttrList",
@@ -449,6 +506,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
commit("subClassAttrList",ret);
@@ -471,6 +534,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAGridStyleGetInfo",
@@ -482,6 +552,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
// var data ={};
@@ -506,6 +582,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDADicValueGetInfo",
@@ -540,6 +623,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDADataObjRunCustomEvent",
data: univerifyInfo,
@@ -658,9 +748,16 @@
state
}, univerifyInfo) {
return new Promise((resolve, reject) => {
- // console.log(state.url);
+ // console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
- url: state.url + "workspace/addclassattr",
+ url: state.url + "PDA/addclassattr",
data: univerifyInfo,
method: 'POST',
dataType:"json",
@@ -668,7 +765,13 @@
'content-type': 'application/x-www-form-urlencoded'
},
success: (res) => {
- console.log(res);
+ // console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data;
if (ret.code=='00000') {
commit("addclassattr",ret);
@@ -987,6 +1090,36 @@
})
})
},
+ // api/app/GetInfo?sessionid=SESSION_ID
+ // Mobox3鑾峰彇鍔熻兘鐐逛俊鎭�+ appGetInfo: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.loginProvider.loginid.result.session_id);
+ uni.request({
+ url: state.OIMoboxSAPI+'api/app/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ // commit("areaFunc",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
}
})
--
Gitblit v1.9.1