diff --git a/commons/base.css b/commons/base.css
index 5af313f..008afcc 100644
--- a/commons/base.css
+++ b/commons/base.css
@@ -310,6 +310,7 @@ button:after{content: none!important;}
.pad40{padding: 40rpx;}
.pad50{padding: 50rpx;}
/* 上下---内边距 */
+.pad-sx6{padding-top: 6rpx;padding-bottom: 6rpx;}
.pad-sx10{padding-top: 10rpx;padding-bottom: 10rpx;}
.pad-sx20{padding-top: 20rpx;padding-bottom: 20rpx;}
.pad-sx25{padding-top: 25rpx;padding-bottom: 25rpx;}
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 94c94e1..c545c6f 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -272,8 +272,8 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
/* 服务范围 */
.service-range-status {
background-color: #cdcdcd;
- color: #333333;
- padding: 6rpx 20rpx;
+ color: #242323;
+ /* padding: 6rpx 20rpx; */
border-radius: 6rpx;
}
.service-range-activeStatus {
diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue
index 80dafe2..cf92e16 100644
--- a/pages/feedback/feedback.vue
+++ b/pages/feedback/feedback.vue
@@ -2,7 +2,7 @@
-
+
意见类型
服务监督电话:
- 156 1566 0510
+ 156 1566 0510
反馈受理时间:
- 9:00 - 18:00
+ 9:00 - 18:00
@@ -272,13 +272,12 @@
.feedback-con {
width: 320rpx;
- height: 100rpx;
border-radius: 8rpx;
background-color: #ffe5e5;
display: flex;
align-items: center;
box-sizing: border-box;
- padding-left: 26rpx;
+ padding: 16rpx 0 16rpx 26rpx;
}
.feedback-con .icon {
@@ -295,7 +294,6 @@
.feedback-tel-con .tel {
font-size: 28rpx;
-
}
.feedback-approach {
diff --git a/pages/project/details.vue b/pages/project/details.vue
index 4a36e42..d3ed00b 100644
--- a/pages/project/details.vue
+++ b/pages/project/details.vue
@@ -1,581 +1,423 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{index}}/3
-
-
-
-
-
- 湖南工业大学生化学院会议室P2.5全彩LED显示屏
-
-
- XM20220108-1001
-
-
-
-
-
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
-
-
-
-
-
-
-
-
- 最近一次故障时间:2021-11-18 17:00:16
-
-
-
-
-
-
-
-
-
-
-
-
- 项目概况
-
-
-
-
-
-
-
- 品
- 牌
-
-
- :海康威视
-
-
-
-
- 型
- 品
-
-
-
- :DS-CK25FI/H
-
-
-
-
-
- 尺
- 寸
-
-
- :3.94*2.02m
-
-
-
-
- 安装位置
-
-
- :xx综合楼2楼会议室403
-
-
-
-
- 竣工日期
-
-
- :2022/01/08
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
- 维修追踪
-
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
- “黑屏”故障 【某某】已处理。
-
-
- 2020-05-15 16:00
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index}}/3
+
+ 湖南工业大学生化学院会议室P2.5全彩LED显示屏
+ XM20220108-1001
+
+
+ 湖南省长沙市高新开发区谷园路109号像素大厦1205
+
+
+
+
+
+ 最近一次故障时间:2021-11-18 17:00:16
+
+
+
+
+
+ 项目概况
+
+
+
+
+ 品
+ 牌:
+
+ 海康威视
+
+
+
+ 型
+ 品:
+
+ DS-CK25FI/H
+
+
+
+ 尺
+ 寸:
+
+ 3.94*2.02m
+
+
+ 安装位置:
+ xx综合楼2楼会议室403
+
+
+ 竣工日期:
+ 2022/01/08
+
+
+
+
+ {{item.title}}
+
+
+
+ 维修追踪
+
+
+
+ “部分模组不显示”故障【陈志远】已处理。
+ 2020-05-15 16:00
+
+
+
+
+
+
+
diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue
index 9809d3d..94f794e 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -3,67 +3,66 @@
-
-
-
-
-
-
-
-
-
-
- {{initial_value}}
- {{array[index].title}}
-
-
-
-
-
- 竣工日期
-
-
-
-
-
- 筛选
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{initial_value}}
+ {{array[index].title}}
+
+
+
+
+
+ 竣工日期
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+ {{item.project_name}}
+
+ 项目编号:{{item.projectCode}}
+ 规格型号:{{item.project_number}}
+ 产品尺寸:{{item.size}}
+ 安装位置:{{item.installation_location}}
+
+
+
+
+
+
+
+
+ {{item.address}}
+
+
+ {{item.date}}
+
+ 质保中
+ 质保到期
+
+
-
-
-
-
-
- {{item.project_name}}
-
- 项目编号:{{item.projectCode}}
- 规格型号:{{item.project_number}}
- 产品尺寸:{{item.size}}
- 安装位置:{{item.installation_location}}
-
-
-
-
-
-
-
-
- {{item.address}}
-
-
- {{item.date}}
-
- 质保中
- 质保到期
-
-
-
-
-
-
-
+
+
@@ -196,9 +195,8 @@
height: 100%;
background-color: #F7F7F7;
padding: 0 25rpx;
-
+ font-size: 26rpx;
padding-right: 100rpx;
-
box-sizing: border-box;
border-radius: 36rpx;
}
diff --git a/pages/repairsPage/repairsPage.vue b/pages/repairsPage/repairsPage.vue
index 2346107..3a90bba 100644
--- a/pages/repairsPage/repairsPage.vue
+++ b/pages/repairsPage/repairsPage.vue
@@ -22,53 +22,37 @@
{{item.name}}
-
-
- 请填写设备名称和型号或扫描二维码
-
+ 请填写设备名称和型号或扫描二维码
-
-
-
-
+
-
- 添加故障图片
-
+ 添加故障图片
-
-
-
-
-
+
-
+ placeholder-class="inputCss-input" />
-
+ placeholder-class="inputCss-input" />
-
-
-
+ placeholder="请选择上门时间" placeholder-class="inputCss-input" />
+
-
-
@@ -416,10 +400,10 @@
width: 100%;
box-sizing: border-box;
padding: 0rpx 17rpx;
- font-size: 30rpx;
+ font-size: 26rpx;
border-radius: 10rpx;
background-color: #FFFFFF;
- color: #9f9898;
+ color: #000000;
display: flex;
margin-top: 20rpx;
align-items: center;
@@ -430,7 +414,7 @@
}
.inputCss-input-input {
- font-size: 30rpx;
+ font-size: 26rpx;
color: #9f9898;
}
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 11f0c83..77fa933 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -1,473 +1,3 @@
-<<<<<<< HEAD
-
-
-
-
-
-
- {{messageNumber}}
-
-
-
-
-
-
-
-
- 拨打电话
-
-
-
-
-
- 拨打电话
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 项目总数
- 126
-
-
-
- 实时故障
- 116
-
-
-
-
-
-
-
-
-
-
-
-
-
- 故障报修
-
-
-
- {{item.title}}
-
-
-
-
-
- 数据查询
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
- 增值服务
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- 项目维修
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
-
- 待办工单
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
- 待办事件
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
-
- 工单数据
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
- 数据查询
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
- 结算情况
-
-
-
-
- {{item.num}}
-
- {{item.title}}
-
-
-
-
-
-
- 其他
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- 畅想智能-场景化设计
- 解决方案Solution
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
- 常见故障Common faults
-
-
-
- {{item.title}}
- {{item.content}}
-
- {{item.views}}人看过
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
@@ -527,7 +57,7 @@
故障报修
-
+
{{item.title}}
@@ -537,7 +67,7 @@
数据查询
-
+
@@ -550,7 +80,7 @@
增值服务
-
+
{{item.title}}
@@ -563,7 +93,7 @@
项目维修
-
+
@@ -577,7 +107,7 @@
待办工单
-
+
@@ -590,7 +120,7 @@
待办事件
-
+
@@ -604,7 +134,7 @@
工单数据
-
+
@@ -617,7 +147,7 @@
数据查询
-
+
@@ -630,7 +160,7 @@
结算情况
-
+
@@ -644,7 +174,7 @@
其他
-
+
{{item.title}}
@@ -918,4 +448,3 @@
->>>>>>> 6ceeddde3522c33ced86c4a63a2e9d96e5c2e383
diff --git a/pages/workOrder/workOrderThree.vue b/pages/workOrder/workOrderThree.vue
index 0dfc298..2515dc2 100644
--- a/pages/workOrder/workOrderThree.vue
+++ b/pages/workOrder/workOrderThree.vue
@@ -666,7 +666,7 @@
}
.remark .textarea {
-
+ font-size: 28rpx;
width: 100%;
box-sizing: border-box;
background-color: #f5f5f5;
diff --git a/pagesB/electronic-certificate/electronic-certificate.vue b/pagesB/electronic-certificate/electronic-certificate.vue
index 211c629..8b6f192 100644
--- a/pagesB/electronic-certificate/electronic-certificate.vue
+++ b/pagesB/electronic-certificate/electronic-certificate.vue
@@ -8,7 +8,7 @@
ID:{{userId}}
-
+
{{userName}}
diff --git a/pagesB/i-want-evaluate/i-want-evaluate.vue b/pagesB/i-want-evaluate/i-want-evaluate.vue
index 836b44a..af9c1a4 100644
--- a/pagesB/i-want-evaluate/i-want-evaluate.vue
+++ b/pagesB/i-want-evaluate/i-want-evaluate.vue
@@ -2,7 +2,7 @@
-
+
{{project_name}}
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index 9d1c79b..bf4ce7c 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -3,7 +3,15 @@
+
+
+
+
+
+
+
+
我的账户
未结算工单
@@ -89,6 +97,7 @@
export default {
data() {
return {
+ newTop: uni.getSystemInfoSync().statusBarHeight + 40,
current:true,
detailedList:[],
capitalDetail:{
diff --git a/pagesB/service-range/service-range.vue b/pagesB/service-range/service-range.vue
index 5fa06ce..7d221b1 100644
--- a/pagesB/service-range/service-range.vue
+++ b/pagesB/service-range/service-range.vue
@@ -6,13 +6,13 @@
人员状态 *
- {{item}}
+ {{item}}
工作时段 *
- {{item}}
+ {{item}}
@@ -31,7 +31,7 @@
服务范围 *
- {{item}}
+ {{item}}
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index 275a238..f339a3b 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -26,31 +26,31 @@
上门服务条款
- V3.0
+ V3.0
用户服务协议
- V1.1
+ V1.1
飞猴云服务隐私政策
- V1.2
+ V1.2
技术服务合作协议
- V1.1
+ V1.1
关于飞猴云服务
- V1.1
+ V1.1