From 62e2b139f55538c01764b4ff7699ddccc5c29bcf Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 28 六月 2024 17:30:19 +0800
Subject: [PATCH] 5601
---
store/index.js | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 103 insertions(+), 11 deletions(-)
diff --git a/store/index.js b/store/index.js
index 4d09b09..2280d3f 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,
@@ -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,12 +337,18 @@
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);
} else {
- reject({"errMsg":ret.msg?ret.msg:ret.err_msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -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,12 +412,18 @@
},
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);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -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",
@@ -421,7 +465,8 @@
commit("classGridStyleInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+
+ reject({"errMsg":ret.msg ||ret.err_msg});
}
},
fail: (err) => {
@@ -438,6 +483,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,12 +501,18 @@
},
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);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+ reject({"errMsg":ret.msg ||ret.err_msg});
}
},
fail: (err) => {
@@ -471,6 +529,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",
@@ -481,7 +546,14 @@
'content-type': 'application/x-www-form-urlencoded'
},
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 ={};
@@ -489,7 +561,7 @@
commit("subClassGridStyleInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg ||ret.err_msg });
}
},
fail: (err) => {
@@ -506,6 +578,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",
@@ -523,7 +602,7 @@
commit("dicValueInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -540,6 +619,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,
@@ -555,7 +641,7 @@
commit("DataObjRunCustomEventInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -599,7 +685,7 @@
commit("querySelpsn",res);
resolve(res);
} else {
- reject({"errMsg":res.msg?res.msg:res.err_msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -642,7 +728,7 @@
commit("ProjectGetAnalysisList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.msg});
+ reject({"errMsg":ret.msg||ret.err_msg});
}
},
fail: (err) => {
@@ -676,6 +762,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("addclassattr",ret);
--
Gitblit v1.9.1