diff --git a/components/lw-notice/lw-notice.vue b/components/lw-notice/lw-notice.vue
index 3e15a24..a2b8a86 100644
--- a/components/lw-notice/lw-notice.vue
+++ b/components/lw-notice/lw-notice.vue
@@ -220,7 +220,6 @@ moreColor:显示更多的颜色
                 delayTime = unitRunTime * 3.5;
                 dispairTime = unitRunTime * 1.5;
                 // #endif
-
                 let showTransformHeight = -uni.upx2px(that.height);
                 let hideTransformHeight = showTransformHeight * 2;
                 // 创建动画
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 3d7a2fd..6e91068 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -160,8 +160,8 @@
 					'/pagesB/personal-information/personal-information',
 					'/pagesB/electronic-certificate/electronic-certificate',
 					'/pagesB/service-range/service-range',
-					'/pagesB/i-want-evaluate/i-want-evaluate',
-					'/pagesB/my-account/my-account',
+					'/pages/workOrder/workOrderLlsit?status=已完成',
+					'/pagesB/my-account/my-account?index=0',
 					'/pagesB/set-up/set-up',
 				];
 				uni.navigateTo({
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index d48d84b..3b15579 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -57,7 +57,7 @@
 						<!-- 故障报修 -->
 						<view class="home-fun-box">
 							<view class="fun-title col3 fon28 disac bold">故障报修</view>
-							<view class="disac mar-s30">
+							<view class="disac mar-s30" style="height: 58rpx;">
 								<view @tap="goFaultRepair(index)" class="disjcac fc width25" v-for="(item,index) in repairList" :key="index">
 									<image :style="{width: [58,58,50][index]+'rpx',height:[53,56,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 									<view class="fon24 col3 mar-s10">{{item.title}}</view>
@@ -69,7 +69,7 @@
 							<view class="fun-title col3 fon28 disac bold">数据查询</view>
 							<view class="disac mar-s30">
 								<view @tap="dataQueryEv(index)" class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
-									<view class="posir">
+									<view class="posir" style="height: 56rpx;">
 										<image :style="{width: [58,58,58][index]+'rpx',height:[46,56,50][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>
 									</view>
@@ -80,7 +80,7 @@
 						<!-- 增值服务 -->
 						<view class="home-fun-box">
 							<view class="fun-title col3 fon28 disac bold">增值服务</view>
-							<view class="disac mar-s30">
+							<view class="disac mar-s30" style="height: 56rpx;">
 								<view @tap="goIncrement(index)" class="disjcac fc width25" v-for="(item,index) in incrementList" :key="index">
 									<image :style="{width: [57,52,58,51][index]+'rpx',height:[56,56,50,56][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 									<view class="fon24 col3 mar-s10">{{item.title}}</view>
@@ -94,8 +94,8 @@
 						<view class="home-fun-box" v-if="role==4">
 							<view class="fun-title col3 fon28 disac bold">项目维修</view>
 							<view class="disac mar-s30">
-								<view class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index">
-									<view class="posir">
+								<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index">
+									<view class="posir" style="height: 58rpx;">
 										<image :style="{width: [53,52,51][index]+'rpx',height:[58,58,58][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>
 									</view>
@@ -108,8 +108,8 @@
 							<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 stayWorkOrderList" :key="index">
-										<view class="posir">
+									<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in stayWorkOrderList" :key="index">
+										<view class="posir" style="height: 58rpx;">
 											<image :style="{width: [53,48,51,58][index]+'rpx',height:[58,58,58,53][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>
 										</view>
@@ -121,8 +121,8 @@
 							<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 stayEventList" :key="index">
-										<view class="posir">
+									<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in stayEventList" :key="index">
+										<view class="posir" style="height: 58rpx;">
 											<image :style="{width: [58,58,50][index]+'rpx',height:[58,54,58][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>
 										</view>
@@ -135,8 +135,8 @@
 						<view class="home-fun-box">
 							<view class="fun-title col3 fon28 disac bold">工单数据</view>
 							<view class="disac mar-s30">
-								<view class="disjcac fc width25" @click="goWorkOrder(index)" v-for="(item,index) in workOrderList" :key="index">
-									<view class="posir">
+								<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in workOrderList" :key="index">
+									<view class="posir" style="height: 60rpx;">
 										<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>
 									</view>
@@ -149,7 +149,7 @@
 							<view class="fun-title col3 fon28 disac bold">数据查询</view>
 							<view class="disac mar-s30">
 								<view @tap="dataQueryEv(index)" class="disjcac fc width25" v-for="(item,index) in dataQueryList" :key="index">
-									<view class="posir">
+									<view class="posir" style="height: 56rpx;">
 										<image :style="{width: [58,58,58][index]+'rpx',height:[46,56,50][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>
 									</view>
@@ -161,8 +161,8 @@
 						<view class="home-fun-box" v-if="role==4">
 							<view class="fun-title col3 fon28 disac bold">结算情况</view>
 							<view class="disac mar-s30">
-								<view class="disjcac fc width25" v-for="(item,index) in settlementList" :key="index">
-									<view class="posir">
+								<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in settlementList" :key="index">
+									<view class="posir" style="height: 58rpx;">
 										<image :style="{width: [58,50,58][index]+'rpx',height:[54,58,58][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>
 									</view>
@@ -174,7 +174,7 @@
 					<!-- 其他 -->
 					<view class="home-fun-box">
 						<view class="fun-title col3 fon28 disac bold">其他</view>
-						<view class="disac mar-s30">
+						<view class="disac mar-s30" style="height: 58rpx;">
 							<view @tap="otherEv(index)" class="disjcac fc width25" v-for="(item,index) in otherList" :key="index">
 								<image :style="{width: [58,49,58][index]+'rpx',height:[51,58,55][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
 								<view class="fon24 col3 mar-s10">{{item.title}}</view>
@@ -241,7 +241,7 @@
 		},
 		data() {
 			return {
-				role: 1, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
 				statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
 				messageNumber: 16 ,// 消息数量
 				noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -317,30 +317,13 @@
 			// 获取当前页面url
 			this.$toolAll.tools.obtainUrl();
 			// 调用解决方案类型事件
-			this.getPlanType();
+			// this.getPlanType();
 			// 调用增值服务类型
 			// this.getIncrementServiceType();
 			// 调用获取常见故障列表事件
 			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);
 			},
@@ -350,6 +333,18 @@
 					url:`/pages/appreciationServe/appreciationServe?index=${index}`
 				})
 			},
