diff --git a/src/common/constant.js b/src/common/constant.js
index 6cf278d..2f4fa08 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -9,13 +9,8 @@ export const BASE_URL = `http://192.168.1.30:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
-<<<<<<< HEAD
-// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
-// export const BASE_URL = `http://192.168.1.224:50002/lymarket` // 添
-=======
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
 // export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
->>>>>>> 7322f1336ded31d51696f8417db3f5179a2e18c5
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 
 // CDN
diff --git a/src/pages/order/components/orderState/index.tsx b/src/pages/order/components/orderState/index.tsx
index c37a145..db0643f 100644
--- a/src/pages/order/components/orderState/index.tsx
+++ b/src/pages/order/components/orderState/index.tsx
@@ -25,7 +25,7 @@ type Param = {
 
 
 
-export default memo(({orderInfo = {logistics_details: [],payment_method: 0, status: 0, delivery_time:0}, onRefresh}:Param) => {
+export default memo(({orderInfo = {logistics_details: [],payment_method: 0, status: 0, expire_time:0}, onRefresh}:Param) => {
     
     const [showMore, setShowMore] = useState(false)
     const changeMore = () => {