diff --git a/common/js/request.js b/common/js/request.js
index 8363d66..663bcbf 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -23,7 +23,7 @@ export default {
if (args.data instanceof Object) {
args.data.deptId = globalData.deptId;
args.data.from = globalData.from;
- if (!args.data.workerId && userInfo && userInfo.workerId) {
+ if (args.data.workerId === undefined && userInfo && userInfo.workerId) {
args.data.workerId = userInfo.workerId;
}
}
@@ -89,10 +89,10 @@ export default {
let userInfo = await wx.getUserProfile({
desc: '用于小程序登录'
});
- console.log("从微信获取基本用户信息:" + userInfo);
+ // console.log("从微信获取基本用户信息:" + userInfo);
// 获取微信登录凭证
const wxLoginRes = await wx.login();
- console.log(wxLoginRes)
+ // console.log(wxLoginRes)
// 获取openid
const wxAuthRes = await uni.request({
url: '/wx/auth',
@@ -100,7 +100,7 @@ export default {
code: wxLoginRes.code
}
})
- console.log(wxAuthRes)
+ // console.log(wxAuthRes)
const openId = wxAuthRes[1].data.data.openid;
// 第一次从服务端获取用户信息
let wxGetUserRes = await this.qryUserInfo(openId);
@@ -124,7 +124,7 @@ export default {
wxLoginCode: wxLoginRes.code
}
}
- console.log("通过后台服务获取用户信息:" + userInfo);
+ // console.log("通过后台服务获取用户信息:" + userInfo);
if (!userInfo || userInfo.workerId == null || userInfo.workerId == undefined) {
uni.showToast({
icon: 'none',
@@ -265,6 +265,9 @@ export default {
let userProfile = uni.getStorageSync('userProfile');
return userProfile;
},
+ updateCache(cacheKey, cacheVal) {
+ uni.setStorageSync(cacheKey, cacheVal);
+ },
async getCurUserNoCache() {
let userInfo = this.getCurUserInfo();
let wxGetUserRes = await this.qryUserInfo(userInfo.openId);
diff --git a/pages/area-proxy/modal/invite-master.vue b/pages/area-proxy/modal/invite-master.vue
index d794eec..94b41a5 100644
--- a/pages/area-proxy/modal/invite-master.vue
+++ b/pages/area-proxy/modal/invite-master.vue
@@ -48,10 +48,10 @@
}
},
methods: {
- showModal(e) {
+ showModal() {
this.isShow = true
},
- hideModal(e) {
+ hideModal() {
this.isShow = false;
this.resetData();
},
diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue
index e2d4bb1..279be0f 100644
--- a/pages/area-proxy/my-team.vue
+++ b/pages/area-proxy/my-team.vue
@@ -15,8 +15,11 @@
- {{member.name}}
+ :style="'background-image:url(' + member.workerLogoUrl + ');min-width: 64rpx'">
+
+ {{member.name}}
+ 未实名或绑卡
+
-
-
+
+
@@ -108,26 +111,25 @@
async beInvited2Team(inviteMasterObj) {
this.loadBasicData();
this.inviteMasterObj = inviteMasterObj;
- let curUserInfo = await this.login();
- if (!curUserInfo) {
- // 提示登录,返回首页
+ // let curUserInfo = await this.login();
+ if (!this.curUserInfo) {
+ // 提示前往注册
this.showModalByRef('loginTipModal');
- } else if (curUserInfo.status !== 0) {
- // 提示绑卡和实名,返回首页
- this.showModalByRef('certifyTipModal');
} else {
this.showModalByRef('inviteMasterModal');
}
},
- async login() {
+ // async login() {
// 更新缓存中的userInfo
// await this.$request.storageExistUser();
// 返回缓存中的userInfo
- return this.$request.getCurUserInfo();
- },
- goToPage(pageUrl) {
+ // return this.$request.getCurUserInfo();
+ // },
+ goToPage(pageUrl, obj, ifEncode) {
+ // console.log(JSON.stringify(obj))
+ let params = ifEncode ? encodeURIComponent(JSON.stringify(obj)) : JSON.stringify(obj);
uni.reLaunch({
- url: pageUrl
+ url: pageUrl + params
})
},
loadBasicData() {
@@ -148,7 +150,9 @@
async loadTeamPage(params = {}) {
params.pageNum = this.pageNum;
params.pageSize = this.pageSize;
- params.leaderId = this.curUserInfo.workerId;
+ params.leaderId = this.curUserInfo.workerId;
+ params.workerId = null;
+ params.hasRegistered = true;
this.$refs.loadStatusBar.showLoading();
try {
let res = await this.$request.getTeamPage(params);
@@ -223,7 +227,11 @@
icon: 'success',
mask: true
})
- this.reloadData();
+ this.reloadData();
+ if (this.curUserInfo.status !== 0) {
+ // 提示前往绑卡和实名已生效
+ this.showModalByRef('certifyTipModal');
+ }
} else if (res.code === 301) {
uni.showToast({
title: res.msg,
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 27317ca..30409aa 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -172,7 +172,6 @@
// let res = await this.$request.storageExistUser();
// 获取缓存中的userInfo
let curUserInfo = this.$request.getCurUserInfo();
- console.log(curUserInfo)
// 校验提示登录
// if (!curUserInfo || !curUserInfo.openId) {
// this.$refs.vertifyLogin.showModal();
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 98c4c7b..79d8aea 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -82,7 +82,6 @@
// let res = await this.$request.storageExistUser();
// 获取缓存中的userInfo
let curUserInfo = this.$request.getCurUserInfo();
- console.log(curUserInfo)
// 校验提示登录
// if (!curUserInfo || !curUserInfo.openId) {
// this.$refs.vertifyLogin.showModal();
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 23c9749..b64e031 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,24 +79,37 @@
-
+
+
+
+
-