From 53e23d4958f8832113633808bb380b835f023b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Tue, 26 May 2020 20:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E5=85=89=E7=9A=84=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/purchaseLenses/purchaseLenses.vue | 44 ++++++++++++++---------------
1 file changed, 22 insertions(+), 22 deletions(-)
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()
--
2.0.0