+			// 待办事件
+			stayEv(title) {
+				let url = '';
+				if(title=='佣金') {
+					url = `/pagesB/my-account/my-account?index=1`
+				} else {
+					url = `/pages/workOrder/workOrderLlsit?status=${title}`
+				}
+				uni.navigateTo({
+					url:url
+				})
+			},
 			// 查询增值服务类型
 			getIncrementServiceType(){
 				this.$requst.post('/universal/api.vas/vas_type').then(res=>{
diff --git a/pages/workOrder/details.vue b/pages/workOrder/details.vue
index ae859e0..55215a7 100644
--- a/pages/workOrder/details.vue
+++ b/pages/workOrder/details.vue
@@ -468,22 +468,12 @@
                                             </view>
                                         </view>
                                     </view>
-
-
-                                    <view class="button">
-                                        我要评价
-                                    </view>
+                                    <view class="button" @tap="goEvaluate(1)">我要评价</view>
                                 </view>
-
-
                             </view>
-
-
                         </view>
                     </swiper-item>
                 </swiper>
-
-
             </view>
         </container-subgroup-two>
 
@@ -604,7 +594,13 @@
             },
             detailsNavpa(index) {
                 this.swiperCurrent = index
-            }
+            },
+			// 前往评价页面
+			goEvaluate(id) {
+				uni.navigateTo({
+					url:`/pagesB/i-want-evaluate/i-want-evaluate?id=${id}`
+				})
+			}
 
         }
     }
diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue
index 5e1d029..4cb3367 100644
--- a/pages/workOrder/workOrderLlsit.vue
+++ b/pages/workOrder/workOrderLlsit.vue
@@ -1,104 +1,67 @@
 <template>
-    <view class="content">
-        <status-nav  navBarTitle="工单列表" returnColor="#c2c2c2"></status-nav>
-        
-        <container-subgroup-two>
-        <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">
-                    
-                </view>
-            </view>
-            
-            <view class="screen">
-                <picker @change="bindPickerChange" :value="index" :range="array">
-                    <view class="li">
-                        <view class="text">
-                            工单状态
-                        </view>
-                        <image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
-            
-                    </view>
-                </picker>
-                <picker mode="date" :value="date" @change="bindDateChange">
-            
-                    <view class="li">
-                        <view class="text">
-                            工单日期
-                        </view>
-                        <image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
-                    </view>
-            
-                </picker>
-            
-                <view class="li">
-                    <view class="text">
-                        筛选
-                    </view>
-                    <image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill"></image>
-                </view>
-            </view>
-            
-            <view class="project-list">
-                <view class="li" @click="projectDetailsFun()">
-                    <view class="work-order-code">
-                        工单编号：222226666558
-                    </view>
-                    <view class="message">
-                        <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
-            
-                        <view class="text">
-                            <view class="title">
-            
-                                <view class="text clips1">
-                                    长沙市望城区xxxxxx项目名称
-                                </view>
-                                <view class="icon">
-                                    待维修
-                                </view>
-                            </view>
-                            <view class="disjb fc" style="margin-left: -20rpx;height: 70%;">
-                                <view class="serial-number scal09">
-                                    <view class="type">
-                                        #网络故障#
-                                    </view>
-                                    <view class="date">
-                                        已故障2小时37分
-                                    </view>
-                                </view>
-                                <view class="specification scal09">
-                                            
-                                    紧急程度：<view class="text"> 加急
-                                    </view>
-                                </view>
-                                <view class="specification scal09">
-                                    主负责人：陈志远
-                                </view>
-                                <view class="installation-site   scal09">
-                                    故障描述：LED显示屏开机后闪屏，不显示内容。主控电
-                                    脑提示网络不通
-                                </view>
-                            </view>
-                          
-                        </view>
-                    </view>
-            
-                    <view class="project-list-address">
-                        <view class="address clips2">
-                            <image class="img" src="../../static/iocn/dz2.png" mode="aspectFill"></image>
-                            <view class="text" >
-                                湖南省长沙市高新开发区谷园路109号像素大厦1205
-                            </view>
-                        </view>
-                        <view class="date">
-                            催一催 <image class="img" src="../../static/iocn/ld.png" mode=""></image>
-                        </view>
-                    </view>
-            
-                </view>
-          <!--      <view class="li" @click="projectDetailsFun()">
+	<view class="content">
+		<status-nav navBarTitle="工单列表" returnColor="#c2c2c2"></status-nav>
+
+		<container-subgroup-two>
+			<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"></view>
+				</view>
+				<view class="screen">
+					<picker @change="bindPickerChange" :value="workeOrderStatusIndex" :range="array" :range-key="'title'">
+						<view class="li">
+							<view class="text" v-if="workeOrderStatus!=''">{{workeOrderStatus}}</view>
+							<view class="text" v-else>{{array[workeOrderStatusIndex].title}}</view>
+							<image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
+						</view>
+					</picker>
+					<picker mode="date" :value="date" @change="bindDateChange">
+						<view class="li">
+							<view class="text">工单日期</view>
+							<image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image>
+						</view>
+					</picker>
+					<view class="li">
+						<view class="text">筛选</view>
+						<image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill"></image>
+					</view>
+				</view>
+				<view class="project-list">
+					<view class="li" @click="projectDetailsFun()" v-for="(item,index) in dataList" :key="index">
+						<view class="work-order-code">工单编号：{{item.orderNum}}</view>
+						<view class="message">
+							<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
+							<view class="text">
+								<view class="title">
+									<view class="text clips1">{{item.title}}</view>
+									<view class="icon" :style="{backgroundColor: item.backgroundColor}">{{['','待受理','等待派工','待接单','待维修','维修中','待收款','待审批','已完成','待回访','异常单','逾期单','超时单'][item.status]}}</view>
+								</view>
+								<view class="disjb fc" style="margin-left: -20rpx;height: 70%;">
+									<view class="serial-number scal09">
+										<view class="type">{{item.faultType}}</view>
+										<view class="date">已故障{{item.faultTime}}</view>
+									</view>
+									<view class="specification scal09">
+										紧急程度：<view class="text"> {{item.urgentText}}</view>
+									</view>
+									<view class="specification scal09">主负责人：{{item.name}}</view>
+									<view class="installation-site   scal09">故障描述：{{item.describe}}</view>
+								</view>
+							</view>
+						</view>
+						<view class="project-list-address">
+							<view class="address clips2">
+								<image class="img" src="../../static/iocn/dz2.png" mode="aspectFill"></image>
+								<view class="text">{{item.address}}</view>
+							</view>
+							<view class="date" v-if="item.status!=8 && item.status!=9">
+								催一催 <image class="img" src="../../static/iocn/ld.png" mode=""></image>
+							</view>
+						</view>
+					</view>
+					<!--      <view class="li" @click="projectDetailsFun()">
                     <view class="work-order-code">
                         工单编号：222226666558
                     </view>
