Commit 53e23d4958f8832113633808bb380b835f023b71
1 parent
25c2e9dd7e
Exists in
master
验光的填充
Showing
1 changed file
with
22 additions
and
22 deletions
Show diff stats
src/pages/purchaseLenses/purchaseLenses.vue
... | ... | @@ -752,7 +752,7 @@ export default { |
752 | 752 | // console.log('e---->', e) |
753 | 753 | // const mpList = this.mpList |
754 | 754 | |
755 | -<<<<<<< HEAD | |
755 | +// <<<<<<< HEAD | |
756 | 756 | // for (let index = 0; index < mpList.length; index++) { |
757 | 757 | // if (e.detail.value === mpList[index].name) { |
758 | 758 | // this.isDataName = true |
... | ... | @@ -769,28 +769,28 @@ export default { |
769 | 769 | // } |
770 | 770 | // } |
771 | 771 | // }, |
772 | -======= | |
773 | - for (let index = 0; index < mpList.length; index++) { | |
774 | - if (e.detail.value === mpList[index].name) { | |
775 | - this.isDataName = true | |
776 | - uni.showModal({ | |
777 | - title: '提示', | |
778 | - content: `是否自动填充已保存的${e.detail.value}的数据`, | |
779 | - success: ({ confirm }) => { | |
780 | - if (confirm) { | |
781 | - this.checkedData = mpList[index] | |
782 | - console.log('checkedData', this.checkedData) | |
783 | - } | |
784 | - } | |
785 | - }) | |
786 | - } | |
787 | - } | |
788 | - }, | |
789 | - // 确认验光数据 | |
790 | - changeConfirm() { | |
772 | +// ======= | |
773 | + // for (let index = 0; index < mpList.length; index++) { | |
774 | + // if (e.detail.value === mpList[index].name) { | |
775 | + // this.isDataName = true | |
776 | + // uni.showModal({ | |
777 | + // title: '提示', | |
778 | + // content: `是否自动填充已保存的${e.detail.value}的数据`, | |
779 | + // success: ({ confirm }) => { | |
780 | + // if (confirm) { | |
781 | + // this.checkedData = mpList[index] | |
782 | + // console.log('checkedData', this.checkedData) | |
783 | + // } | |
784 | + // } | |
785 | + // }) | |
786 | + // } | |
787 | + // } | |
788 | + // }, | |
789 | + // // 确认验光数据 | |
790 | + // changeConfirm() { | |
791 | 791 | |
792 | - }, | |
793 | ->>>>>>> 3a0878cc773855146d390a935b133980a5c0ee88 | |
792 | + // }, | |
793 | +// >>>>>>> 3a0878cc773855146d390a935b133980a5c0ee88 | |
794 | 794 | change(num) { |
795 | 795 | this.show[num] = !this.show[num] |
796 | 796 | this.$forceUpdate() | ... | ... |