diff --git a/src/pages/purchaseLenses/purchaseLenses.vue b/src/pages/purchaseLenses/purchaseLenses.vue
index 5cb6b02..178e4e5 100644
--- a/src/pages/purchaseLenses/purchaseLenses.vue
+++ b/src/pages/purchaseLenses/purchaseLenses.vue
@@ -752,7 +752,7 @@ export default {
     //   console.log('e---->', e)
     //   const mpList = this.mpList
 
-<<<<<<< HEAD
+// <<<<<<< HEAD
     //   for (let index = 0; index < mpList.length; index++) {
     //     if (e.detail.value === mpList[index].name) {
     //       this.isDataName = true
@@ -769,28 +769,28 @@ export default {
     //     }
     //   }
     // },
-=======
-      for (let index = 0; index < mpList.length; index++) {
-        if (e.detail.value === mpList[index].name) {
-          this.isDataName = true
-          uni.showModal({
-            title: '提示',
-            content: `是否自动填充已保存的${e.detail.value}的数据`,
-            success: ({ confirm }) => {
-              if (confirm) {
-                this.checkedData = mpList[index]
-                console.log('checkedData', this.checkedData)
-              }
-            }
-          })
-        }
-      }
-    },
-    // 确认验光数据
-    changeConfirm() {
+// =======
+    //   for (let index = 0; index < mpList.length; index++) {
+    //     if (e.detail.value === mpList[index].name) {
+    //       this.isDataName = true
+    //       uni.showModal({
+    //         title: '提示',
+    //         content: `是否自动填充已保存的${e.detail.value}的数据`,
+    //         success: ({ confirm }) => {
+    //           if (confirm) {
+    //             this.checkedData = mpList[index]
+    //             console.log('checkedData', this.checkedData)
+    //           }
+    //         }
+    //       })
+    //     }
+    //   }
+    // },
+    // // 确认验光数据
+    // changeConfirm() {
 
-    },
->>>>>>> 3a0878cc773855146d390a935b133980a5c0ee88
+    // },
+// >>>>>>> 3a0878cc773855146d390a935b133980a5c0ee88
     change(num) {
       this.show[num] = !this.show[num]
       this.$forceUpdate()