XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/views/housingView/apartment.vue
This commit is contained in:
A1300399510
2023-07-17 12:02:07 +08:00
parent cb3198febc 085d336a3f
commit 131f514066
8 changed files with 128 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/housingView/apartment.vue
View File

@@ -17,12 +17,17 @@
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()