diff --git a/src/router/index.ts b/src/router/index.ts
index ba004d0..9eab537 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory, RouterView, type RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHistory,createWebHashHistory, RouterView, type RouteRecordRaw } from 'vue-router'
 import { MenuEnum } from '@/enums/appEnums'
 import { isExternal } from '@/utils/validate'
 import { constantRoutes, INDEX_ROUTE_NAME, LAYOUT } from './routes'
@@ -103,7 +103,7 @@ export function resetRouter() {
 }
 
 const router = createRouter({
-    history: createWebHistory(import.meta.env.BASE_URL),
+    history: createWebHashHistory(import.meta.env.BASE_URL),
     routes: constantRoutes
 })
 
diff --git a/src/views/translationOrder/detail.vue b/src/views/translationOrder/detail.vue
index cdd5962..333825e 100644
--- a/src/views/translationOrder/detail.vue
+++ b/src/views/translationOrder/detail.vue
@@ -4,9 +4,12 @@
       <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabChange">
         <el-tab-pane label="概况" name="detail">
           <el-descriptions class="margin-top" :column="4" border>
+<<<<<<< HEAD
             <!-- <template #extra>
               <el-button type="primary">Operation</el-button>
             </template> -->
+=======
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
             <el-descriptions-item :span="4" label="单据编号">
               {{ form.number }}
             </el-descriptions-item>
@@ -62,7 +65,10 @@
 
 <script lang="ts" setup name="opurchaseclassDetail">
 import { usePaging } from "@/hooks/usePaging";
+<<<<<<< HEAD
 import { useDictData } from "@/hooks/useDictOptions";
+=======
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
 import {
   apiOpurchaseclassLists,
   apiOpurchaseclassDelete,
diff --git a/src/views/translationOrder/index.vue b/src/views/translationOrder/index.vue
index a128626..3008632 100644
--- a/src/views/translationOrder/index.vue
+++ b/src/views/translationOrder/index.vue
@@ -128,7 +128,11 @@ const handleAdd = async () => {
 const handleDetail = async (data: any) => {
     console.log(data);
     router.push({
+<<<<<<< HEAD
         path: 'detail',
+=======
+        path: 'transDetail',
+>>>>>>> 1f12492c0c5a598c6a3a40a6943f3335aff92557
         query: {
             id: data.id
         }