diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js
index 8c87117..75a82ae 100644
--- a/components/custom-tab-bar/index.js
+++ b/components/custom-tab-bar/index.js
@@ -2,10 +2,12 @@ import {getStaffbasicinfo} from "../../utils/api";
const app = getApp()
import {getOwnedRolesOfStaffId,editstaffinit} from '../../utils/statisticsApi.js'
+import {getOwnedRolesOfStaffId,editstaffinit} from '../../utils/statisticsApi.js'
Component({
data: {
manageOrgNameList:[],
+ manageOrgNameList:[],
selected: 0,
color: "#999",
selectedColor: "#3A80E7",
@@ -53,39 +55,57 @@ Component({
},
attached() {
},
- ready: function () {
+ ready: async function () {
this.setData({
selected: app.globalData.selected
})
+ console.log(app.globalData.roleList,"dskldlsk");
// secretary 书记 admin 管理员
if(app.globalData.roleList.length <= 0) {
-
- getStaffbasicinfo().then(res=>{
- editstaffinit({
+ const res = await getStaffbasicinfo();
+ // 处理员工信息
+ const res4 = await editstaffinit({
agencyId: res.data.agencyId,
staffId: res.data.id
- }).then(res4 => {
- this.setData({
- manageOrgNameList: res4.data.manageOrgNameList
- })
- })
- getOwnedRolesOfStaffId(res.data.id).then(res2 => {
- app.globalData.user = res.data
- this.setData({
- "list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0||manageOrgNameList
- })
- })
- })
+ });
+ console.log(res4.data.manageOrgNameList, "dsfkljdsf");
+ // 确保数据是数组,避免 undefined
+ this.setData({
+ manageOrgNameList: res4.data.manageOrgNameList || []
+ });
+ console.log(this.data.manageOrgNameList, "第二次");
+ // 获取角色信息
+ const res2 = await getOwnedRolesOfStaffId(res.data.id);
+ // 更新全局数据
+ app.globalData.user = res.data;
+ // 更新 UI 数据
+ this.setData({
+ "list[3].show": res2.data.some(item =>
+ ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey)
+ ) || this.data.manageOrgNameList.length > 0
+ });
+
+ console.log(
+ res2.data.some(item =>
+ ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey)
+ ) || this.data.manageOrgNameList.length > 0,
+ "dskjvdsljk"
+ );
} else {
- editstaffinit({ agencyId:app.globalData.user.agencyId, staffId:app.globalData.user.id}).then(res4=>{
- this.setData({
- manageOrgNameList:res4.data.manageOrgNameList
- })
- })
-
+ editstaffinit({
+ agencyId: app.globalData.user.agencyId,
+ staffId: app.globalData.user.id
+ }).then(res4 => {
this.setData({
- "list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0 ||manageOrgNameList
- })
+ manageOrgNameList: res4.data.manageOrgNameList || []
+ }, () => {
+ this.setData({
+ "list[3].show": app.globalData.roleList.some(item =>
+ ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey)
+ ) || this.data.manageOrgNameList.length > 0
+ });
+ });
+ });
}
},
methods: {
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index b1b3d72..1f20462 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -7,14 +7,6 @@
{{userName}} {{agencyName}}
-
-
- 网格长
-
-
- 楼长
-
-