@@ -205,312 +168,452 @@
                 
                 </view>
             -->
-            </view>
-            
-                   </view>
-                    </container-subgroup-two>
+				</view>
 
-    </view>
+			</view>
+		</container-subgroup-two>
+
+	</view>
 </template>
 
 <script>
-       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 {
-        components: {
-            footTabOne,
-            statusNav,
-            containerSubgroupTwo
-        },
-        data() {
-            const currentDate = this.getDate({
-                format: true
-            })
-            return {
-                     statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
-                    role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
-                date: currentDate,
-                array: ['类型', '类型', '类型', '类型'],
-                index: 0,
-                
-              
-            }
-        },
-        onLoad() {
-            
-        },
-        methods: {
-            projectDetailsFun() {
-                    
-                if(this.role==4){
-                    uni.navigateTo({
-                        url: "/pages/workOrder/workOrder"
-                    })
-                }else{
-                  uni.navigateTo({
-                      url: "/pages/workOrder/details"
-                  })  
-                }
-             
-            },
-            bindPickerChange(data) {
-                console.log(data)
-            },
-            bindDateChange(date) {
-                console.log(date)
-            },
-            getDate(type) {
-                const date = new Date();
-                let year = date.getFullYear();
-                let month = date.getMonth() + 1;
-                let day = date.getDate();
+	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 {
+		components: {
+			footTabOne,
+			statusNav,
+			containerSubgroupTwo
+		},
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 40,
+				role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 
+				date: currentDate,
+				workeOrderStatus:'工单状态',
+				array: [
+					{id:1,title:'待受理'},
+					{id:2,title:'待指派'},
+					{id:3,title:'待接单'},
+					{id:4,title:'待维修'},
+					{id:5,title:'维修中'},
+					{id:6,title:'待收款'},
+					{id:7,title:'待审批'},
+					{id:8,title:'已收款'},
+					{id:9,title:'待回访'},
+					{id:10,title:'异常单'},
+					{id:11,title:'逾期单'},
+					{id:12,title:'超时单'}
+				],
+				workeOrderStatusIndex: 0,
+				dataList:[
+					{
+						id:1,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:1,
+						backgroundColor:'#ff0000',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:2,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:2,
+						backgroundColor:'#112233',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:3,
+						backgroundColor:'#ff00ff',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:4,
+						backgroundColor:'#303545',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:5,
+						backgroundColor:'#006677',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:6,
+						backgroundColor:'#669955',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:7,
+						backgroundColor:'#558899',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:8,
+						backgroundColor:'#336655',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+					{
+						id:3,
+						orderNum:'222226666558',
+						title:'长沙市望城区xxxxxx项目名称',
+						status:9,
+						backgroundColor:'#224455',
+						faultType:'#网络故障#',
+						faultTime:'2小时37分',
+						urgentText:'加急',
+						name:'陈志远',
+						describe:'LED显示屏开机后闪屏，不显示内容。主控电脑提示网络不通',
+						address:'湖南省长沙市高新开发区谷园路109号像素大厦1205'
+					},
+				]
 
-                if (type === 'start') {
-                    year = year - 60;
-                } else if (type === 'end') {
-                    year = year + 2;
-                }
-                month = month > 9 ? month : '0' + month;
-                day = day > 9 ? day : '0' + day;
-                console.log(year, month, day)
-                return `${year}-${month}-${day}`;
-            }
-        }
-    }
+			}
+		},
+		onLoad(op) {
+			this.workeOrderStatusIndex = this.array.findIndex(item=>item.title==op.status);
+			if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = '';
+		},
+		methods: {
+			projectDetailsFun() {
+
+				if (this.role == 4) {
+					uni.navigateTo({
+						url: "/pages/workOrder/workOrder"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/workOrder/details"
+					})
+				}
+
+			},
+			bindPickerChange(data) {
+				console.log(data)
+				this.workeOrderStatus = '';
+				this.workeOrderStatusIndex = data.detail.value;
+			},
+			bindDateChange(date) {
+				console.log(date)
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				console.log(year, month, day)
+				return `${year}-${month}-${day}`;
+			}
+		}
+	}
 </script>
 
 <style scoped>
