diff --git a/config/status.js b/config/status.js
index a53d0ae..e945e18 100644
--- a/config/status.js
+++ b/config/status.js
@@ -17,6 +17,10 @@ export const tabList = {
             name: "待维修",
             key: "1,2,3",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
 
         {
             name: "确认方案",
@@ -52,6 +56,10 @@ export const tabList = {
             name: "待维修",
             key: "1,2,3,4",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
         {
             name: "维修中",
             key: "5",
@@ -76,7 +84,7 @@ export const tabList = {
         },
         {
             name: "已驳回",
-            key: "2",
+            key: "100,101,102",
         },
         {
             name: "待审批",
@@ -122,7 +130,7 @@ export const tabList = {
         },
         {
             name: "已驳回",
-            key: "0",
+            key: "100,101,102",
         },
         {
             name: "维修中",
@@ -247,6 +255,10 @@ export const tabTaskRepairList = {
             name: "待付款",
             key: "6",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
         {
             name: "已完成",
             key: "7,8",
@@ -281,6 +293,10 @@ export const tabTaskRepairList = {
             name: "待付款",
             key: "6",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
         {
             name: "已完成",
             key: "7,8",
@@ -319,6 +335,10 @@ export const tabTaskRepairList = {
             name: "待付款",
             key: "6",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
         {
             name: "已完成",
             key: "7,8",
@@ -354,6 +374,10 @@ export const tabTaskRepairList = {
             name: "待付款",
             key: "6",
         },
+        {
+            name: "已驳回",
+            key: "100,101,102",
+        },
         {
             name: "已完成",
             key: "7,8",
@@ -375,5 +399,6 @@ export const tabTaskListColor={
     "待评价": "#67c23a",
     "维修完成": "#67c23a",
     "待付款": "#67c23a",
+    "已驳回": "#f56c6c",
 }
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d4f9422..efe0c2a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -128,11 +128,12 @@ export default {
           this.$refs.BetLoading.hide();
         })
         .catch((err) => {
+          
           if (err.error_code == 2004) {
-            uni.redirectTo({
-              url: "/pages/login/authInfo",
-            });
-            return false
+            // uni.redirectTo({
+            //   url: "/pages/login/authInfo",
+            // });
+            uni.showToast({ title: "密码错误", icon: "none" });
           }
           this.$refs.BetLoading.hide();
         });
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 43f42db..851b913 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -200,9 +200,6 @@ export default {
               } else {
                 uni.$u.toast(res.msg);
               }
-            }).finally(err => {
-              // this.BetLoading.hide();
-              uni.$u.toast(err.data.msg);
             })
           } else {
             // this.BetLoading.hide();
diff --git a/pages/submission/records.vue b/pages/submission/records.vue
index 1161967..58355c8 100644
--- a/pages/submission/records.vue
+++ b/pages/submission/records.vue
@@ -59,7 +59,7 @@
                 <block v-if="dataTypes == 2">
                   <!-- 查看的提报单 -->
 
-                  <u-button v-if="item.status == 0" size="mini" :plain="true" style="margin-right:16rpx"
+                  <u-button v-if="item.status == 0||item.status == 100" size="mini" :plain="true" style="margin-right:16rpx"
                     @click.stop="sendOrders(item)" type="primary">接单</u-button>
                   <u-button v-if="item.status == 7" size="mini" :plain="true" style="margin-right:16rpx"
                     @click.stop="openModel(item, 'paymentInfo')" type="primary">确认付款</u-button>
@@ -72,7 +72,7 @@
                 <block v-if="dataTypes == 3">
                   <!-- 查看维修详情 -->
 
-                  <u-button v-if="item.status == 3" size="mini" :plain="true" style="margin-right:16rpx"
+                  <u-button v-if="item.status == 3||item.status == 102" size="mini" :plain="true" style="margin-right:16rpx"
                     :hair-line="true" type="primary" @click="orderConfirm(item)">审批</u-button>
 
                 </block>
@@ -83,7 +83,7 @@
                     @click="orderConfirm(item)">确认</u-button>
                   <u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right:16rpx" type="primary"
                     @click="openModel(item, 'turn')">驳回</u-button>
-                  <u-button v-if="item.status == 2" size="mini" :plain="true" style="margin-right:16rpx" type="primary"
+                  <u-button v-if="item.status == 2||item.status ==101" size="mini" :plain="true" style="margin-right:16rpx" type="primary"
                     @click="orderConfirm(item)">提交</u-button>
                   <u-button v-if="item.status == 5" size="mini" :plain="true" style="margin-right:16rpx" type="primary"
                     @click="openModel(item, 'repair')">维修完成</u-button>
diff --git a/pages/submission/sendOrders.vue b/pages/submission/sendOrders.vue
index 3ede987..7f4a7b4 100644
--- a/pages/submission/sendOrders.vue
+++ b/pages/submission/sendOrders.vue
@@ -34,7 +34,7 @@
         </view>
         <!-- 维修人员  接单展示-->
         <view class="repair_detail"
-            v-if="(dataTypes == 4 || dataTypes == 2) && (detailForm.status == 1 || detailForm.status == 0)">
+            v-if="(dataTypes == 4 || dataTypes == 2) && (detailForm.status == 1 || detailForm.status == 0 || detailForm.status == 100)">
             <view class="repair_title">派单信息</view>
             <u-form labelPosition="left" :rules="sendRules" ref="sendOrderForm" :model="sendOrder" :label-width="200"
                 class="repair_form">
@@ -63,7 +63,7 @@
         </view>
 
         <!-- 维修人员  待提交维修方案 -->
-        <view class="repair_detail" v-if="dataTypes == 4 && detailForm.status == 2">
+        <view class="repair_detail" v-if="dataTypes == 4 && (detailForm.status == 2 || detailForm.status == 101)">
             <view class="repair_title">处理情况</view>
             <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
                 <u-form-item label="接单时间:" prop="dispatchTime" :border-bottom="false">
@@ -83,7 +83,7 @@
         </view>
         <!-- 维修详情 待提交维修方案  展示 -->
         <view class="repair_detail"
-            v-if="(dataTypes == 4 && detailForm.status == 2) || (dataTypes == 3 && detailForm.status == 3) || (dataTypes == 1 && detailForm.status == 4)">
+            v-if="(dataTypes == 4 && (detailForm.status == 2||detailForm.status == 101)) || (dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4)">
             <view class="repair_title">维修详情</view>
             <u-form labelPosition="left" :rules="repairInfoRules" ref="repairInfoForm" :model="repairInfo"
                 :label-width="140" class="repair_form">
@@ -133,15 +133,15 @@
                     </view>
                 </view>
                 <block
-                    v-if="(dataTypes == 3 && detailForm.status == 3) || (dataTypes == 1 && detailForm.status == 4) && repairInfo.isMaterial == 1">
+                    v-if="(dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4) && repairInfo.isMaterial == 1">
                     <u-form-item label="总价:" prop="reportPeople" :border-bottom="false">
                         <view>{{ approveInfo.totalPrice }}</view>
                     </u-form-item>
                     <u-form-item label="折扣:" prop="reportPeople" :border-bottom="false">
                         <!-- <betone-new-input label="" v-model="approveInfo.discount" placeholder="" type="number"
                             @changevalue="changDiscount" />折 -->
-                            <u-input v-model="approveInfo.discount" :border="true" placeholder="" :disabled="true"
-                            :class="optionDisabled?'sp-new-input-diabled':''" />折
+                        <u-input v-model="approveInfo.discount" :border="true" placeholder="" :disabled="true"
+                            :class="optionDisabled ? 'sp-new-input-diabled' : ''" />折
                     </u-form-item>
                     <u-form-item label="折扣后的金额:" prop="reportPeople" :border-bottom="false" :label-width="240">
                         <view>{{ approveInfo.discountPrice }}</view>
@@ -151,7 +151,7 @@
 
         </view>
         <!-- 维修负责人  审批 -->
-        <view class="repair_detail" v-if="dataTypes == 3 && detailForm.status == 3">
+        <view class="repair_detail" v-if="dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)">
             <view class="repair_title">主管审批</view>
             <u-form labelPosition="left" ref="repairInfoForm" :model="approveInfo" :label-width="140"
                 class="repair_form">
@@ -161,8 +161,9 @@
 
                 </u-form-item>
                 <u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false">
-    
-                        <u-input v-model="approveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" :height="120" />
+
+                    <u-input v-model="approveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea"
+                        :height="120" />
                 </u-form-item>
             </u-form>
         </view>
@@ -185,22 +186,24 @@
                 </u-form-item>
                 <u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false">
 
-                        <u-input v-model="clientInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" :height="120" />
+                    <u-input v-model="clientInfo.approveRemark" :border="true" placeholder="请输入" type="textarea"
+                        :height="120" />
                 </u-form-item>
             </u-form>
         </view>
         <!--   客服派单-->
-        <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 2 && detailForm.status == 0">
+        <view class="repair-btn" style="margin-right: 32rpx;width:100%"
+            v-if="dataTypes == 2 && (detailForm.status == 0 || detailForm.status == 100)">
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
             <u-button size="medium" type="primary" @click="sendOrderSubmit()">确定派单</u-button>
         </view>
         <!-- 维修人员 提交维修方案 -->
-        <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && detailForm.status == 2">
+        <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && (detailForm.status == 2||detailForm.status == 101)">
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
             <u-button size="medium" type="primary" @click="servicemanSubmit()">提交</u-button>
         </view>
         <!-- 维修负责人 审批 -->
-        <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 3 && detailForm.status == 3">
+        <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 3 && detailForm.status == 102">
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
             <u-button size="medium" type="primary" @click="approveSubmit()">提交</u-button>
         </view>
@@ -255,7 +258,7 @@
         <!-- 维修人员驳回 -->
         <betone-modal v-model="turnShow" :title="'驳回原因'" @confirm="turnFn" @cancel="turnShow = false">
             <view class="modal-text" style="margin-bottom: 32rpx">
-                <u-input v-model="repaiRejectReason" :border="true" placeholder="请输入"  />
+                <u-input v-model="repaiRejectReason" :border="true" placeholder="请输入" />
             </view>
         </betone-modal>
 
@@ -280,7 +283,7 @@ export default {
             return this.$store.state.dataType == 2 ? false : true
         },
         optionDisabled() {
-            return (this.$store.state.dataType == 3 && this.detailForm.status == 3) || (this.$store.state.dataType == 1 && this.detailForm.status == 4) ? true : false
+            return (this.$store.state.dataType == 3 && (this.detailForm.status == 3||this.detailForm.status == 102)) || (this.$store.state.dataType == 1 && this.detailForm.status == 4) ? true : false
         },
     },
 
@@ -450,8 +453,8 @@ export default {
 
                     // 获取审批总价
                     this.approveInfo.totalPrice = data
-                    this.approveInfo.discount =  this.detailForm.discount
-                    this.approveInfo.discountPrice =  this.detailForm.discountPrice
+                    this.approveInfo.discount = this.detailForm.discount
+                    this.approveInfo.discountPrice = this.detailForm.discountPrice
                 }
 
             })