cyl/master-0804
jscyl13849007907 3 months ago
commit 5db7686772

@ -16,6 +16,37 @@ export default {
onLaunch() { onLaunch() {
let that = this; let that = this;
uni.removeStorageSync("selectedCity"); uni.removeStorageSync("selectedCity");
//
// uni.onBeforeAppRoute((res) => {
// console.log("setNavStyle", res);
// try {
// that.G.Post("/common/user/browsing/history/addRecord", { browsingUrl: res.path }, (res) => {});
// } catch (error) {
// console.log("error", error);
// }
// });
//
uni.addInterceptor("navigateTo", {
//
invoke(args) {
console.log("navigateTo 跳转前", args);
that.G.watchUserPage(args.url);
},
});
uni.addInterceptor("reLaunch", {
//
invoke(args) {
console.log("reLaunch 跳转前", args);
that.G.watchUserPage(args.url);
},
});
uni.addInterceptor("redirectTo", {
//
invoke(args) {
console.log("redirectTo 跳转前", args);
that.G.watchUserPage(args.url);
},
});
}, },
onShow: function (options) { onShow: function (options) {
let that = this; let that = this;
@ -47,14 +78,10 @@ export default {
this.G.checkToken(); this.G.checkToken();
} }
if (!that.globalData.timer) { if (!that.globalData.timer) {
if (uni.getStorageSync("apply-token")) {
that.checkNum(); that.checkNum();
}
that.globalData.timer = setInterval(() => { that.globalData.timer = setInterval(() => {
console.log("inner++++++++++++++++++++ +++++++++++++++++++++++++++"); console.log("inner+++++++++++++++++++++++++++++++++++++++++++++++");
if (uni.getStorageSync("apply-token")) {
that.checkNum(); that.checkNum();
}
}, 30 * 1000); }, 30 * 1000);
} }

@ -352,6 +352,7 @@ export default {
this.agencyInfo = uni.getStorageSync("agencyInfo"); this.agencyInfo = uni.getStorageSync("agencyInfo");
this.userInfo = uni.getStorageSync("apply-userinfo"); this.userInfo = uni.getStorageSync("apply-userinfo");
that.loadSelectedCityFromCache(); that.loadSelectedCityFromCache();
that.G.watchUserPage("pages/home/index");
} }
}, },

