diff --git a/App.vue b/App.vue
index 640bc25..0f1d128 100644
--- a/App.vue
+++ b/App.vue
@@ -7,15 +7,15 @@
 		onLaunch: async function() {
 			console.log('App Launch')
       this.$store.dispatch('initConfig');
-			try {
-				if (!this.$store.state.app.token) uni.redirectTo({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			} catch (e) {
-				uni.redirectTo({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			}
+      try {
+      	if (!this.$store.state.app.token) uni.reLaunch({
+      		url: '/pages/oaLogin/oaLogin'
+      	})
+      } catch (e) {
+      	uni.reLaunch({
+      		url: '/pages/oaLogin/oaLogin'
+      	})
+      }
 		},
 		onShow: function() {
 			const audioContext = uni.createInnerAudioContext()
@@ -38,14 +38,14 @@
 				}
 			})
       // 版本更新
-      // Updater.update({
-      //         title: '发现新版本',
-      //         content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
-      //       versionName: '1.3.6',
-      //       downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk',
-      //       force: false, // 是否强制更新
-      //       quiet: true // 是否静默更新
-      //     })
+      Updater.update({
+        title: '发现新版本',
+        content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
+        versionName: '1.3.6',
+        downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk',
+        force: false, // 是否强制更新
+        quiet: false // 是否静默更新
+      })
 			// #endif
 			console.log('App Show')
 		},
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 8607430..3cf4f85 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -149,7 +149,9 @@
 					this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`)
 				} else if(this.$props.datas.type == 33){
           this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`)
-        } else if(this.$props.datas.type == 35){
+        }else if(this.$props.datas.type == 34){
+          this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`)
+        }else if(this.$props.datas.type == 35){
           this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`)
         }
         else this.navTo('');
diff --git a/main.js b/main.js
index 87658df..9f7ad40 100644
--- a/main.js
+++ b/main.js
@@ -15,6 +15,7 @@ Vue.use(company)
 
 // initRouter()
 