-    page {
-        background-color: #F7F7F7;
-    }
+	page {
+		background-color: #F7F7F7;
+	}
 
 
 	.project-list-input .xian {
 		width: 3rpx;
 		height: 35rpx;
 		position: absolute;
-        background-color: #EAEAEA;
+		background-color: #EAEAEA;
 		right: 100rpx;
 		top: 50%;
 		margin-top: -14rpx;
 	}
-    .project-list-input {
-        width: 100%;
-        height: 114rpx;
-        position: fixed;
-        z-index: 2;
-        padding: 20rpx 16rpx;
-        box-sizing: border-box;
-        background-color: #FFFFFF
-    }
 
-    .project-list-input .int {
-        width: 100%;
-        height: 100%;
-        background-color: #F7F7F7;
-        padding: 0 25rpx;
-        box-sizing: border-box;
-        border-radius: 36rpx;
-    }
+	.project-list-input {
+		width: 100%;
+		height: 114rpx;
+		position: fixed;
+		z-index: 2;
+		padding: 20rpx 16rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF
+	}
 
-    .project-list-input .search {
-        width: 28rpx;
-        height: 28rpx;
-        position: absolute;
-        right: 43rpx;
-        top: 50%;
-        margin-top: -14rpx;
-    }
+	.project-list-input .int {
+		width: 100%;
+		height: 100%;
+		background-color: #F7F7F7;
+		padding: 0 25rpx;
+		box-sizing: border-box;
+		border-radius: 36rpx;
+	}
 
-    .screen {
-        display: flex;
-        justify-content: space-around;
-        padding: 25rpx 20rpx;
-                border-bottom: 2rpx solid #E6E6E6;
-        border-top: 2rpx solid #E6E6E6;
-        margin: 20rpx 0rpx;
-    }
+	.project-list-input .search {
+		width: 28rpx;
+		height: 28rpx;
+		position: absolute;
+		right: 43rpx;
+		top: 50%;
+		margin-top: -14rpx;
+	}
 
-    .screen .li {
-        display: flex;
-        align-items: center;
+	.screen {
+		display: flex;
+		justify-content: space-around;
+		padding: 25rpx 20rpx;
+		border-bottom: 2rpx solid #E6E6E6;
+		border-top: 2rpx solid #E6E6E6;
+		margin: 20rpx 0rpx;
+		margin-top: 57px;
+	}
 
-    }
+	.screen .li {
+		display: flex;
+		align-items: center;
 
-    .screen .li .text {
-        font-size: 32rpx;
-        color: #333333;
-        margin-right: 10rpx;
-    }
+	}
 
