From c0e697ff962fd40be344a005bf38b6b28bd3126a Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Mon, 28 Mar 2022 11:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/flying-monkey.css             |   4 +-
 manifest.json                         |   2 +-
 pages/feedback/feedback.vue           |   4 +-
 pages/mountingsList/mountingsList.vue |  18 +-
 pages/project/projectList.vue         |   9 +-
 pages/tabbar/my/my.vue                |   2 +-
 pages/tabbar/pagehome/pagehome.vue    |  21 +-
 pages/workOrder/details.vue           |  19 +-
 pages/workOrder/workOrder.vue         | 296 +++++------
 pages/workOrder/workOrderLlsit.vue    |  28 +-
 pages/workOrder/workOrderThree.vue    |   2 +-
 pages/workOrder/workorderTwo.vue      | 733 ++++++++++++++------------
 12 files changed, 610 insertions(+), 528 deletions(-)

diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index a6b2c2b..701ca57 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -73,9 +73,9 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
         width: 686rpx;
         border-radius: 50rpx;
         height: 90rpx;
-        background-color: #02A2ea;
+        background-color: #02A2ea !important;
         display: flex;justify-content: center;align-items: center;
-        color: #FFFFFF;
+        color: #FFFFFF !important;
         font-size: 30rpx;
     }
 /* 登录 */
diff --git a/manifest.json b/manifest.json
index e438fcc..ffc18f2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "飞猴",
-    "appid" : "__UNI__25FB71A",
+    "appid" : "__UNI__C9AEDD9",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue
index 6854cd0..23b129a 100644
--- a/pages/feedback/feedback.vue
+++ b/pages/feedback/feedback.vue
@@ -245,9 +245,9 @@
         margin-top: 58rpx;
         border-radius: 50rpx;
         height: 90rpx;
-        background-color: #02A2ea;
+        background-color: #02A2ea !important;
         line-height: 90rpx;
-        color: #FFFFFF;
+        color: #FFFFFF !important;
         text-align: center;
         font-size: 30rpx;
     }
diff --git a/pages/mountingsList/mountingsList.vue b/pages/mountingsList/mountingsList.vue
index 8c85160..0e4f97d 100644
--- a/pages/mountingsList/mountingsList.vue
+++ b/pages/mountingsList/mountingsList.vue
@@ -1,14 +1,15 @@
 <template>
     <view class="content">
         <statusNav navBarTitle="配件列表"></statusNav>
-        <view class="mountingsList-input">
+        <container-subgroup-two>
+          <view slot="content" style="margin:0rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight-40 + 'px'}">
+        <view class="mountingsList-input"  :style="{top:statusBarHeight + 'px'}">
             <input type="text" class="int" value="" placeholder="请输入关键字" />
             <image class="search" src="../../static/iocn/ss.png" mode=""></image>
             <view class="xian">
                 
             </view>
         </view>
-
         <view class="mountings-list">
             <view class="li" v-for="(item,index) in dataList">
                 <view class="textCon">
@@ -63,20 +64,24 @@
                 </view>
             </view>
         </view>
-
         <button class="submit-button" type="default">确认提交</button>
+            </view>
+             </container-subgroup-two>
     </view>
 </template>
 
 <script>
     import statusNav from '../../components/status-nav.vue';