+
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
diff --git a/pages.json b/pages.json
index b00445a..f7d0c08 100644
--- a/pages.json
+++ b/pages.json
@@ -134,7 +134,7 @@
       }
 
     }, {
-      "path": "pages/updatePasswprd/updatePasswprd",
+      "path": "pages/updatePassword/updatePassword",
       "style": {
         "navigationBarTitleText": "修改密码",
         "enablePullDownRefresh": false,
@@ -159,6 +159,15 @@
         "disableScroll": true,
         "navigationStyle": "custom"
       }
+    }, {
+      "path": "pages/moreFun/moreFun",
+      "style": {
+        "navigationBarTitleText": "更多功能",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
     }
   ],
   "subPackages": [{
@@ -229,333 +238,340 @@
     "root": "subpkg",
     "name": "subpkg",
     "pages": [{
-        "path": "personnel/personnel",
-        "style": {
-          "navigationBarTitleText": "人员管理",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+      "path": "personnel/personnel",
+      "style": {
+        "navigationBarTitleText": "人员管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "finance/finance",
-        "style": {
-          "navigationBarTitleText": "财务管理",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "finance/finance",
+      "style": {
+        "navigationBarTitleText": "财务管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "topUp/topUp",
-        "style": {
-          "navigationBarTitleText": "账户充值",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white",
-          "app-plus": {
-            "titleNView": {
-              "buttons": [{
-                "color": "#fff",
-                "text": "充值记录",
-                "fontSize": "15",
-                "width": "90"
-              }]
-            }
+    }, {
+      "path": "topUp/topUp",
+      "style": {
+        "navigationBarTitleText": "账户充值",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white",
+        "app-plus": {
+          "titleNView": {
+            "buttons": [{
+              "color": "#fff",
+              "text": "充值记录",
+              "fontSize": "15",
+              "width": "90"
+            }]
           }
         }
+      }
 
-      }, {
-        "path": "contract/contract",
-        "style": {
-          "navigationBarTitleText": "合同管理",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0022C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "contract/contract",
+      "style": {
+        "navigationBarTitleText": "合同管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0022C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "contractDetail/contractDetail",
-        "style": {
-          "navigationBarTitleText": "合同详情",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "contractDetail/contractDetail",
+      "style": {
+        "navigationBarTitleText": "合同详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "pdfView/pdfView",
-        "style": {
-          "navigationBarTitleText": "合同内容",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "pdfView/pdfView",
+      "style": {
+        "navigationBarTitleText": "合同内容",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "companyInfo/companyInfo",
-        "style": {
-          "navigationBarTitleText": "公司信息",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "companyInfo/companyInfo",
+      "style": {
+        "navigationBarTitleText": "公司信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "companySign/companySign",
-        "style": {
-          "navigationBarTitleText": "签约公司详情",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "companySign/companySign",
+      "style": {
+        "navigationBarTitleText": "签约公司详情",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "personnelDetails/personnelDetails",
-        "style": {
-          "navigationBarTitleText": "人员详细信息",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "personnelDetails/personnelDetails",
+      "style": {
+        "navigationBarTitleText": "人员详细信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "orderDetail/orderDetail",
-        "style": {
-          "navigationBarTitleText": "流水详情",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
+    }, {
+      "path": "orderDetail/orderDetail",
+      "style": {
+        "navigationBarTitleText": "流水详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-      }, {
-        "path": "withdrawDeposit/withdrawDeposit",
-        "style": {
-          "navigationBarTitleText": "提现余额",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white",
-          "app-plus": {
-            "titleNView": {
-              "buttons": [{
-                "color": "#fff",
-                "text": "提现记录",
-                "fontSize": "15",
-                "width": "90"
-              }]
-            }
+    }, {
+      "path": "withdrawDeposit/withdrawDeposit",
+      "style": {
+        "navigationBarTitleText": "提现余额",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white",
+        "app-plus": {
+          "titleNView": {
+            "buttons": [{
+              "color": "#fff",
+              "text": "提现记录",
+              "fontSize": "15",
+              "width": "90"
+            }]
           }
         }
-      }, {
-        "path": "withdrawList/withdrawList",
-        "style": {
-          "navigationBarTitleText": "提现记录",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "noticeList/noticeList",
-        "style": {
-          "navigationBarTitleText": "公告列表",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "topUpList/topUpList",
-        "style": {
-          "navigationBarTitleText": "充值记录",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "companyAdmin/companyAdmin",
-        "style": {
-          "navigationBarTitleText": "公司管理",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "newPersonnel/newPersonnel",
-        "style": {
-          "navigationBarTitleText": "新增人员",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "archives/archives",
-        "style": {
-          "navigationBarTitleText": "档案管理",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "newArchives/newArchives",
-        "style": {
-          "navigationBarTitleText": "信息登记",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "updateArchives/updateArchives",
-        "style": {
-          "navigationBarTitleText": "信息更新",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "fixedAssets/fixedAssets",
-        "style": {
-          "navigationBarTitleText": "固定资产",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "taskAdmin/taskAdmin",
-        "style": {
-          "navigationBarTitleText": "任务管理",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "archivesDetail/archivesDetail",
-        "style": {
-          "navigationBarTitleText": "档案详情",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "captain/captain",
-        "style": {
-          "navigationBarTitleText": "队长列表",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "companyFinance/companyFinance",
-        "style": {
-          "navigationBarTitleText": "公司财务",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "companyUnsign/companyUnsign",
-        "style": {
-          "navigationBarTitleText": "未签约公司列表",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "submit/submit",
-        "style": {
-          "navigationBarTitleText": "提交审核",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "dispatching/dispatching",
-        "style": {
-          "navigationBarTitleText": "任务:宣传配送",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "blockTransaction/blockTransaction",
-        "style": {
-          "navigationBarTitleText": "任务:片区交易",
-          "enablePullDownRefresh": true,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "fileTask/fileTask",
-        "style": {
-          "navigationBarTitleText": "已更新商机",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "property/index",
-        "style": {
-          "navigationBarTitleText": "资产管理",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "property/chosseCompany",
-        "style": {
-          "navigationBarTitleText": "选择公司",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "property/vehicle",
-        "style": {
-          "navigationBarTitleText": "三轮车游走",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
-      }, {
-        "path": "property/vehicle_a",
-        "style": {
-          "navigationBarTitleText": "三轮车详情",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
       }
-      , {
-        "path": "buyShare/buyShare",
-        "style": {
-          "navigationBarTitleText": "任务:入股任务",
-          "enablePullDownRefresh": false,
-          "navigationBarBackgroundColor": "#0122C7",
-          "navigationBarTextStyle": "white"
-        }
-
+    }, {
+      "path": "withdrawList/withdrawList",
+      "style": {
+        "navigationBarTitleText": "提现记录",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
       }
-    ]
+
+    }, {
+      "path": "noticeList/noticeList",
+      "style": {
+        "navigationBarTitleText": "公告列表",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "topUpList/topUpList",
+      "style": {
+        "navigationBarTitleText": "充值记录",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "companyAdmin/companyAdmin",
+      "style": {
+        "navigationBarTitleText": "公司管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "newPersonnel/newPersonnel",
+      "style": {
+        "navigationBarTitleText": "新增人员",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "archives/archives",
+      "style": {
+        "navigationBarTitleText": "档案管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "newArchives/newArchives",
+      "style": {
+        "navigationBarTitleText": "信息登记",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "updateArchives/updateArchives",
+      "style": {
+        "navigationBarTitleText": "信息更新",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "fixedAssets/fixedAssets",
+      "style": {
+        "navigationBarTitleText": "固定资产",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "taskAdmin/taskAdmin",
+      "style": {
+        "navigationBarTitleText": "任务管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "archivesDetail/archivesDetail",
+      "style": {
+        "navigationBarTitleText": "档案详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "captain/captain",
+      "style": {
+        "navigationBarTitleText": "队长列表",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "companyFinance/companyFinance",
+      "style": {
+        "navigationBarTitleText": "公司财务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "companyUnsign/companyUnsign",
+      "style": {
+        "navigationBarTitleText": "未签约公司列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "submit/submit",
+      "style": {
+        "navigationBarTitleText": "提交审核",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "dispatching/dispatching",
+      "style": {
+        "navigationBarTitleText": "任务:宣传配送",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "blockTransaction/blockTransaction",
+      "style": {
+        "navigationBarTitleText": "任务:片区交易",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "fileTask/fileTask",
+      "style": {
+        "navigationBarTitleText": "已更新商机",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "property/index",
+      "style": {
+        "navigationBarTitleText": "资产管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "property/chosseCompany",
+      "style": {
+        "navigationBarTitleText": "选择公司",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "property/vehicle",
+      "style": {
+        "navigationBarTitleText": "三轮车游走",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "property/vehicle_a",
+      "style": {
+        "navigationBarTitleText": "三轮车详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "buyShare/buyShare",
+      "style": {
+        "navigationBarTitleText": "任务:入股任务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "otherTask/otherTask",
+      "style": {
+        "navigationBarTitleText": "任务:其他任务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }]
   }],
   "globalStyle": {
     "navigationBarTextStyle": "black",
diff --git a/pages/moreFun/moreFun.vue b/pages/moreFun/moreFun.vue
new file mode 100644
index 0000000..e714254
--- /dev/null
+++ b/pages/moreFun/moreFun.vue
@@ -0,0 +1,67 @@
+<template>
+  <view>
+    <view class="fast_track">
+      <block v-for="(item, index) in oaHomeData" :key="item.id">
+        <view class="track_item" @click="navTwo(item.paths, index)">
+          <u--image
+            :showLoading="true"
+            :src="item.icon"
+            mode="widthFix"
+            width="77.19rpx"
+            height="77.19rpx"
+          ></u--image>
+          <view class="title">{{ item.name }}</view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        
+      };
+    },
+    computed:{
+      oaHomeData(){
+        let arr = [];
+        this.$store.state.config?.config?.menu?.forEach((item)=>{
+          if(item.paths.includes('pages/oaHome/oaHome')){
+            arr=item.children;
+          }
+        })
+        return arr;
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.fast_track {
+  width: 694rpx;
+  // height: 331rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: left;
+  align-content: space-between;
+  margin: 28rpx auto;
+  padding: 15rpx 38.6rpx;
+  background-color: #fff;
+  border-radius: 12px;
+
+  .track_item {
+    width: 154.39rpx;
+    font-size: 24.56rpx;
+    margin: 25rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .title {
+      margin-top: 14.04rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index d23d38b..c85f88f 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -95,8 +95,8 @@
     </view>
 
     <view class="fast_track">
-      <block v-for="(item, index) in oaHomeData" :key="index">
-        <view class="track_item" @click="navTwo(item.url, index)">
+      <block v-for="(item, index) in oaHomeData" :key="item.id">
+        <view class="track_item" @click="navTwo(item.paths, index)">
           <u--image
             :showLoading="true"
             :src="item.icon"
@@ -104,7 +104,7 @@
             width="77.19rpx"
             height="77.19rpx"
           ></u--image>
-          <view class="title">{{ item.text }}</view>
+          <view class="title">{{ item.name }}</view>
         </view>
       </block>
     </view>
@@ -217,7 +217,7 @@ export default {
       is_captain: 0,
       notArr: [],
       orderList: [],
-      oaHomeData: [],
+      // oaHomeData: [],
       src: "https://cdn.uviewui.com/uview/album/1.jpg",
       assessData: [{
         num: "0",
@@ -256,7 +256,6 @@ export default {
     this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
     this.options.data = bj;
     //#ifdef APP-PLUS
-
     let that = this;
     jpushModule.addNotificationListener(function (result) {
       if (!that.notArr.includes(result.messageID)) {
@@ -275,26 +274,30 @@ export default {
     this.getApproveList();
     this.initUserInfo();
     this.showToask();
-    this.initOaHomeDada();
+    // this.initOaHomeDada();
     this.getOrderList();
   },
-  computed: {},
+  computed: {
+    oaHomeData(){
+      const route = getCurrentPages()[0]?.route;
+      let arr = [];
+      this.$store.state.config?.config?.menu?.forEach((item)=>{
+        if(item.paths.includes(route)){
+          arr=item.children;
+        }
+      })
+      if(arr.length>=8){
+        arr = arr.slice(0, 7);
+        let obj = this.$store.state.config?.config?.menu?.find(item=>item.paths.includes('/pages/moreFun/moreFun'));
+        arr.push(obj);
+      }
+      return arr;
+    }
+  },
   methods: {
     test () {
       this.$refs.globalPopup.showPopu();
     },
-    // test() {
-    //   wx.chooseMessageFile({
-    //     count: 1, //限制选择的文件数量
-    //     type: 'all', //非图片和视频的文件,不选默认为all
-    //     //type:'video',//视频
-    //     //type:'image',//图片
-    //     success(res) {
-    //       const tempFilePaths = res.tempFiles
-    //       console.log(res);
-    //     }
-    //   })
-    // },
     async getOrderList () {
       console.log("列表")
       let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index f894c66..a10dc62 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -132,7 +132,7 @@
 						}
 					})
 				} else uni.navigateTo({
-					url: '/pages/updatePasswprd/updatePasswprd'
+					url: '/pages/updatePassword/updatePassword'
 				});
 			},
 			initTerminal() {
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index ef5f039..d8ee1cc 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -49,7 +49,7 @@
 		<view class="other_guide">
 			<block v-for="(item,i) in myOaData" :key="i">
 
-				<view class="other_item flex_a_c_j_sb" @click="navTo(item.url)">
+				<view class="other_item flex_a_c_j_sb" @click="navTo(item.paths)">
 					<view class="flex_a_c left">
 						<!-- <view class="iconfont2" :class="item.icon"></view> -->
 						<image :src="item.icon"></image>
@@ -95,7 +95,7 @@
         options: {
           data: '',
         },
-				myOaData: myOaData,
+				// myOaData: [],
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				modelShow: false
 			}
@@ -122,7 +122,17 @@
 						}
 					}
 				};
-			}
+			},
+      myOaData(){
+        const route = getCurrentPages()[0]?.route;
+        let arr = [];
+        this.$store.state.config?.config?.menu?.forEach((item)=>{
+          if(item.paths.includes(route)){
+            arr=item.children;
+          }
+        })
+        return arr;
+      }
 		},
     watch:{
       modelShow: function(n,o){
@@ -167,16 +177,9 @@
 			      success() {
 			        uni.hideLoading()
 			      },
-			      fail () {
-			        uni.switchTab({
-			          url: url,
-			          success() {
-			            uni.hideLoading()
-			          },
-			          fail() {
-			            uni.hideLoading()
-			          }
-			        });
+			      fail (e) {
+              uni.hideLoading()
+              console.log(e);
 			      },
 			    })
 			  }else Toast('暂未开放')
diff --git a/pages/updatePasswprd/updatePasswprd.vue b/pages/updatePassword/updatePassword.vue
similarity index 100%
rename from pages/updatePasswprd/updatePasswprd.vue
rename to pages/updatePassword/updatePassword.vue
diff --git a/static/server/server.js b/static/server/server.js
index 5cf4fca..282381e 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -188,96 +188,96 @@ export const quickLink = [{
 
 // oaHOme快速入口数据
 export const oaHomeData = [{
-		text: '公司信息',
+		name: '公司信息',
 		icon: '../../static/img/home/GSXX.png',
-		url: '/subpkg/companyInfo/companyInfo',
+		paths: '/subpkg/companyInfo/companyInfo',
 		admin: true
 	},
 	{
-		text: '人员管理',
+		name: '人员管理',
 		icon: '../../static/img/home/RYGL.png',
-		url: '/subpkg/personnel/personnel',
+		paths: '/subpkg/personnel/personnel',
 		admin: true
 	},
 	{
-		text: '固定资产',
+		name: '固定资产',
 		icon: '../../static/img/home/GDZC.png',
-		url: '/subpkg/property/index',
+		paths: '/subpkg/property/index',
 		admin: true
 	},
 	{
-		text: '合同管理',
+		name: '合同管理',
 		icon: '../../static/img/home/HTGL.png',
-		url: '/subpkg/contract/contract'
+		paths: '/subpkg/contract/contract'
 	},
 	// {
-	//   text: '公司管理',
+	//   name: '公司管理',
 	//   icon: '../../static/img/home/GSXX.png',
-	//   url: '/subpkg/companyAdmin/companyAdmin',
+	//   paths: '/subpkg/companyAdmin/companyAdmin',
 	//   admin: true
 	// },
 	{
-		text: '任务管理',
+		name: '任务管理',
 		icon: '../../static/img/home/RWGL.png',
-		url: '/subpkg/taskAdmin/taskAdmin',
+		paths: '/subpkg/taskAdmin/taskAdmin',
 	},
 	{
-		text: '档案管理',
+		name: '档案管理',
 		icon: '../../static/img/home/DAGL.png',
-		url: '/subpkg/captain/captain',
+		paths: '/subpkg/captain/captain',
 		admin: true
 	},
 	{
-		text: '档案管理',
+		name: '档案管理',
 		icon: '../../static/img/home/DAGL.png',
-		url: '/subpkg/archives/archives',
+		paths: '/subpkg/archives/archives',
 		captain: true
 	},
 	// {
-	//   text: '片区经理',
+	//   name: '片区经理',
 	//   icon: '../../static/img/home/GRCW.png',
-	//   url: '/pages/oaManager/oaManager',
+	//   paths: '/pages/oaManager/oaManager',
 	//   admin: true
 	// },
 	{
-		text: '个人财务',
+		name: '个人财务',
 		icon: '../../static/img/home/GRCW.png',
-		url: '/subpkg/finance/finance'
+		paths: '/subpkg/finance/finance'
 	},
 	{
-		text: '待取驿站',
+		name: '待取驿站',
 		icon: '../../static/img/home/YZ.png',
-		url: '/pages/logistics/post',
+		paths: '/pages/logistics/post',
 		// captain: true
 	},
 	// {
-	//   text: '出差申请',
+	//   name: '出差申请',
 	//   icon: prefix + 'oa/ccsq@2x.png'
 	// },
 	// {
-	//   text: '外出申请',
+	//   name: '外出申请',
 	//   icon: prefix + 'oa/wcsq@2x.png'
 	// },
 	// {
-	//   text: '采购申请',
+	//   name: '采购申请',
 	//   icon: prefix + 'oa/cgsq@2x.png'
 	// },
 	// {
-	//   text: '物品维修',
+	//   name: '物品维修',
 	//   icon: prefix + 'oa/bxsq@2x.png'
 	// },
 	// {
-	//   text: '用章申请',
+	//   name: '用章申请',
 	//   icon: prefix + 'oa/yzsq@2x.png'
 	// },
 	// {
-	//   text: '报销申请',
+	//   name: '报销申请',
 	//   icon: prefix + 'oa/gengduo@2x.png'
 	// },
 	{
-		text: '更多',
+		name: '更多',
 		icon: prefix + 'oa/wpwx@2x.png',
-		url: '/pages/views/application'
+		paths: '/pages/views/application'
 	}
 ]
 
@@ -396,7 +396,7 @@ export const myOaData = [
 	{
 		name: '安全设置',
 		icon: '../../static/icons/setting.png',
-		url: '/pages/updatePasswprd/updatePasswprd'
+		url: '/pages/updatePassword/updatePassword'
 	},
 	// {
 	//   name: '管理后台',
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 25fbd3f..340c46d 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -10,10 +10,9 @@
       </view>
     </view> -->
 		<view class="contract_list">
-			<view class="item" v-for="(item,index) in list" :key="item.id"
-				@click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
+			<view class="item">
 				<view class="personnel_list">
-					<view class="cards">
+					<view class="cards"  v-for="(item,index) in list" :key="item.id" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
 						<view class="cards_head">
 							<text style="font-size: 32rpx">电子合同</text>
 						</view>
@@ -250,7 +249,7 @@
 
 	.personnel_list {
 		padding: 28rpx 0;
-		margin-bottom: 130rpx;
+		// margin-bottom: 130rpx;
 
 		.cards {
 			margin: 0 auto;
diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue
new file mode 100644
index 0000000..2560bd9
--- /dev/null
+++ b/subpkg/otherTask/otherTask.vue
@@ -0,0 +1,74 @@
+<template>
+  <view style="padding-top: 28rpx;">
+    <view class="card">
+      <view class="title">任务名称: 入股任务</view>
+      <u-line style="margin: 14rpx 0;"></u-line>
+      <view class="text">阶段类型: 单次</view>
+      <view class="text" style="color: #FF7C32;">任务金额: 3000元</view>
+    </view>
+    <view class="card">
+      <view class="title">任务描述</view>
+      <u-line style="margin: 14rpx 0;"></u-line>
+      <view class="text">完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。</view>
+    </view>
+    <view class="card">
+      <view class="title">完成任务</view>
+      <u-line style="margin: 14rpx 0;"></u-line>
+      <u--textarea v-model="formData.text" placeholder="请输入内容" style="font-size: 28rpx;" autoHeight></u--textarea>
+    </view>
+    <mybtn text="完成任务"></mybtn>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        task_id: -1,
+        formData: {
+          text: ''
+        }
+      };
+    },
+    onLoad(options) {
+      this.task_id = options.task_id;
+    },
+    methods:{
+      navTo (url) {
+        if(url){
+          uni.showLoading({
+            title: '加载中',
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+  .card {
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #FFFFFF;
+    border-radius: 14rpx;
+    padding: 28rpx;
+
+    .title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .text {
+      line-height: 50rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 2d00eb7..da6a8aa 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -13,7 +13,7 @@
     <view class="price">
       <view class="title">充值金额</view>
       <view class="tab">
-        <view v-if="task_id>0" class="item active" style="margin: 0;">{{3000}}</view>
+        <view v-if="task_id>0" class="item active" style="margin: 0;">3000元</view>
         <view v-else class="item" :class="index==changeMoney?'active':''" @click="changePrice(index)"
           v-for="(item, index) in priceList" :key="index">{{item}}</view>
       </view>