From 66c615eb803526f5e2effc8c99610f9b5b434540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Tue, 28 Feb 2023 08:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/base.scss | 4 ++ manifest.json | 2 +- pages.json | 9 ++++- pages/message/incident.vue | 4 +- pages/message/incidentDetail.vue | 66 +++++++++++++++++++++++++++++++ pages/message/report.vue | 4 +- pages/message/term.vue | 5 +++ static/boxing1.jpeg | Bin 0 -> 102585 bytes static/boxing2.jpeg | Bin 0 -> 65798 bytes tsconfig.json | 29 -------------- 10 files changed, 89 insertions(+), 34 deletions(-) create mode 100644 pages/message/incidentDetail.vue create mode 100644 static/boxing1.jpeg create mode 100644 static/boxing2.jpeg delete mode 100644 tsconfig.json diff --git a/common/css/base.scss b/common/css/base.scss index 26333dc..0a3b94f 100644 --- a/common/css/base.scss +++ b/common/css/base.scss @@ -42,6 +42,10 @@ page { align-items: center; justify-content: center; } +.space-between{ + display: flex; + justify-content: space-between; +} .hide-txt { overflow-x: hidden; diff --git a/manifest.json b/manifest.json index e03eb73..45ec424 100644 --- a/manifest.json +++ b/manifest.json @@ -131,5 +131,5 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "3" + "vueVersion" : "2" } diff --git a/pages.json b/pages.json index 6c431e6..b660da2 100644 --- a/pages.json +++ b/pages.json @@ -187,6 +187,12 @@ "navigationBarTitleText": "暂态事件" } }, + { + "path": "pages/message/incidentDetail", + "style": { + "navigationBarTitleText": "暂态事件详情" + } + }, { "path": "pages/message/term", "style": { @@ -340,8 +346,9 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "灿能电力", "navigationBarBackgroundColor": "#ffffff", - "backgroundColor": "#f3f4f5", + "backgroundColor": "#f3f4f5" // #ifdef H5 + , "navigationStyle": "custom" // #endif }, diff --git a/pages/message/incident.vue b/pages/message/incident.vue index 479f79a..b375661 100644 --- a/pages/message/incident.vue +++ b/pages/message/incident.vue @@ -65,7 +65,7 @@ export default { methods: { jump () { console.log(123); - uni.navigateTo({ url: '/pages/message/termDetail' }) + uni.navigateTo({ url: '/pages/message/incidentDetail' }) } } } @@ -97,6 +97,6 @@ export default { } /deep/ .uni-card__header-extra-text { color: #dd524d !important; - + font-size: 20rpx; } diff --git a/pages/message/incidentDetail.vue b/pages/message/incidentDetail.vue new file mode 100644 index 0000000..d15eb8e --- /dev/null +++ b/pages/message/incidentDetail.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/pages/message/report.vue b/pages/message/report.vue index ad788a3..c1e783d 100644 --- a/pages/message/report.vue +++ b/pages/message/report.vue @@ -1,7 +1,7 @@