-    .screen .li .img {
-        width: 14rpx;
-        height: 8rpx;
-        position: relative;
-        z-index: 1;
-    }
+	.screen .li .text {
+		font-size: 32rpx;
+		color: #333333;
+		margin-right: 10rpx;
+	}
 
-    .screen .li .imgA {
-        width: 24rpx;
-        height: 23rpx;
-    }
+	.screen .li .img {
+		width: 14rpx;
+		height: 8rpx;
+		position: relative;
+		z-index: 1;
+	}
 
-    .project-list .li {
-        width: 710rpx;
-        box-sizing: border-box;
-        background-color: #FFFFFF;
-        position: relative;
+	.screen .li .imgA {
+		width: 24rpx;
+		height: 23rpx;
+	}
 
-        margin: auto;
-        margin-bottom: 20rpx;
-        padding: 33rpx 23rpx;
-    }
+	.project-list .li {
+		width: 710rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+
+		margin: auto;
+		margin-bottom: 20rpx;
+		padding: 33rpx 23rpx;
+	}
 
 
 
-    .project-list .li .iconBer {
-        background-image: url(../../static/iocn/za.png);
-    }
+	.project-list .li .iconBer {
+		background-image: url(../../static/iocn/za.png);
+	}
 
-    .project-list .li .iconBera {
-        background-image: url(../../static/iocn/zaa.png);
-    }
+	.project-list .li .iconBera {
+		background-image: url(../../static/iocn/zaa.png);
+	}
 
-    .project-list .li .message {
-        display: flex;
+	.project-list .li .message {
+		display: flex;
 
-    }
+	}
 
-    .project-list .li .message .img {
-        width: 230rpx;
-        margin-right: 11rpx;
-        height: 180rpx;
+	.project-list .li .message .img {
+		width: 230rpx;
+		margin-right: 11rpx;
+		height: 180rpx;
 
-    }
+	}
 
-    .project-list .li .message .text {
-        flex: 1;
-    }
+	.project-list .li .message .text {
+		flex: 1;
+	}
 
-    .project-list .li .message .text .title {
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        word-wrap: break-word;
-        word-break: break-all;
-        margin-bottom: 5rpx;
-        font-size: 24rpx;
-        display: flex;
-        align-items: center;
-        line-height: 29rpx;
-        color: #333333;
-        font-weight: bold;
-    }
+	.project-list .li .message .text .title {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-wrap: break-word;
+		word-break: break-all;
+		margin-bottom: 5rpx;
+		font-size: 24rpx;
+		display: flex;
+		align-items: center;
+		line-height: 29rpx;
+		color: #333333;
+		font-weight: bold;
+	}
 
-    .project-list .li .message .text .title .text {
-        width: 60%;
-    }
+	.project-list .li .message .text .title .text {
+		width: 60%;
+	}
 
-    .project-list .li .message .text .title .icon {
-        font-size: 24rpx;
-        width: 120rpx;
-        height: 40rpx;
-        background-color: #ff5400;
-        border-radius: 50rpx;
-        color: #FFFFFF;
-        text-align: center;
-        line-height: 40rpx;
-    }
- .project-list .li .message .text .title .icon1{
-     background-color: #00a2e9;
- }
-.project-list .li .message .text .title .icon3{
-     background-color: #009a44;
- }
+	.project-list .li .message .text .title .icon {
+		font-size: 24rpx;
+		width: 120rpx;
+		height: 40rpx;
+		background-color: #ff5400;
+		border-radius: 50rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 40rpx;
+	}
 
-    .project-list .li .message .serial-number {
-        color: #9b9ba3;
-        font-size: 24rpx;
-        margin-bottom: 10rpx;
-        line-height: 24rpx;
-        display: flex;
-    }
+	.project-list .li .message .text .title .icon1 {
+		background-color: #00a2e9;
+	}
 
-    .project-list .li .message .serial-number .type {
-        margin-right: 60rpx;
-    }
+	.project-list .li .message .text .title .icon3 {
+		background-color: #009a44;
+	}
 