@ -352,6 +352,7 @@ export default {
this.getCompanyInfo(); this.getCompanyInfo();
} }
}); });
that.G.watchUserPage("pages/person/index");
// that.userInfo = uni.getStorageSync("apply-userinfo"); // that.userInfo = uni.getStorageSync("apply-userinfo");
} else { } else {
that.waitNum_ups = 0; that.waitNum_ups = 0;

@ -203,6 +203,7 @@ export default {
this.getList(); this.getList();
} }
this.getGZHInfo(); this.getGZHInfo();
that.G.watchUserPage("pages/workBench/index");
}, },
onReachBottom() { onReachBottom() {
let that = this; let that = this;

@ -1,14 +1,8 @@
// let ajaxUrl = "http://192.168.3.83:8001"; // let ajaxUrl = "http://192.168.3.83:8001";
let ajaxUrl = "https://daotian.matripe.com.cn"; let ajaxUrl = "https://daotian.matripe.com.cn";
let requestTask;
let data = { let data = {
ajaxUrl: ajaxUrl, ajaxUrl: ajaxUrl,
startAbort($bool = 0) { Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {
if ($bool == 1) {
requestTask.abort();
}
},
Get($url = '', $parmas = {}, callback = () => {}, failback = () => {}) {
let that = this, let that = this,
params = {}; params = {};
let promise = new Promise((resolve, reject) => { let promise = new Promise((resolve, reject) => {
@ -19,7 +13,7 @@ let data = {
that.postData($url, params, callback, failback, 'GET'); that.postData($url, params, callback, failback, 'GET');
}).catch(); }).catch();
}, },
Post($url = '', $parmas = {}, callback = () => {}, failback = () => {}) { Post ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {
let that = this, let that = this,
params = {}; params = {};
let promise = new Promise((resolve, reject) => { let promise = new Promise((resolve, reject) => {
@ -30,7 +24,7 @@ let data = {
that.postData($url, params, callback, failback, 'POST'); that.postData($url, params, callback, failback, 'POST');
}).catch(); }).catch();
}, },
Put($url = '', $parmas = {}, callback = () => {}, failback = () => {}) { Put ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {
let that = this, let that = this,
params = {}; params = {};
let promise = new Promise((resolve, reject) => { let promise = new Promise((resolve, reject) => {
@ -42,7 +36,7 @@ let data = {
}).catch(); }).catch();
}, },
setPublicParams() { setPublicParams () {
let that = this, let that = this,
params = {}; params = {};
let uuid_new = ""; let uuid_new = "";
@ -91,7 +85,7 @@ let data = {
return params return params
}, },
// 发送请求 // 发送请求
postData($url = '', $parmas = {}, callback = () => {}, failback = () => {}, $method) { postData ($url = '', $parmas = {}, callback = () => { }, failback = () => { }, $method) {
let that = this, let that = this,
$header = {}; $header = {};
if (uni.getStorageSync("apply-token")) { if (uni.getStorageSync("apply-token")) {
@ -113,11 +107,7 @@ let data = {
} }
} }
console.log("公共参数,+++++", Object.assign($parmas, that.setPublicParams())); console.log("公共参数,+++++", Object.assign($parmas, that.setPublicParams()));
uni.getNetworkType({ uni.request({
success: function(res) {
// console.log(res);
if (res.networkType != 'none') {
requestTask = uni.request({
url: ajaxUrl + $url, url: ajaxUrl + $url,
data: Object.assign($parmas, that.setPublicParams()), data: Object.assign($parmas, that.setPublicParams()),
header: Object.assign($header, that.setPublicParams()), header: Object.assign($header, that.setPublicParams()),
@ -127,9 +117,9 @@ let data = {
// console.log('测试报错123123123123123123$url',$url); // console.log('测试报错123123123123123123$url',$url);
let resData = res.data; let resData = res.data;
if (resData.status == 200) { // 正常 if (resData.status == 200) {// 正常
callback(resData.data, resData.msg); callback(resData.data, resData.msg);
} else if (resData.status == 9999) { // 登录过期或者身份变动等需要登录的场景 } else if (resData.status == 9999) {// 登录过期或者身份变动等需要登录的场景
uni.showToast({ uni.showToast({
title: resData.msg, title: resData.msg,
icon: "none" icon: "none"
@ -137,11 +127,10 @@ let data = {
failback(resData); failback(resData);
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/root/person/loginIndex?path=/' + that.getPathCopy().path + '&level=' + url: '/root/person/loginIndex?path=/' + that.getPathCopy().path + '&level=' + that.getPathCopy().level
that.getPathCopy().level
}); });
}, 1500); }, 1500);
} else if (resData.status == 500 || resData.status == 502) { // 某种原因导致接口提示该状态码 } else if (resData.status == 500 || resData.status == 502) {// 某种原因导致接口提示该状态码
// if (resData.msg == '系统异常,请稍后') { // if (resData.msg == '系统异常,请稍后') {
// uni.reLaunch({ // uni.reLaunch({
// url: '/root/other/error' // url: '/root/other/error'
@ -161,11 +150,10 @@ let data = {
}); });
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/root/person/loginIndex?path=/pages/home/index&level=' + that url: '/root/person/loginIndex?path=/pages/home/index&level=' + that.getPathCopy().level
.getPathCopy().level
}); });
}, 1500); }, 1500);
} else { // 其他异常 } else {// 其他异常
if ($url == '/yishoudan/user/apply/order/V2/details') { if ($url == '/yishoudan/user/apply/order/V2/details') {
} else { } else {
@ -179,7 +167,7 @@ let data = {
failback(resData.msg); failback(resData.msg);
} }
}, },
fail(error) { fail (error) {
uni.showToast({ uni.showToast({
// title: error.errMsg, // title: error.errMsg,
title: '系统异常,请稍后', title: '系统异常,请稍后',
@ -188,18 +176,10 @@ let data = {
failback(error); failback(error);
} }
}); });
} else {
uni.showToast({
title: '网络异常,请检查网络',
icon: "none"
})
}
},
});
}, },
// 头像上传 // 头像上传
uploadFile($file, callback = () => {}) { uploadFile ($file, callback = () => { }) {
let that = this; let that = this;
uni.uploadFile({ uni.uploadFile({
url: ajaxUrl + '/user/changeUserImgsrc', url: ajaxUrl + '/user/changeUserImgsrc',
@ -216,7 +196,7 @@ let data = {
}, },
/* path /* path
*/ */
getPathCopy() { getPathCopy () {
const pages = getCurrentPages(); const pages = getCurrentPages();
if (pages.length > 0) { if (pages.length > 0) {
let _path = pages[pages.length - 1].route; let _path = pages[pages.length - 1].route;
@ -231,6 +211,17 @@ let data = {
}; };
} }
}, },
//监听用户的页面点击
watchUserPage (path) {
let that = this;
try {
if (uni.getStorageSync("apply-userinfo")) {
that.Post("/common/user/browsing/history/addRecord", { browsingUrl: path }, (res) => { });
}
} catch (error) {
console.log("error", error);
}
},
}; };
export default data; export default data;

@ -161,6 +161,8 @@ let data = {
/* /*
*/ */
setNavStyle ($form = 'default') { setNavStyle ($form = 'default') {
console.log('into setNavStyle');
if ($form == 'home') { if ($form == 'home') {
uni.setNavigationBarColor({ uni.setNavigationBarColor({
backgroundColor: "#fff", backgroundColor: "#fff",
@ -1573,6 +1575,7 @@ let data = {
} }
return str; return str;
}, },
} }
export default data; export default data;

Loading…
Cancel
Save