From ffc3d516f7deb4846303a9a1a34b4850e2ce08a9 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 15 Sep 2023 14:19:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/app.json | 3 ++-
.../pages/approvalWarning/approvalWarning.js | 5 ++++
miniprogram/pages/loading/loading.js | 12 ++++++----
miniprogram/pages/mine/mine.js | 8 +++++--
miniprogram/pages/mine/mine.wxml | 24 +++++++++----------
miniprogram/pages/mine/mine.wxss | 2 +-
miniprogram/pages/taskWarning/taskWarning.js | 7 ++++++
7 files changed, 41 insertions(+), 20 deletions(-)
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..57e3741 100644
--- a/miniprogram/pages/mine/mine.js
+++ b/miniprogram/pages/mine/mine.js
@@ -5,14 +5,18 @@ Page({
* 页面的初始数据
*/
data: {
-
+ userInfo:null,
+ perInfo:null,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ this.setData({
+ userInfo:wx.getStorageSync('userInfo'),
+ perInfo:wx.getStorageSync('perInfo')
+ })
},
/**
diff --git a/miniprogram/pages/mine/mine.wxml b/miniprogram/pages/mine/mine.wxml
index b18d67c..bba4b8a 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,13 +41,13 @@
党员信息
- 支部:暂无
+ 支部:{{perInfo.branchName}}
- 党员职务:暂无
+ 党员职务:{{perInfo.partyDuties}}
- 入党时间:暂无
+ 入党时间:{{perInfo.partyDate}}
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..610dcc9 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,//下拉加载,
},
@@ -19,6 +20,11 @@ Page({
*/
onLoad(options) {
this.loadListData();
+ if (wx.getStorageSync('userInfo').loginName !== 'admin'){
+ this.setData({
+ head:wx.getStorageSync('perInfo').id
+ })
+ }
},
//上拉加载
@@ -58,6 +64,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){
From a087f64a6c1d485d9cf2ca720a4ea7e593175cde Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Mon, 18 Sep 2023 17:17:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/pages/mine/mine.js | 11 +++++++++++
miniprogram/pages/mine/mine.wxml | 4 ++++
miniprogram/pages/taskWarning/taskWarning.js | 14 +++++++-------
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/miniprogram/pages/mine/mine.js b/miniprogram/pages/mine/mine.js
index 57e3741..e9398cb 100644
--- a/miniprogram/pages/mine/mine.js
+++ b/miniprogram/pages/mine/mine.js
@@ -19,6 +19,17 @@ Page({
})
},
+ 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 bba4b8a..9c6b314 100644
--- a/miniprogram/pages/mine/mine.wxml
+++ b/miniprogram/pages/mine/mine.wxml
@@ -51,4 +51,8 @@
+
+ 退出当前账号
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/taskWarning/taskWarning.js b/miniprogram/pages/taskWarning/taskWarning.js
index 610dcc9..dcc2f7c 100644
--- a/miniprogram/pages/taskWarning/taskWarning.js
+++ b/miniprogram/pages/taskWarning/taskWarning.js
@@ -19,12 +19,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.loadListData();
- if (wx.getStorageSync('userInfo').loginName !== 'admin'){
- this.setData({
- head:wx.getStorageSync('perInfo').id
- })
- }
+
},
//上拉加载
@@ -109,7 +104,12 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ if (wx.getStorageSync('userInfo').loginName !== 'admin'){
+ this.setData({
+ head:wx.getStorageSync('perInfo').id
+ })
+ }
+ this.loadListData();
},
/**