From 12403e209109247dd065f77b5c2612d8f34afdea Mon Sep 17 00:00:00 2001 From: tangyi <275503107@qq.com> Date: Thu, 17 Mar 2022 18:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AD=BE=E5=88=B0=20?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=A1=AB=E5=86=99=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/flying-monkey.css | 12 + components/status-nav.vue | 7 +- pages.json | 23 +- pages/feedback/feedback.vue | 93 +++++- pages/project/details.vue | 7 +- pages/project/projectList.vue | 12 +- pages/workOrder/workOrder.vue | 247 +++++++++++++++ pages/workOrder/workorderTwo.vue | 348 +++++++++++++++++++++ static/del/微信图片_20220113152400.png | Bin 0 -> 45178 bytes static/iocn/date.png | Bin 0 -> 1213 bytes static/iocn/jia.png | Bin 0 -> 227 bytes static/iocn/tel.png | Bin 0 -> 1280 bytes 12 files changed, 734 insertions(+), 15 deletions(-) create mode 100644 pages/workOrder/workOrder.vue create mode 100644 pages/workOrder/workorderTwo.vue create mode 100644 static/del/微信图片_20220113152400.png create mode 100644 static/iocn/date.png create mode 100644 static/iocn/jia.png create mode 100644 static/iocn/tel.png diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css index 9a190cd..91d5270 100644 --- a/commons/flying-monkey.css +++ b/commons/flying-monkey.css @@ -65,9 +65,21 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;} /* panding全局 */ + .padding{ padding: 0 27rpx; } +/* 按钮全局 */ +.submit-button { + width: 686rpx; + border-radius: 50rpx; + height: 90rpx; + background-color: #02A2ea; + line-height: 90rpx; + color: #FFFFFF; + text-align: center; + font-size: 30rpx; + } /* 登录 */ .login-img { width: 100%; diff --git a/components/status-nav.vue b/components/status-nav.vue index c79fcd2..aacf212 100644 --- a/components/status-nav.vue +++ b/components/status-nav.vue @@ -11,7 +11,7 @@ - @@ -47,7 +47,7 @@ // 默认导航栏高度 navBarHeight: { type:Number, - default:50 + default:40 }, //是否显示返回键 ifReturn:{ @@ -180,8 +180,9 @@ .return-box i {font-size: 56rpx;} .tab-title{ width: 100%; - font-size: 38rpx; + font-size: 32rpx; display: flex; + font-weight: bold; } .tab-title .title-box{margin-top: -4rpx;} diff --git a/pages.json b/pages.json index dc39cd7..75dc92f 100644 --- a/pages.json +++ b/pages.json @@ -86,7 +86,8 @@ }, { "path": "pages/project/details", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用 } }, @@ -103,10 +104,30 @@ "path": "pages/feedback/feedback", "style": { "navigationBarTitleText": "", + "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用 "enablePullDownRefresh": false } } + ,{ + "path" : "pages/workOrder/workOrder", + "style" : + { + "navigationBarTitleText": "", + "navigationStyle": "custom", //禁用原 + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/workOrder/workorderTwo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "subPackages": [{ //A包 "root": "pagesA", diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue index 9ee0427..023ed40 100644 --- a/pages/feedback/feedback.vue +++ b/pages/feedback/feedback.vue @@ -1,11 +1,12 @@ @@ -77,7 +110,9 @@ page { background-color: #F7F7F7; } - + .content{ + padding-top: 76rpx; + } .opinion-type { width: 100%; height: 80rpx; @@ -159,4 +194,46 @@ color: #9f9898; } + .feedback-con{ + width: 320rpx; + height: 100rpx; + border-radius: 8rpx; + background-color: #ffe5e5; + display: flex; + align-items: center; + box-sizing: border-box; + padding-left: 26rpx; + } + .feedback-con .icon{ + width: 40rpx; + height: 40rpx; + margin-right: 18rpx; + } + .feedback-tel-con .text{ + font-size: 24rpx; + margin-bottom: 10rpx; + + } + .feedback-tel-con .tel{ + font-size: 28rpx; + + } + .feedback-approach{ + padding: 0 40rpx; + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 14rpx; + } + .submit-button { + width: 686rpx; + margin-top: 58rpx; + border-radius: 50rpx; + height: 90rpx; + background-color: #02A2ea; + line-height: 90rpx; + color: #FFFFFF; + text-align: center; + font-size: 30rpx; + } diff --git a/pages/project/details.vue b/pages/project/details.vue index b9fb30d..19e2870 100644 --- a/pages/project/details.vue +++ b/pages/project/details.vue @@ -1,5 +1,6 @@