diff --git a/src/pages.json b/src/pages.json
index 3c40c73..8fbda78 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -19,15 +19,12 @@
             }
         },
         {
-<<<<<<< HEAD
-=======
             "path" : "pages/purchaseLenses/purchaseLenses",
             "style" : {
                 "navigationBarTitleText" : "产品选购"
             }
         },
         {
->>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb
             "path" : "pages/lensDetails/lensDetails",
             "style" : {
                 "navigationBarTitleText" : "产品详情"
@@ -160,4 +157,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/src/store/modules/myOrder.js b/src/store/modules/myOrder.js
index a4aa239..a52a483 100644
--- a/src/store/modules/myOrder.js
+++ b/src/store/modules/myOrder.js
@@ -88,17 +88,8 @@ const actions = {
         url: myOrderList,
         data: param,
         success: (res) => {
-<<<<<<< HEAD
-          const resData = {
-            ...res,
-            data,
-          }
-          console.log('data.data',res);
-          commit("INIT", resData.data.data);
-=======
           // console.log(res.data);
           commit("INIT", res.data.data);
->>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb
         },
     })
   }