From 438460f3241475affcc91f54b105a63da742545e Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 18 Aug 2023 16:09:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/company/company.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/company/company.vue b/components/company/company.vue
index 4f4bda7..0cce9ae 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -18,7 +18,7 @@
- 区域：
+ 负责区域：
{{c_address}}
From 6652da2387f72d19f61cc3fd69b02fee923f5162 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 19 Aug 2023 08:59:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
subpkg/archives/archives.vue | 43 +++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 90a6ddc..6437dd8 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -32,7 +32,10 @@
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-->
-
+
+
+
@@ -120,7 +123,6 @@
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-
@@ -142,6 +144,12 @@
task_id: -1,
is_admin: false,
list: [],
+ current: 0,
+ tabLists: [{
+ name: '未更新',
+ }, {
+ name: '已更新'
+ }],
loadConfig: {
page: 1,
limit: 15,
@@ -167,7 +175,7 @@
title: '任务:信息更新'
})
}
- this.loadInformationList();
+ this.initLoad();
uni.$on('loadArchives', this.initLoad);
},
onShow() {
@@ -201,7 +209,7 @@
this.loadConfig.page = 1;
this.loadConfig.status = "loadmore";
this.list = [];
- this.is_admin ? null : await this.loadInformationList();
+ await this.loadInformationList();
uni.stopPullDownRefresh();
},
async loadInformationList() {
@@ -209,14 +217,19 @@
if (this.loadConfig.status == "nomore") return;
this.loadConfig.status = "loading"
let res = {};
- if (this.is_admin) res = await taskInformationgist({
- id: this.task_id
- });
- else res = await informationList({
- page: this.loadConfig.page,
- limit: this.loadConfig.limit,
- user_id: that.user_id
- })
+ if (this.is_admin) {
+ res = await taskInformationgist({
+ id: this.task_id
+ });
+ }
+ else {
+ res = await informationList({
+ page: this.loadConfig.page,
+ limit: this.loadConfig.limit,
+ user_id: that.user_id,
+ is_update: this.current
+ })
+ }
this.loadConfig.status = "loadmore"
if (res.data.length < this.loadConfig.limit) {
this.loadConfig.status = "nomore"
@@ -224,7 +237,11 @@
this.loadConfig.page++;
}
this.list = [...this.list, ...res.data];
- }
+ },
+ changeCurrent(e) {
+ this.current = e.index;
+ this.initLoad();
+ }
},
onPullDownRefresh() {
this.initLoad();
From e7ce4124d0a02769ceea12beff061a60ab7cc60d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 19 Aug 2023 09:24:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/oaMy/oaMy.vue | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index aa0a005..7b6e51c 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -75,8 +75,10 @@
- 退出登录
+ 退出登录
登录账号
+
+
@@ -96,6 +98,7 @@
return {
myOaData: myOaData,
src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+ modelShow: false
}
},
onReady() {
@@ -107,6 +110,9 @@
onShow() {
this.getOaUserInfo();
},
+ onHide() {
+ this.modelShow = false;
+ },
computed: {
eyeType() {
return this.$store.state.config.eyeType;
@@ -124,19 +130,19 @@
},
logout() {
let that = this;
- uni.showModal({
- content: '确定要退出登录吗',
- success: (e) => {
- if (e.confirm) {
+ // uni.showModal({
+ // content: '确定要退出登录吗',
+ // success: (e) => {
+ // if (e.confirm) {
uni.navigateTo({
url: '/pages/oaLogin/oaLogin?clear='+true,
success() {
that.$store.commit('CLEAR');
}
})
- }
- }
- })
+ // }
+ // }
+ // })
},
async getOaUserInfo() {
const res = await userInfo();