From fec7d4626cdeb3ab8d0168f03a38055d4c590cf5 Mon Sep 17 00:00:00 2001 From: gyj Date: Tue, 26 Dec 2023 17:14:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/expressDelivery/component/list.vue | 3 +- pages/handlecase/component/list.vue | 8 ++--- pages/handlecase/component/uploadEvidence.vue | 15 +++++--- pages/handlecase/index.vue | 35 +++++++++++++------ pages/im/component/imList.vue | 3 +- 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/pages/expressDelivery/component/list.vue b/pages/expressDelivery/component/list.vue index a808576..e457ea4 100644 --- a/pages/expressDelivery/component/list.vue +++ b/pages/expressDelivery/component/list.vue @@ -16,7 +16,7 @@ {{defalutVal.applicantName}} - + 被申请人姓名: @@ -79,7 +79,6 @@ width: 100%; display: flex; height: 50rpx; - .lable { width: 30%; } diff --git a/pages/handlecase/component/list.vue b/pages/handlecase/component/list.vue index cc49bd1..dad4072 100644 --- a/pages/handlecase/component/list.vue +++ b/pages/handlecase/component/list.vue @@ -16,8 +16,8 @@ {{defalutVal.applicantName}} - - + + 被申请人姓名: @@ -102,14 +102,14 @@ width: 100%; display: flex; height: 50rpx; - .lable { width: 30%; } .main { width: 60%; - } + } + } .btn{ margin-top: 20rpx; diff --git a/pages/handlecase/component/uploadEvidence.vue b/pages/handlecase/component/uploadEvidence.vue index fb0cbda..49a2d67 100644 --- a/pages/handlecase/component/uploadEvidence.vue +++ b/pages/handlecase/component/uploadEvidence.vue @@ -444,10 +444,17 @@ title: '提交成功', icon: 'none', duration: 1000 - }) - uni.navigateTo({ - url: '/pages/handlecase/index' - }) + }) + + uni.navigateBack({ + delta:1 + }) + // uni.$tab.redirectTo({ + // url: '/pages/handlecase/index' + // }) + // uni.navigateTo({ + // url: '/pages/handlecase/index' + // }) }) }, submitImg() { diff --git a/pages/handlecase/index.vue b/pages/handlecase/index.vue index bc25bc8..22282c3 100644 --- a/pages/handlecase/index.vue +++ b/pages/handlecase/index.vue @@ -25,13 +25,17 @@ pageSize: 10, } - }, - + }, methods: { getList(parms) { respondentList(parms).then(res => { // this.caseList = res.rows; - this.caseList = res.data; + if(res.data){ + this.caseList = res.data; + }else{ + this.caseList = [] + } + this.caseList.forEach(item => { switch (item.caseStatus) { case 0: @@ -102,15 +106,24 @@ obj.pageNum = obj.pageNum + 1 this.getList(obj) } - }, - onLoad() { - let obj = { - pageNum: this.pageNum, + }, + onShow() { + let obj = { + pageNum: this.pageNum, pageSize: this.pageSize, - caseStatus:4 - } - this.getList(obj) - } + caseStatus:4 + } + this.getList(obj) + }, + // onLoad() { + // let obj = { + // pageNum: this.pageNum, + // pageSize: this.pageSize, + // caseStatus:4 + // } + // this.getList(obj) + // } + } diff --git a/pages/im/component/imList.vue b/pages/im/component/imList.vue index 4bb2032..dd858a9 100644 --- a/pages/im/component/imList.vue +++ b/pages/im/component/imList.vue @@ -16,7 +16,7 @@ {{defalutVal.applicantName}} - + 被申请人姓名: @@ -87,7 +87,6 @@ width: 100%; display: flex; height: 50rpx; - .lable { width: 30%; } From 70e12e56181bcc4919d90f0d8d84f79e28205682 Mon Sep 17 00:00:00 2001 From: gyj Date: Wed, 10 Jan 2024 18:09:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E8=8A=82=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- config.js | 7 ++++--- pages.json | 10 ++++++++-- pages/login.vue | 15 ++++++++++++--- permission.js | 7 ++++--- utils/request.js | 13 ++++++++----- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/App.vue b/App.vue index eb4230c..8279497 100644 --- a/App.vue +++ b/App.vue @@ -32,7 +32,7 @@ }, checkLogin() { if (!getToken()) { - this.$tab.reLaunch('/pages/login') + this.$tab.reLaunch('/pages/switchSystem') } } } diff --git a/config.js b/config.js index 1b93a6c..7b0bac2 100644 --- a/config.js +++ b/config.js @@ -1,10 +1,11 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://api.xayunmei.com/zhongcaiapi', - baseUrl: 'https://api.xayunmei.com/zhongcaiapitest', + // baseUrl: 'https://api.xayunmei.com/zhongcaiapitest', // baseUrl: 'http://121.40.189.20:9001', - // baseUrl: 'http://121.40.189.20:8001', - // baseUrl: 'http://192.168.3.77:8080', + baseUrlZC: 'http://121.40.189.20:6001', + baseUrlTJ: 'http://121.40.189.22:8001', + // baseUrl: 'http://172.16.1.24:8001', // baseUrl: 'http://localhost:8080', // baseUrl: 'http://192.168.3.18:9001', // 应用信息 diff --git a/pages.json b/pages.json index f4db920..d424c41 100644 --- a/pages.json +++ b/pages.json @@ -1,8 +1,14 @@ { - "pages": [{ + "pages": [ + { + "path": "pages/switchSystem", + "style": { + "navigationBarTitleText": "" + } + }, { "path": "pages/login", "style": { - "navigationBarTitleText": "登录" + "navigationBarTitleText": "" } }, { "path": "pages/register", diff --git a/pages/login.vue b/pages/login.vue index e1ca7d0..dff3a8e 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -1,9 +1,14 @@ From 45890cea4af4942d6b42d8a67a7ed1489fa5143e Mon Sep 17 00:00:00 2001 From: gyj Date: Mon, 22 Jan 2024 09:57:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/handlecase/component/uploadEvidence.vue | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/pages/handlecase/component/uploadEvidence.vue b/pages/handlecase/component/uploadEvidence.vue index 058095b..6a1e8a0 100644 --- a/pages/handlecase/component/uploadEvidence.vue +++ b/pages/handlecase/component/uploadEvidence.vue @@ -61,10 +61,10 @@ --> - + @@ -93,20 +93,6 @@ - - - - - - - - - @@ -215,8 +201,7 @@ -