提交
This commit is contained in:
parent
131f514066
commit
e7909dd4a9
@ -17,17 +17,13 @@
|
||||
import pageTopBar from '../../components/pageTopBar/pageTopBar.vue';
|
||||
import seachModule from "../../components/seachModule/seachModule.vue";
|
||||
import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
|
||||
<<<<<<< HEAD
|
||||
import apartmentItem from '@/components/public/apartment-item.vue';
|
||||
import haveQuestions from '@/components/public/have-questions.vue'
|
||||
import pageFooter from '@/components/footer/footer.vue'
|
||||
import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
|
||||
import { ElLoading } from 'element-plus'
|
||||
import Masonry from 'masonry-layout';
|
||||
=======
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
// import Masonry from 'masonry-layout';
|
||||
>>>>>>> origin/main
|
||||
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user