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 @@
-
+
+
意见类型
-
+
{{item.title}}
@@ -26,18 +27,45 @@
-
-
-
-
+
+
+
+
+ 服务监督电话：
+
+
+ 156 1566 0510
+
+
+
+
+
+
+
+ 反馈受理时间：
+
+
+ 9:00 - 18:00
+
+
+
+
+
+
@@ -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 @@
+
+
+
diff --git a/pages/workOrder/workorderTwo.vue b/pages/workOrder/workorderTwo.vue
new file mode 100644
index 0000000..1a1cfea
--- /dev/null
+++ b/pages/workOrder/workorderTwo.vue
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+ 1
+
+
+ 签到执行
+
+
+
+
+ 2
+
+
+ 填写维保单
+
+
+
+
+ 3
+
+
+ 结算审核
+
+
+
+
+
+
+
+ 工单编号：
+
+
+
+
+
+
+
+ 项目编号：
+
+
+
+
+
+
+ 项目名称：
+
+
+
+
+
+
+ 产品类型：
+
+
+
+
+
+
+ 安装位置：
+
+
+
+
+
+
+ 故障类型：
+
+
+
+
+
+
+ 服务方式：
+
+
+
+
+
+
+
+ 故障说明：
+
+
+
+
+
+
+ 故障图片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+ 结束时间：
+
+
+
+
+
+
+ 维保用时：
+
+
+
+
+
+
+ 维保费用：
+
+
+
+
+
+
+ 等待时长：
+
+
+
+
+
+
+ 主维保人：
+
+
+
+
+
+
+ 更换配件：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工作描述：
+
+
+
+
+
+
+
+ 维保图片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 故障原因：
+
+
+
+
+
+
+ 主维保人：
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/del/微信图片_20220113152400.png b/static/del/微信图片_20220113152400.png
new file mode 100644
index 0000000..a2e0f95
Binary files /dev/null and b/static/del/微信图片_20220113152400.png differ
diff --git a/static/iocn/date.png b/static/iocn/date.png
new file mode 100644
index 0000000..fe385ca
Binary files /dev/null and b/static/iocn/date.png differ
diff --git a/static/iocn/jia.png b/static/iocn/jia.png
new file mode 100644
index 0000000..42016d1
Binary files /dev/null and b/static/iocn/jia.png differ
diff --git a/static/iocn/tel.png b/static/iocn/tel.png
new file mode 100644
index 0000000..95c281b
Binary files /dev/null and b/static/iocn/tel.png differ