+      import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
     export default {
         components: {
             statusNav,
+            containerSubgroupTwo
 
         },
         data() {
             return {
+                    statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
                 dataList: [{
                         title: "全彩LED显示屏接收卡",
                         state: true,
@@ -140,6 +145,7 @@
 	.mountingsList-input .xian {
 		width: 3rpx;
 		height: 35rpx;
+        z-index: 100;
 		position: absolute;
         background-color: #EAEAEA;
 		right: 100rpx;
@@ -160,8 +166,10 @@
 
     .mountingsList-input {
         width: 100%;
-        position: relative;
+        position: fixed;
         padding: 40rpx 16rpx;
+        
+        z-index: 2;
         box-sizing: border-box;
         background-color: #FFFFFF
     }
@@ -216,6 +224,8 @@
     .mountings-list .li .imgCon .img {
         width: 169rpx;
         height: 104rpx;
+        position: relative;
+        z-index: 1;
     }
 
     .mountings-list .li .title {
diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue
index c62b056..770f85e 100644
--- a/pages/project/projectList.vue
+++ b/pages/project/projectList.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="content" :style="{paddingTop: statusHeight + 'px'}">
+	<view class="content" :style="{paddingTop: statusHeight+25 + 'px'}">
 		<statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
 		<container-subgroup-two>
-		    <view slot="content" style="margin: -100rpx -30rpx;">
+		    <view slot="content" style="margin: -100rpx -30rpx 0rpx; ">
                 
-         <view class="project-list-input">
+         <view class="project-list-input" :style="{top: statusHeight + 'px'}">
          	<input type="text" class="int" value="" placeholder="请输入关键字" />
              <view class="xian">
                  
@@ -79,6 +79,7 @@
 				format: true
 			})
 			return {
+                     statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
 				date: currentDate,
 				array: ['类型', '类型', '类型', '类型'],
 				index: 0,
@@ -127,6 +128,8 @@
 		height: 114rpx;
 		position: relative;
 		padding: 20rpx 16rpx;
+        position: fixed;
+        z-index: 2;
 		box-sizing: border-box;
 		background-color: #FFFFFF
 	}
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index bac7a82..4ad943c 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -40,7 +40,7 @@
 				</view>
 				<!-- 六宫格 --> 
 				<view class="disjbac fw bacf" style="margin: 30rpx -20rpx 0rpx -20rpx;">
-					<view @tap="chooseGridEv(index)" class="disjcac fc width50 pad-sx40" v-for="(item,index) in gridList" :key="index" :class="`${(index%2!=0) ? 'bleft' : ''} ${(index < gridList.length-2) ? 'bbot' : ''}`" style="box-sizing: border-box;">
+					<view @tap="chooseGridEv(index)" class="disjcac fc width50 pad-sx40" v-for="(item,index) in gridList" :key="index" :class="[`${(index%2!=0) ? 'bleft' : ''} ${(index < gridList.length-2) ? 'bbot' : ''}`]" style="box-sizing: border-box;">
 						<image :src="item.imgsrc" mode="widthFix" lazy-load :style="{width: [52,52,46,50,46,52][index] + 'rpx',height: [48,45,52,52,53,52][index] + 'rpx'}"></image>
 						<view class="fon26 col3 mar-s20">{{item.title}}</view>
 					</view>
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index 328a7c6..bd47815 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -123,7 +123,7 @@
 				<view class="home-fun-box">
 					<view class="fun-title col3 fon28 disac bold">工单数据</view>
 					<view class="disac mar-s30">
-						<view class="disjcac fc width25" v-for="(item,index) in workOrderList" :key="index">
+						<view class="disjcac fc width25" @click="goWorkOrder(index)" v-for="(item,index) in workOrderList" :key="index">
 							<view class="posir">
 								<image :style="{width: [59,56,58,58][index]+'rpx',height:[49,58,58,60][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 								<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@@ -267,7 +267,7 @@
 					{imgsrc:'/static/public/icon-home-abnormalSingle.png',title:'异常单',num:0},
 					{imgsrc:'/static/public/icon-home-overdueSingle.png',title:'逾期单',num:0},
 					{imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0},
-					{imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6},
+					{imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6,},
 				],
 				// 结算情况
 				settlementList:[
@@ -309,6 +309,23 @@
 			this.getFaultsList();
 		},
 		methods: {
+            // 工单跳转
+            goWorkOrder(index){
+                if(index==0){
+                    
+                }else if(index==1){
+                    
+                }
+                else if(index==2){
+                    
+                }
+                else if(index==3){
+                    uni.navigateTo({
+                    	url:'/pages/workOrder/workOrderLlsit'
+                    })
+                }
+            
+            },
 			goNoticeDetail(e){
 				console.log(e);
 			},
diff --git a/pages/workOrder/details.vue b/pages/workOrder/details.vue
index 5538ae5..c902340 100644
--- a/pages/workOrder/details.vue
+++ b/pages/workOrder/details.vue
@@ -1,9 +1,9 @@
 <template>
-    <view class="content">
+    <view class="content" >
         <statusNav :navBarTitle="textTitle"></statusNav>
         <container-subgroup-two>
-            <view slot="content" style="margin:-25rpx 0rpx 0rpx;">
-                <view class="details-nav">
+            <view slot="content" style="margin:0rpx  -25rpx; "  :style="{paddingTop:statusBarHeight + 'px'}">
+                <view class="details-nav" :style="{top:statusBarHeighta + 'px'}">
                     <view class="li" @click="detailsNavpa(index)" :class="item.state?'on':''"
                         v-for="(item,index) in detailsNav">
                         {{item.title}}
@@ -504,6 +504,8 @@
             return {
                 swiperCurrent: 0,
                 swiHeight:0,
+                    statusBarHeight:uni.getSystemInfoSync().statusBarHeight + 30,
+                         statusBarHeighta:uni.getSystemInfoSync().statusBarHeight + 30,
                 textTitle: "工单详情",
                 isrideo: true,
                 detailsNav: [{
@@ -612,7 +614,6 @@
     .content {}
 
     .swiper {
-        min-height: 88vh;
         width: 100%;
 
     }
@@ -684,12 +685,20 @@
         justify-content: space-between;
         border-bottom: solid #D5D4D4 2rpx;
         padding: 0 24rpx;
+    
+        
+       position: fixed;
+        z-index: 2;
+        box-sizing: border-box;
+        width: 100%;
+        background-color: #F7F7F7;
+        left: 0rpx;
         margin-bottom: 20rpx;
     }
 
     .details-nav .li {
         width: 130rpx;
-        padding-top: 30rpx;
+        padding-top: 60rpx;
         font-size: 30rpx;
         padding-bottom: 35rpx;
     }
diff --git a/pages/workOrder/workOrder.vue b/pages/workOrder/workOrder.vue
index d7434b0..180b079 100644
--- a/pages/workOrder/workOrder.vue
+++ b/pages/workOrder/workOrder.vue
@@ -2,152 +2,153 @@
     <view class="content">
         <statusNav navBarTitle="处理工单"></statusNav>
         <container-subgroup-two>
-    <view slot="content" style="margin: 0 -25rpx;">
-    <view class="work-order-schedule">
-        <view class="li">
-            <view class="icon on icon-after">
-                1
+            <view slot="content" style="margin: 0 -25rpx;">
+                <view class="work-order-schedule">
+                    <view class="li">
+                        <view class="icon on icon-after">
+                            1
+                        </view>
+                        <view class="text">
+                            签到执行
+                        </view>
+                    </view>
+                    <view class="li">
+                        <view class="icon icon-after">
+                            2
+
+                        </view>
+                        <view class="text">
+                            填写维保单
+                        </view>
+                    </view>
+                    <view class="li">
+                        <view class="icon">
+                            3
+                        </view>
+                        <view class="text">
+                            结算审核
+                        </view>
+                    </view>
+                </view>
+
+                <view class="work-order-from">
+                    <view class="li">
+                        <view class="title">
+                            工单编号：
+
+                        </view>
+                        <input type="text" class="input" placeholder="" value="GD20211203-001" />
+
+                    </view>
+
+                    <view class="li">
+                        <view class="title">
+                            项目编号：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="GD20211203-001" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            项目名称：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            产品类型：
+                            >
+                        </view>
+                        <input type="text" class="input" placeholder="" value="Q2.5-E" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            安装位置：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="详细地址+某某栋11楼会议室" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            故障类型：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="供电不足" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            紧急程度：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="紧急" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+
+                            故障说明：
+                        </view>
+
+                        <textarea auto-height class="input"
+                            value="*********************************************************************************************************"
+                            placeholder="" />
+                    </view>
+                    <view class="li">
+                        <view class="title">
+
+                            故障图片：
+                        </view>
+
+                        <view class="input">
+                            <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                            <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                        </view>
+                    </view>
+                </view>
+
+
+
+                <view class="work-order-from">
+                    <view class="li">
+                        <view class="title">
+                            报 单 人：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="林某" />
+
+                    </view>
+
+                    <view class="li">
+                        <view class="title">
+                            报单时间：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="2021/12/3 12:00:05" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            服务方式：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="上门服务" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            定位地址：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="*******************************" />
+
+                    </view>
+                </view>
+
+                <button class="submit-button" @click="goWorkOrderThree()" type="default">签到</button>
             </view>
-            <view class="text">
-                签到执行
-            </view>
-        </view>
-        <view class="li">
-            <view class="icon icon-after">
-                2
-            </view>
-            <view class="text">
-                填写维保单
-            </view>
-        </view>
-        <view class="li">
-            <view class="icon">
-                3
-            </view>
-            <view class="text">
-                结算审核
-            </view>
-        </view>
-    </view>
-    
-    <view class="work-order-from">
-        <view class="li">
-            <view class="title">
-                工单编号：
-            </view>
-            <input type="text" class="input" placeholder="" value="GD20211203-001" />
-    
-        </view>
-    
-        <view class="li">
-            <view class="title">
-                项目编号：
-            </view>
-            <input type="text" class="input" placeholder="" value="GD20211203-001" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                项目名称：
-            </view>
-            <input type="text" class="input input-black
-            " placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                产品类型：
-            </view>
-            <input type="text" class="input" placeholder="" value="Q2.5-E" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                安装位置：
-            </view>
-            <input type="text" class="input" placeholder="" value="详细地址+某某栋11楼会议室" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                故障类型：
-            </view>
-            <input type="text" class="input" placeholder="" value="供电不足" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                紧急程度：
-            </view>
-            <input type="text" class="input" placeholder="" value="紧急" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-    
-                故障说明：
-            </view>
-    
-            <textarea auto-height class="input"
-                value="*********************************************************************************************************"
-                placeholder="" />
-        </view>
-        <view class="li">
-            <view class="title">
-    
-                故障图片：
-            </view>
-    
-            <view class="input">
-                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-            </view>
-        </view>
-    </view>
-    
-    
-    
-    <view class="work-order-from">
-        <view class="li">
-            <view class="title">
-                报 单 人：
-            </view>
-            <input type="text" class="input" placeholder="" value="林某" />
-    
-        </view>
-    
-        <view class="li">
-            <view class="title">
-                报单时间：
-            </view>
-            <input type="text" class="input" placeholder="" value="2021/12/3 12:00:05" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                服务方式：
-            </view>
-            <input type="text" class="input input-black" placeholder="" value="上门服务" />
-    
-        </view>
-        <view class="li">
-            <view class="title">
-                定位地址：
-            </view>
-            <input type="text" class="input" placeholder="" value="*******************************" />
-    
-        </view>
-    </view>
-    
-    <button class="submit-button" type="default">签到</button>
-</view>
         </container-subgroup-two>
-   
+
     </view>
 </template>
 
 <script>
-       import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+    import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
     import statusNav from '../../components/status-nav.vue';
     import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
     export default {
@@ -162,23 +163,18 @@
             }
         },
         methods: {
-
+            goWorkOrderThree() {
+                uni.navigateTo({
+                    url: "/pages/workOrder/workorderTwo"
+                })
+            }
         }
     }
 </script>
 
 <style>
-
     .submit-button {
-        width: 686rpx;
-        border-radius: 50rpx;
-        height: 90rpx;
-        background-color: #02A2ea;
-        line-height: 90rpx;
-        color: #FFFFFF;
         margin-top: 60rpx;
-        text-align: center;
-        font-size: 30rpx;
     }
 
     .work-order-schedule {
diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue
index a3f9bd9..b732752 100644
--- a/pages/workOrder/workOrderLlsit.vue
+++ b/pages/workOrder/workOrderLlsit.vue
@@ -3,8 +3,8 @@
         <status-nav navBarTitle="工单列表" returnColor="#c2c2c2"></status-nav>
         
         <container-subgroup-two>
-        <view slot="content" style="margin: 0 -25rpx;">
-            <view class="project-list-input">
+        <view slot="content" style="margin: -25rpx -25rpx 0rpx;">
+            <view class="project-list-input" :style="{top:statusBarHeight + 'px'}">
                 <input type="text" class="int" value="" placeholder="请输入关键字" />
                 <image class="search" src="../../static/iocn/ss.png" mode=""></image>
                 <view class="xian">
@@ -226,18 +226,31 @@
                 format: true
             })
             return {
+                     statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
+                    role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
                 date: currentDate,
                 array: ['类型', '类型', '类型', '类型'],
                 index: 0,
                 
               
             }
+        },
+        onLoad() {
+            
         },
         methods: {
             projectDetailsFun() {
-                // uni.navigateTo({
-                //     url: "/pages/project/details"
-                // })
+                    
+                if(this.role==4){
+                    uni.navigateTo({
+                        url: "/pages/workOrder/workOrder"
+                    })
+                }else{
+                  uni.navigateTo({
+                      url: "/pages/workOrder/details"
+                  })  
+                }
+             
             },
             bindPickerChange(data) {
                 console.log(data)
@@ -283,7 +296,8 @@
     .project-list-input {
         width: 100%;
         height: 114rpx;
-        position: relative;
+        position: fixed;
+        z-index: 2;
         padding: 20rpx 16rpx;
         box-sizing: border-box;
         background-color: #FFFFFF
@@ -331,6 +345,8 @@
     .screen .li .img {
         width: 14rpx;
         height: 8rpx;
+        position: relative;
+        z-index: 1;
     }
 
     .screen .li .imgA {
diff --git a/pages/workOrder/workOrderThree.vue b/pages/workOrder/workOrderThree.vue
index 3d709ac..d896168 100644
--- a/pages/workOrder/workOrderThree.vue
+++ b/pages/workOrder/workOrderThree.vue
@@ -11,7 +11,7 @@
               </view>
               <view class="text">
                   签到执行
-              </view>
+              </view> 
           </view>
           <view class="li">
               <view class="icon  icon-after">
diff --git a/pages/workOrder/workorderTwo.vue b/pages/workOrder/workorderTwo.vue
index 7e6a940..065d61a 100644
--- a/pages/workOrder/workorderTwo.vue
+++ b/pages/workOrder/workorderTwo.vue
@@ -1,288 +1,291 @@
 <template>
     <view class="content">
         <statusNav navBarTitle="处理工单"></statusNav>
-      <container-subgroup-two>
-        <view slot="content" style="margin: 0 -25rpx;">
-        <view class="work-order-schedule">
-            <view class="li">
-                <view class="icon  icon-after">
-                    1
-                </view>
-                <view class="text">
-                    签到执行
-                </view>
-            </view>
-            <view class="li">
-                <view class="icon on icon-after">
-                    2
-                </view>
-                <view class="text">
-                    填写维保单
-                </view>
-            </view>
-            <view class="li">
-                <view class="icon">
-                    3
-                </view>
-                <view class="text">
-                    结算审核
-                </view>
-            </view>
-        </view>
-        
-        <view class="work-order-from">
-            <view class="li">
-                <view class="title">
-                    工单编号：
-                </view>
-                <input type="text" class="input" placeholder="" value="GD20211203-001" />
-        
-            </view>
-        
-            <view class="li">
-                <view class="title">
-                    项目编号：
-                </view>
-                <input type="text" class="input" placeholder="" value="XM20211203-001" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    项目名称：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    产品类型：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="Q2.5-E" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    安装位置：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="详细地址+某某栋11楼会议室" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    故障类型：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="供电不足" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    服务方式：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="上门服务" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-        
-                    故障说明：
-                </view>
-        
-                <textarea auto-height class="input input-black"
-                    value="*********************************************************************************************************"
-                    placeholder="" />
-            </view>
-            <view class="li">
-                <view class="title">
-                    故障图片：
-                </view>
-        
-                <view class="input add-display">
-                    <view class="">
-                        <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-                        <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+        <container-subgroup-two>
+            <view slot="content" style="margin: 0 -25rpx;">
+                <view class="work-order-schedule">
+                    <view class="li">
+                        <view class="icon  icon-after">
+                            1
+                        </view>
+                        <view class="text">
+                            签到执行
+                        </view>
                     </view>
-        
-        
-                    <view class="add-img">
-                        <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
+                    <view class="li">
+                        <view class="icon on icon-after">
+                     2
+    
+                        </view>
+                        <view class="text">
+                            填写维保单
+                        </view>
+                    </view>
+                    <view class="li">
+                        <view class="icon">
+                      3
+   
+                        </view>
+                        <view class="text">
+                            结算审核
+                        </view>
                     </view>
                 </view>
-            </view>
-        
-            <view class="li">
-                <view class="title">
-                    开始时间：
-                </view>
-                <input type="text" class="input " placeholder="" value="2022-01-25  09:39" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    结束时间：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="2022-01-25  15:30" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    维保用时：
-                </view>
-                <input type="text" class="input " placeholder="" value="5小时51分钟" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    维保费用：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="¥500.00元" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    等待时长：
-                </view>
-                <input type="text" class="input " placeholder="" value="1天6小时35分钟" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    主维保人：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="陈志远" />
-        
-            </view>
-            <view class="li">
-                <view class="title">
-                    更换配件：
-                </view>
-          <view class="rideo">
-                                            <view class="isrideo" @click="isrideoFun(true)">
-                                                <view class="icon " :class="isrideo?'on':''">
-                                                   <view class="icon-content">
-                                                       
-                                                   </view>
-                                                </view>
-                                                <view class="">
-                                                    是
-                                                </view>
-                                            </view>
-                                            <view class="isrideo"  @click="isrideoFun(false)" >
-                                                <view class="icon" :class="isrideo?'':'on'">
-          <view class="icon-content">
-                                                       
-                                                   </view>
-                                                </view>
-                                                <view class="">
-                                                    否
-                                                </view>
-                                            </view>
-                                        </view>
-        
-            </view>
-        </view>
-        
-        
-        
-        <view class="work-order-from">
-            <view class="li">
-                <view class="title">
-        
-                    工作描述：
-                </view>
-        
-                <textarea auto-height class="input input-black"
-                    value="*********************************************************************************************************"
-                    placeholder="" />
-            </view>
-        
-            <view class="li">
-                <view class="title">
-                    维保图片：
-                </view>
-        
-                <view class="input add-display">
-                    <view class="">
-                        <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-                        <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+
+                <view class="work-order-from">
+                    <view class="li">
+                        <view class="title">
+                            工单编号：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="GD20211203-001" />
+
                     </view>
-        
-        
-                    <view class="add-img">
-                        <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
+
+                    <view class="li">
+                        <view class="title">
+                            项目编号：
+                        </view>
+                        <input type="text" class="input" placeholder="" value="XM20211203-001" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            项目名称：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            产品类型：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="Q2.5-E" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            安装位置：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="详细地址+某某栋11楼会议室" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            故障类型：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="供电不足" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            服务方式：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="上门服务" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+
+                            故障说明：
+                        </view>
+
+                        <textarea auto-height class="input input-black"
+                            value="*********************************************************************************************************"
+                            placeholder="" />
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            故障图片：
+                        </view>
+
+                        <view class="input add-display">
+                            <view class="">
+                                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                            </view>
+
+
+                            <view class="add-img">
+                                <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="li">
+                        <view class="title">
+                            开始时间：
+                        </view>
+                        <input type="text" class="input " placeholder="" value="2022-01-25  09:39" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            结束时间：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="2022-01-25  15:30" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            维保用时：
+                        </view>
+                        <input type="text" class="input " placeholder="" value="5小时51分钟" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            维保费用：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="¥500.00元" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            等待时长：
+                        </view>
+                        <input type="text" class="input " placeholder="" value="1天6小时35分钟" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            主维保人：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="陈志远" />
+
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            更换配件：
+                        </view>
+                        <view class="rideo">
+                            <view class="isrideo" @click="isrideoFun(true)">
+                                <view class="icon " :class="isrideo?'on':''">
+                                    <view class="icon-content">
+
+                                    </view>
+                                </view>
+                                <view class="">
+                                    是
+                                </view>
+                            </view>
+                            <view class="isrideo" @click="isrideoFun(false)">
+                                <view class="icon" :class="isrideo?'':'on'">
+                                    <view class="icon-content">
+
+                                    </view>
+                                </view>
+                                <view class="">
+                                    否
+                                </view>
+                            </view>
+                        </view>
+
                     </view>
                 </view>
+
+
+
+                <view class="work-order-from">
+                    <view class="li">
+                        <view class="title">
+
+                            工作描述：
+                        </view>
+
+                        <textarea auto-height class="input input-black"
+                            value="*********************************************************************************************************"
+                            placeholder="" />
+                    </view>
+
+                    <view class="li">
+                        <view class="title">
+                            维保图片：
+                        </view>
+
+                        <view class="input add-display">
+                            <view class="">
+                                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                                <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+                            </view>
+
+
+                            <view class="add-img">
+                                <image class="icon" src="../../static/iocn/jia.png" mode=""></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="li">
+                        <view class="title">
+
+                            故障原因：
+                        </view>
+
+                        <textarea auto-height class="input input-black"
+                            value="*********************************************************************************************************"
+                            placeholder="" />
+                    </view>
+                    <view class="li">
+                        <view class="title">
+                            维保人员：
+                        </view>
+                        <input type="text" class="input input-black" placeholder="" value="罗帅       陈志远" />
+
+                    </view>
+                </view>
+                <view class="cost-breakdown">
+                    <view class="cost-breakdown-title">
+                        <view class="title">
+                            费用明细
+                        </view>
+                        <view @click="addMountingsList()" class="btn">
+                            添加配件
+                        </view>
+                    </view>
+                </view>
+
+                <view class="cost-breakdown-content">
+                    <view class="title">
+                        <view class="li">
+                            序号
+                        </view>
+                        <view class="li">
+                            配件名称
+                        </view>
+                        <view class="li">
+                            数量
+                        </view>
+                        <view class="li">
+                    
+       价格
+                        </view>
+                    </view>
+                    <view class="text" v-for="(item,index) in accessoriesData">
+                        <view class="li">
+                            {{item.id}}
+                        </view>
+                        <view class="li">
+                            {{item.title}}
+                        </view>
+                        <view class="li">
+                            {{item.num}}
+                        </view>
+                        <view class="li">
+                            {{item.price}}元
+                        </view>
+                    </view>
+                </view>
+                <button class="submit-button" @click="goWorkorderTwo()" type="default">下一步</button>
+
             </view>
-            <view class="li">
-                <view class="title">
-        
-                    故障原因：
-                </view>
-        
-                <textarea auto-height class="input input-black"
-                    value="*********************************************************************************************************"
-                    placeholder="" />
-            </view>
-            <view class="li">
-                <view class="title">
-                    维保人员：
-                </view>
-                <input type="text" class="input input-black" placeholder="" value="罗帅       陈志远" />
-        
-            </view>
-        </view>
-        <view class="cost-breakdown">
-            <view class="cost-breakdown-title">
-                <view class="title">
-                    费用明细
-                </view>
-                <view class="btn">
-                    添加配件
-                </view>
-            </view>
-        </view>
-        
-        <view class="cost-breakdown-content">
-            <view class="title">
-                <view class="li">
-                    序号
-                </view>
-                <view class="li">
-                    配件名称
-                </view>
-                <view class="li">
-                    数量
-                </view>
-                <view class="li">
-                    价格
-                </view>
-            </view>
-            <view class="text" v-for="(item,index) in accessoriesData">
-                <view class="li">
-                    {{item.id}}
-                </view>
-                <view class="li">
-                    {{item.title}}
-                </view>
-                <view class="li">
-                    {{item.num}}
-                </view>
-                <view class="li">
-                    {{item.price}}元
-                </view>
-            </view>
-        </view>
-        <button class="submit-button" type="default">下一步</button>
-                
-            </view>
-                </container-subgroup-two>
-  
+        </container-subgroup-two>
+
     </view>
 </template>
 
 <script>
     import statusNav from '../../components/status-nav.vue';
     import footTabOne from "../../components/foot-tabs/foot-tab-one.vue"
-     import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+    import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
     export default {
         components: {
             footTabOne,
@@ -291,7 +294,7 @@
         },
         data() {
             return {
-                     isrideo:true,
+                isrideo: true,
                 accessoriesData: [{
                         id: 1,
                         title: "全彩LED显示屏接收卡",
@@ -317,15 +320,25 @@
             }
         },
         methods: {
-isrideoFun(is){
-  this.isrideo=is  
-},
+            isrideoFun(is) {
+                this.isrideo = is
+            },
+            goWorkorderTwo(){
+               uni.navigateTo({
+                   url: "/pages/workOrder/workOrderThree"
+               }) 
+            },
+            addMountingsList() {
+                uni.navigateTo({
+                    url: "/pages/mountingsList/mountingsList"
+                })
+
+            }
         }
     }
 </script>
 
 <style>
- 
     .submit-button {
         width: 686rpx;
         border-radius: 50rpx;
@@ -434,7 +447,7 @@ isrideoFun(is){
     }
 
     .cost-breakdown-title {
-         padding: 0rpx 40rpx;
+        padding: 0rpx 40rpx;
         display: flex;
         justify-content: space-between;
         margin-top: 40rpx;
@@ -471,84 +484,102 @@ isrideoFun(is){
         border: 2rpx solid #00a2e9;
 
     }
-    .cost-breakdown-content{
-      padding: 0rpx 40rpx;
+
+    .cost-breakdown-content {
+        padding: 0rpx 40rpx;
     }
-    .cost-breakdown-content .title{
+
+    .cost-breakdown-content .title {
         display: flex;
-             margin-bottom: 40rpx;
+        margin-bottom: 40rpx;
         justify-content: space-between;
     }
-     .cost-breakdown-content .title .li{
-         font-size: 28rpx;
-         font-weight: bold;
-         color: #222222;
-    
-         text-align: center;
-     }
-     .cost-breakdown-content .text{
-         display: flex;
-              margin-bottom: 40rpx;
-         justify-content: space-between;
-     }
-       .cost-breakdown-content .text .li{
-           color: #4c4c4c;
-           font-size: 28rpx;
-           text-align: center;
-       }
-        .cost-breakdown-content .text .li:nth-child(1){
-            width: 80rpx;
-        }
-        .cost-breakdown-content .text .li:nth-child(2){
-           flex: 1;
-        }
-        .cost-breakdown-content .text .li:nth-child(3){
-         width: 80rpx;
-        }
-        .cost-breakdown-content .text .li:nth-child(4){
-         width: 120rpx;
-        }
-        .cost-breakdown-content .title .li:nth-child(1){
-            width: 80rpx;
-        }
-        .cost-breakdown-content .title .li:nth-child(2){
-           flex: 1;
-        }
-        .cost-breakdown-content .title .li:nth-child(3){
-         width: 80rpx;
-        }
-        .cost-breakdown-content .title .li:nth-child(4){
-         width: 120rpx;
-        }
-       .work-order-from .rideo{
-             display: flex;
-         }
-            .work-order-from .isrideo{
-                display: flex;
-                align-items: center;
-                margin-right: 41rpx;
-            }
-       .work-order-from .isrideo .icon{
-           width: 26rpx;
-           border: 2rpx solid #818181;
-           border-radius: 50%;
-           height: 26rpx;
-           margin-right: 10rpx;
-           display: flex;
-           justify-content: center;
-           align-items: center;
-       }
-         .work-order-from .isrideo .icon .icon-content{
-             width: 19rpx;
-             height: 19rpx;
-             background-color: #818181;
-                 border-radius: 50%;
-         }
-              
-          .work-order-from .isrideo .on{
-               border: 2rpx solid #D81E06;
-          }
-          .work-order-from .isrideo .on .icon-content{
-               background-color:  #D81E06
-          }
+
+    .cost-breakdown-content .title .li {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #222222;
+
+        text-align: center;
+    }
+
+    .cost-breakdown-content .text {
+        display: flex;
+        margin-bottom: 40rpx;
+        justify-content: space-between;
+    }
+
+    .cost-breakdown-content .text .li {
+        color: #4c4c4c;
+        font-size: 28rpx;
+        text-align: center;
+    }
+
+    .cost-breakdown-content .text .li:nth-child(1) {
+        width: 80rpx;
+    }
+
+    .cost-breakdown-content .text .li:nth-child(2) {
+        flex: 1;
+    }
+
+    .cost-breakdown-content .text .li:nth-child(3) {
+        width: 80rpx;
+    }
+
+    .cost-breakdown-content .text .li:nth-child(4) {
+        width: 120rpx;
+    }
+
+    .cost-breakdown-content .title .li:nth-child(1) {
+        width: 80rpx;
+    }
+
+    .cost-breakdown-content .title .li:nth-child(2) {
+        flex: 1;
+    }
+
+    .cost-breakdown-content .title .li:nth-child(3) {
+        width: 80rpx;
+    }
+
+    .cost-breakdown-content .title .li:nth-child(4) {
+        width: 120rpx;
+    }
+
+    .work-order-from .rideo {
+        display: flex;
+    }
+
+    .work-order-from .isrideo {
+        display: flex;
+        align-items: center;
+        margin-right: 41rpx;
+    }
+
+    .work-order-from .isrideo .icon {
+        width: 26rpx;
+        border: 2rpx solid #818181;
+        border-radius: 50%;
+        height: 26rpx;
+        margin-right: 10rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .work-order-from .isrideo .icon .icon-content {
+        width: 19rpx;
+        height: 19rpx;
+        background-color: #818181;
+        border-radius: 50%;
+    }
+
+    .work-order-from .isrideo .on {
+        border: 2rpx solid #D81E06;
+    }
+
+    .work-order-from .isrideo .on .icon-content {
+        background-color: #D81E06
+    }
 </style>