From 1b41c0bc2264d011002e6272ebf1651e58c9334f Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 4 Sep 2023 09:12:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/oaHome/oaHome.vue | 13 ++++++++----- pages/oaMy/oaMy.vue | 13 ++++++++----- utils/request.js | 2 ++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index e96124f..05fc457 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -1,9 +1,9 @@ @@ -111,6 +113,8 @@ showDemandList: [], //更多需求展示列表 updateFlag: true, task_id: 0, + modelShow: false, // 是否显示删除提示框 + deleteIndex: -1, // 删除标记 formData: { id_card: '', sex: '', @@ -210,22 +214,32 @@ } }, // 确认添加需求 - changeDemand: throttle(function(e) { + changeDemand(e){ + this.$u.throttle(()=>this.addDemand(e), 2000) + }, + addDemand(e){ + uni.showLoading({ + title: '添加中', + mask: true + }) this.demandShow = false; if (e.value[1]) { this.showDemandList.push(e.value[1]); } else { this.showDemandList.push(e.value[0]); } - }, 3000), + this.$nextTick(()=>{ + uni.hideLoading(); + }) + }, // 删除需求 removeShowDemand(index) { - uni.showModal({ - title: '确定删除这一部分内容吗', - success: (res) => { - if (res.confirm) this.showDemandList.splice(index, 1); - } - }) + this.modelShow = true; + this.deleteIndex = index; + }, + deleteDemand(index){ + this.showDemandList.splice(index, 1); + this.modelShow = false; } }, onPullDownRefresh() { From 6c3a13ede2c529a1dfa7d67bcd42c0b37bee9e59 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 4 Sep 2023 18:54:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +++++--- pages/oaLogin/oaLogin.vue | 3 +++ subpkg/newPersonnel/newPersonnel.vue | 2 +- subpkg/shareCapital/shareCapital.vue | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/App.vue b/App.vue index 3cc61b1..e581692 100644 --- a/App.vue +++ b/App.vue @@ -16,10 +16,12 @@ // console.log("app的监听") // } // }) - uni.showModal({ - content: info - }) + + // uni.showModal({ + // content: info.referrerInfo.extraData + // }) if(info.referrerInfo?.extraData?.uniMP) uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); + if(info.referrerInfo?.extraData?.token) uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); console.log('App Launch') this.$store.dispatch('initConfig'); try { diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index c8059dc..10e448b 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -10,6 +10,7 @@ 欢迎进入里海供销平台! + {{APP_token}} @@ -60,6 +61,7 @@ data: '', }, uniMP: false, + APP_token: '', tabList: [{ name: '账号登录' }, @@ -80,6 +82,7 @@ }; }, onLoad() { + this.APP_token = uni.getStorageSync('APP_token'); this.options.data = bj; // this.$refs.lottie.call('play'); this.initTerminal(); diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue index c0a6117..b254703 100644 --- a/subpkg/newPersonnel/newPersonnel.vue +++ b/subpkg/newPersonnel/newPersonnel.vue @@ -1,5 +1,5 @@