diff --git a/order/order/orderInfo/orderInfo.vue b/order/order/orderInfo/orderInfo.vue
index 046ef0a..07f227f 100644
--- a/order/order/orderInfo/orderInfo.vue
+++ b/order/order/orderInfo/orderInfo.vue
@@ -9,91 +9,71 @@
 			<block>
 				<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
 					<view class="" slot="body">
-						<u-row gutter="16">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">工单标题：</view>
-							</u-col>
-							<u-col span="9">
-								<view class="demo-layout bg-purple-light">{{lists.name}}</view>
-							</u-col>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">所属片区：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{lists.arealName}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">来源：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{lists.accept_date}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">来源编号：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{lists.fromName}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">要求完成时间：</view>
+							</u-col>
+							<u-col span="8">
+								{{lists.time}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">工作内容：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{lists.content}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">地址：</view>
+							</u-col>
+							<u-col span="12">
+								{{lists.address}}
+							</u-col>
+						</u-row>
+						
+						<u-row gutter="16">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">投诉人姓名：</view>
+							</u-col>
+							<u-col span="8">
+								{{lists.people}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">投诉人电话：</view>
+							</u-col>
+							<u-col span="8">
+								{{lists.phone}}
+							</u-col>
 						</u-row>
-						<u-row gutter="16">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">反馈科室：</view>
-							</u-col>
-							<u-col span="9">
-								<view class="demo-layout bg-purple-light">{{lists.depName}}</view>
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">定位地址：</view>
-							</u-col>
-							<u-col span="9">
-								{{lists.address}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">内容：</view>
-							</u-col>
-							<u-col span="12">
-								{{lists.content}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">现场照片：</view>
-							</u-col>
-							<u-col span="12" v-for="(item,index) in filesList">
-								<u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="6">
-								<view class="demo-layout bg-purple">异常处置建议：</view>
-							</u-col>
-							<u-col span="12">
-								{{lists.tip}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="6">
-								<view class="demo-layout bg-purple">是否隶属于雨管科：</view>
-							</u-col>
-							<u-col span="9">
-								{{lists.is_rain_name}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16">
-							<u-col span="6">
-								<view class="demo-layout bg-purple">是否现场处理：</view>
-							</u-col>
-							<u-col span="9">
-								{{lists.is_scene_name}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16" v-if="lists.is_scene==1">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">现场处理结果：</view>
-							</u-col>
-							<u-col span="12">
-								{{lists.result}}
-							</u-col>
-						</u-row>
-						<u-row gutter="16" v-if="lists.is_scene==1">
-							<u-col span="3">
-								<view class="demo-layout bg-purple">处理后照片：</view>
-							</u-col>
-							<u-col span="12" v-for="(item,index) in dealFilesList">
-								<u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
-							</u-col>
-						</u-row>
-						
-						
-						
-						
-						
 					</view>
 					
 				</u-card>
@@ -156,7 +136,22 @@
 				});
 			},
 			loadInfo: function(id) {
-				var that = this;
+				var that = this;
+				that.lists={
+				  accept_date:"12345",
+				  fromName:"来源编号",
+				  content:"内容",
+				  arealName:"沧浪",
+				  time:"2022-08-08 09:56:12",
+				  admin_id:"admin",
+				  address:"suzhou",
+				  created_at:"2022-08-08 09:56:12",
+				  people:"某某",
+				  mobile:"1891207"
+				
+				
+				}
+				return;
 				this.util.request({
 					method:"get",
 					api: '/api/mobile/mobile-worksheet/show',
diff --git a/order/order/orderList/orderList.vue b/order/order/orderList/orderList.vue
index 8cfe2fd..c8e1517 100644
--- a/order/order/orderList/orderList.vue
+++ b/order/order/orderList/orderList.vue
@@ -27,46 +27,92 @@
 					<view class="" slot="body" @click="todetail(item.id)">
 						<u-row gutter="16">
 							<u-col span="3">
-								<view class="demo-layout bg-purple">工单标题：</view>
+								<view class="demo-layout bg-purple">所属片区：</view>
 							</u-col>
 							<u-col span="9">
-								<view class="demo-layout bg-purple-light">{{item.name}}</view>
+								<view class="demo-layout bg-purple-light">{{item.arealName}}</view>
 							</u-col>
 						</u-row>
 						<u-row gutter="16">
 							<u-col span="3">
-								<view class="demo-layout bg-purple">反馈科室：</view>
+								<view class="demo-layout bg-purple">来源：</view>
 							</u-col>
 							<u-col span="9">
-								<view class="demo-layout bg-purple-light">{{item.feedbackName}}</view>
+								<view class="demo-layout bg-purple-light">{{item.accept_date}}</view>
 							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">来源编号：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{item.fromName}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">要求完成时间：</view>
+							</u-col>
+							<u-col span="8">
+								{{item.time}}
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">工作内容：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{item.content}}</view>
+							</u-col>
 						</u-row>
 						<u-row gutter="16">
 							<u-col span="3">
-								<view class="demo-layout bg-purple">定位地址：</view>
+								<view class="demo-layout bg-purple">地址：</view>
 							</u-col>
-							<u-col span="9">
+							<u-col span="12">
 								{{item.address}}
 							</u-col>
 						</u-row>
 					</view>
-					<view class="footer" slot="foot">
-						<block >
-							<u-button :custom-style="editStyle" type="primary"  size="medium"
-								@click="toedit(item.id)" :ripple="true">编辑
-							</u-button>
+					<view class="footer" slot="foot">
+						<block v-if="item.status==0||item.status==2||item.status==3">
+							<u-button :custom-style="editStyle" type="primary"  size="medium"
+								@click="todetail(item.id)" :ripple="true">查看
+							</u-button>
 						</block>
-						<block >
+						<block v-if="item.status==0">
+							<u-button :custom-style="editStyle" type="warning"  size="medium"
+								@click="acceptOrder(item.id)" :ripple="true">签收
+							</u-button>
+						</block>
+						<block v-if="item.status==1">
+							<u-button :custom-style="editStyle" type="primary"  size="medium"
+								@click="goxuncha(item.id)" :ripple="true">去巡查
+							</u-button>
+						</block>
+						<block v-if="item.status==1">
+							<u-button :custom-style="editStyle" type="primary"  size="medium"
+								@click="goyanghu(item.id)" :ripple="true">去养护
+							</u-button>
+						</block>
+						<block v-if="item.status==2">
+							<u-button :custom-style="editStyle" type="success"  size="medium"
+								@click="completeOrder(item.id)" :ripple="true">确认完成
+							</u-button>
+						</block>
+						
+						
+						<!-- <block >
 							<u-button type="error"  size="medium" @click="del(item.id)"
 								:custom-style="customStyle" :ripple="true">删除
 							</u-button>
-						</block>
+						</block> -->
 					</view>
 					
 				</u-card>
 		
 			</block>
-			<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText"/>
+			<u-loadmore class="loadmore" v-if="dataList.length!=0" :status="loadStatus" :load-text="loadText"/>
 			<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
 		</view>
 		<u-toast ref="uToast" />
@@ -127,7 +173,6 @@
 		},
 		onPullDownRefresh: function(e) {
 			this.loadStatus = 'loadmore';
-			console.log("onPullDownRefresh")
 			this.loadPage(1);
 		},
 		onShow: function() {
@@ -165,14 +210,80 @@
 					url: "../orderInfo/orderInfo?id=" + id
 				})
 			},
-			toedit(id){
-				uni.navigateTo({
-					url: "../order/order?id=" + id
-				})
+			acceptOrder:function(id){
+				var that = this
+				uni.showModal({
+				  title: '提示',
+				  content: '是否确定签收？',
+				  success(res) {
+					  if(res.confirm){
+						 uni.showToast({
+							icon: "none",
+							title: "签收成功",
+							complete() {
+								that.dataList[0].status = 1
+								that.dataList[0].statusName="已签收"
+							},
+							duration: 2000
+						 })
+					  }else if(res.cancel){
+						  
+					  }
+				  }				 
+				})
+			},
+			completeOrder(id){
+				var that = this
+				uni.showModal({
+				  title: '提示',
+				  content: '是否确定完成？',
+				  success(res) {
+					  if(res.confirm){
+						 uni.showToast({
+							icon: "none",
+							title: "工单已完成",
+							complete() {
+								that.dataList[0].status = 3
+								that.dataList[0].statusName="已结束"
+							},
+							duration: 2000
+						 })
+					  }else if(res.cancel){
+						  
+					  }
+				  }				 
+				})
+			},
+			goxuncha(id){
+				this.dataList[0].status = 2
+				this.dataList[0].statusName="已处理"
+				uni.navigateTo({
+					url: "../../../road/road/road?type=raininspection&orderId="+id
+				})
+			},
+			goyanghu(id){
+				this.dataList[0].status = 2
+				this.dataList[0].statusName="已处理"
+				uni.navigateTo({
+					url: "../../../road/road/road?type=rainmaintain&orderId="+id
+				})
 			},
 			loadPage: function(page) {
 				uni.hideKeyboard()
-				var that = this;
+				var that = this;
+				that.dataList = [{
+					status:0,
+					accept_date:"12345",
+					fromName:"来源编号",
+					content:"内容",
+					arealName:"沧浪",
+					time:"2022-08-08 09:56:12",
+					admin_id:"admin",
+					address:"suzhou",
+					statusName:"已派发",
+					created_at:"2022-08-08 09:56:12"
+				}]
+				return
 				this.util.request({
 					bindThis: that,
 					api: '/api/mobile/mobile-worksheet/index',