diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 6e3fa5a..f6ce760 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -366,7 +366,10 @@ --> - + + 当前团队 + + diff --git a/pages/newEnroll/enroll/index.json b/pages/newEnroll/enroll/index.json index 0790070..57ccc2c 100644 --- a/pages/newEnroll/enroll/index.json +++ b/pages/newEnroll/enroll/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "给老乡报名", + "navigationBarTitleText": "帮老乡报名", "backgroundColor": "#f5f5f5", "usingComponents": { "bottom-drawer": "../../../components/bottom-drawer/index" diff --git a/pages/workBench/index.js b/pages/workBench/index.js index fd82193..416cb37 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -5,6 +5,9 @@ import { timeShowXXX } from "../../utils/dateUtil"; import { customRequest } from '../../utils/request.js'; Page({ data: { + isLoading:true, + serviceInfo:{}, + iosDialog:false, isLogin: false, map: { num10: '00', num20: '00', num25: '00', num30: '00', num40: '00', num999: '00', user999: "00", user40: "00", user48: "00", user50: "00" }, motto: "Hello World", @@ -37,7 +40,7 @@ Page({ setTimeout(() => { this.setData({ - + serviceInfo: app.globalData.serviceInfo, userInfo: app.globalData.loginUserInfo, }); @@ -149,6 +152,23 @@ Page({ url: `../newEnroll/enroll/index?applyType=2`, }); }, + // 打开弹窗 + openModal(){ + this.setData({ + iosDialog: true, + }); + }, + closeDialog () { + this.setData({ + iosDialog: false, + iosDialogTobe: false, + }); + }, + imageLoad () { + this.setData({ + isLoading: false, + }); + }, getUserInfo (e) { // 不推荐使用getUserInfo获取用户信息,预计自2021年4月13日起,getUserInfo将不再弹出弹窗,并直接返回匿名的用户个人信息 console.log(e); diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml index 85e0560..d656cd4 100644 --- a/pages/workBench/index.wxml +++ b/pages/workBench/index.wxml @@ -4,34 +4,17 @@ 工作台 - -