diff --git a/miniprogram/app.json b/miniprogram/app.json index 9b9c3ea..ef2f24b 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -49,7 +49,8 @@ "van-stepper": "@vant/weapp/stepper/index", "van-empty": "@vant/weapp/empty/index", "van-tree-select": "@vant/weapp/tree-select/index", - "van-uploader": "@vant/weapp/uploader/index" + "van-uploader": "@vant/weapp/uploader/index", + "van-card": "@vant/weapp/card/index" }, "tabBar": { "selectedColor": "#5199FF", diff --git a/miniprogram/pages/approvalWarning/approvalWarning.js b/miniprogram/pages/approvalWarning/approvalWarning.js index 57221e8..88fe566 100644 --- a/miniprogram/pages/approvalWarning/approvalWarning.js +++ b/miniprogram/pages/approvalWarning/approvalWarning.js @@ -140,6 +140,11 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { + if (wx.getStorageSync('userInfo').loginName !== 'admin'){ + this.setData({ + "searchForm.reviewed":wx.getStorageSync('perInfo').id + }) + } this.loadListData(); this.loadPersonData(); }, diff --git a/miniprogram/pages/loading/loading.js b/miniprogram/pages/loading/loading.js index 104d316..aef613e 100644 --- a/miniprogram/pages/loading/loading.js +++ b/miniprogram/pages/loading/loading.js @@ -62,11 +62,13 @@ Page({ "password": _this.data.password, }).then(obj => { if (obj.code === 0){ + wx.setStorageSync("loginName", _this.data.username); + wx.setStorageSync("password", _this.data.password); + wx.setStorageSync("userInfo", obj.data.userInfo); + wx.setStorageSync("perInfo", obj.data.perInfo); wx.reLaunch({ url: '/pages/evaluation/evaluation' }); - wx.setStorageSync("loginName", _this.data.username); - wx.setStorageSync("password", _this.data.password); }else { Dialog.alert({ message:'用户名或密码错误' @@ -98,11 +100,13 @@ Page({ "password": _this.data.password, }).then(obj => { if (obj.code === 0){ + wx.setStorageSync("loginName", _this.data.username); + wx.setStorageSync("password", _this.data.password); + wx.setStorageSync("userInfo", obj.data.userInfo); + wx.setStorageSync("perInfo", obj.data.perInfo); wx.reLaunch({ url: '/pages/evaluation/evaluation' }); - wx.setStorageSync("loginName", _this.data.username); - wx.setStorageSync("password", _this.data.password); }else { Dialog.alert({ message:'用户名或密码错误' diff --git a/miniprogram/pages/mine/mine.js b/miniprogram/pages/mine/mine.js index c553b9a..e9398cb 100644 --- a/miniprogram/pages/mine/mine.js +++ b/miniprogram/pages/mine/mine.js @@ -5,14 +5,29 @@ Page({ * 页面的初始数据 */ data: { - + userInfo:null, + perInfo:null, }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + this.setData({ + userInfo:wx.getStorageSync('userInfo'), + perInfo:wx.getStorageSync('perInfo') + }) + }, + exitLogin(){ + wx.clearStorageSync() + // wx.setStorageSync("loginName", _this.data.username); + // wx.setStorageSync("password", _this.data.password); + // wx.setStorageSync("userInfo", obj.data.userInfo); + // wx.setStorageSync("perInfo", obj.data.perInfo); + wx.reLaunch({ + url: '/pages/loading/loading' + }); }, /** diff --git a/miniprogram/pages/mine/mine.wxml b/miniprogram/pages/mine/mine.wxml index b18d67c..9c6b314 100644 --- a/miniprogram/pages/mine/mine.wxml +++ b/miniprogram/pages/mine/mine.wxml @@ -4,22 +4,22 @@ 基础信息 - 姓名:暂无 + 姓名:{{perInfo.name}} - 性别:暂无 + 性别:{{perInfo.sex === '1'?'男':'女'}} - 民族:暂无 + 民族:{{perInfo.nation}} - 籍贯:暂无 + 籍贯:{{perInfo.nativePlace}} - 手机号:暂无 + 手机:{{perInfo.mphone}} - 邮箱:暂无 + 邮箱:{{perInfo.email}} @@ -27,13 +27,13 @@ 工作信息 - 部门:暂无 + 部门:{{perInfo.deptName}} - 岗位:暂无 + 岗位:{{perInfo.post}} - 职务:暂无 + 职务:{{perInfo.duties}} @@ -41,14 +41,18 @@ 党员信息 - 支部:暂无 + 支部:{{perInfo.branchName}} - 党员职务:暂无 + 党员职务:{{perInfo.partyDuties}} - 入党时间:暂无 + 入党时间:{{perInfo.partyDate}} + + 退出当前账号 + + \ No newline at end of file diff --git a/miniprogram/pages/mine/mine.wxss b/miniprogram/pages/mine/mine.wxss index e60f209..3d23aad 100644 --- a/miniprogram/pages/mine/mine.wxss +++ b/miniprogram/pages/mine/mine.wxss @@ -34,7 +34,7 @@ flex-wrap: wrap; } .list_item{ - width: 30%; + width: 45%; margin: 10px 5px; font-size: 30rpx; } \ No newline at end of file diff --git a/miniprogram/pages/taskWarning/taskWarning.js b/miniprogram/pages/taskWarning/taskWarning.js index 88db7cf..dcc2f7c 100644 --- a/miniprogram/pages/taskWarning/taskWarning.js +++ b/miniprogram/pages/taskWarning/taskWarning.js @@ -10,6 +10,7 @@ Page({ pageSize: 10, //所有数据 list: [], + head:null, isRefreshing:false,//下拉刷新 isFinish:false,//下拉加载, }, @@ -18,7 +19,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.loadListData(); + }, //上拉加载 @@ -58,6 +59,7 @@ Page({ let _param = { pageSize:that.data.pageSize, pageNum:that.data.pageNum, + head:that.data.head } $api.warnList(_param).then(res => { if(res.code === 0){ @@ -102,7 +104,12 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + if (wx.getStorageSync('userInfo').loginName !== 'admin'){ + this.setData({ + head:wx.getStorageSync('perInfo').id + }) + } + this.loadListData(); }, /**