-    .project-list .li .message .specification {
-        color: #9b9ba3;
-        font-size: 24rpx;
-        margin-bottom: 10rpx;
-        display: flex;
-        line-height: 24rpx;
-    }
+	.project-list .li .message .serial-number {
+		color: #9b9ba3;
+		font-size: 24rpx;
+		margin-bottom: 10rpx;
+		line-height: 24rpx;
+		display: flex;
+	}
 
-    .project-list .li .message .specification .text {
-        color: #e90000;
-    }
+	.project-list .li .message .serial-number .type {
+		margin-right: 60rpx;
+	}
 
-    .project-list .li .message .installation-site {
-        color: #9b9ba3;
-        font-size: 24rpx;
-        line-height: 24rpx;
-    }
+	.project-list .li .message .specification {
+		color: #9b9ba3;
+		font-size: 24rpx;
+		margin-bottom: 10rpx;
+		display: flex;
+		line-height: 24rpx;
+	}
 
-    .project-list-address {
-        display: flex;
-        margin-top: 15rpx;
-        color: #9b9ba3;
-        align-items: center;
-        justify-content: space-between;
-        width: 100%;
-    }
+	.project-list .li .message .specification .text {
+		color: #e90000;
+	}
 
-    .project-list-address .text {
-        font-size: 22rpx;
-        flex: 1;
-    }
+	.project-list .li .message .installation-site {
+		color: #9b9ba3;
+		font-size: 24rpx;
+		line-height: 24rpx;
+	}
 
-    .project-list-address .date {
-        font-size: 24rpx;
-        text-align: right;
-        margin-left: 20rpx;
-        align-items: center;
-        display: flex;
-        color: #e90000;
-    }
+	.project-list-address {
+		display: flex;
+		margin-top: 15rpx;
+		color: #9b9ba3;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+	}
 
-    .project-list-address .date .img {
-        width: 26rpx;
-        height: 24rpx;
-        margin-left: 5rpx;
-    }
+	.project-list-address .text {
+		font-size: 22rpx;
+		flex: 1;
+	}
 
-    .project-list-address .address .img {
-        width: 22rpx;
-        height: 30rpx;
-        margin-right: 10rpx;
-    }
-    .project-list-address .address {
-        display: flex;
-        align-items: center;
-        width: 80%;
+	.project-list-address .date {
+		font-size: 24rpx;
+		text-align: right;
+		margin-left: 20rpx;
+		align-items: center;
+		display: flex;
+		color: #e90000;
+	}
+
+	.project-list-address .date .img {
+		width: 26rpx;
+		height: 24rpx;
+		margin-left: 5rpx;
+	}
+
+	.project-list-address .address .img {
+		width: 22rpx;
+		height: 30rpx;
+		margin-right: 10rpx;
+	}
+
+	.project-list-address .address {
+		display: flex;
+		align-items: center;
+		width: 80%;
 
 
-    }
+	}
 
-    .project-list .work-order-code {
-        font-size: 24rpx;
-        color: #9b9ba3;
-        margin-bottom: 26rpx;
-    }
+	.project-list .work-order-code {
+		font-size: 24rpx;
+		color: #9b9ba3;
+		margin-bottom: 26rpx;
+	}
 
-    .pickerDate {
-        width: 300rpx;
-        height: 300rpx;
-    }
+	.pickerDate {
+		width: 300rpx;
+		height: 300rpx;
+	}
 </style>
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index b5dc69f..54176d8 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -87,6 +87,9 @@
 				detailedList:[]
 			}
 		},
+		onLoad(op) {
+			op.index*1 ? this.current = false : this.current = true;
+		},
 		methods: {
 			// 切换状态
 			switchStatus(status){
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index 3cc78eb..bc5cc36 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -108,7 +108,9 @@
 			},
 			// 修改登录密码
 			updatePassword(){
-				console.log('修改登录密码');
+				uni.navigateTo({
+					url:'/pages/forget/forget'
+				})
 			},
 			// 清除缓存事件
 			cleanEv(){