|
|
@@ -1,8 +1,7 @@
|
|
|
<script>
|
|
|
export default {
|
|
|
globalData: {
|
|
|
-<<<<<<< HEAD
|
|
|
- global_page: '',
|
|
|
+ global_page:'',
|
|
|
schoolInfo:[{
|
|
|
schoolName:'清华大学',
|
|
|
schoolImg: require('static/qinghua@2x.png'),
|
|
|
@@ -65,7 +64,6 @@
|
|
|
}
|
|
|
],
|
|
|
|
|
|
-=======
|
|
|
global_addre:"山东",
|
|
|
global_sco:"600", //该考生的分数
|
|
|
global_sub:"文科",
|
|
|
@@ -74,7 +72,6 @@
|
|
|
global_collection_arr:[], //收藏的学校
|
|
|
global_collectionFlag:[], //是否被收藏，
|
|
|
//学校信息数组，
|
|
|
->>>>>>> 0418080f5759e03628ce80bd3befac4c6c2dfc7d
|
|
|
global_colle: [{
|
|
|
name: "北京大学",
|
|
|
address: "北京",
|
