修改

6f404002 · 黄奎 · abee0f6d · 6f404002
Commit 6f404002 authored Oct 14, 2022 by 黄奎
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

address2.vue pages/address/address2.vue +3 -8

No files found.
--- a/pages/address/address2.vue
+++ b/pages/address/address2.vue
@@ -61,11 +61,9 @@
 			<view class="school-bg">
 				<text>
 					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
-<<<<<<< HEAD
-					<text class="school">{{title}}</text>
-=======
+
+
 					<text class="school font24">选择就读学校</text>
->>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
 				</text>
 			</view>
 			<!-- <view class="search">
@@ -101,12 +99,9 @@
 		<u-popup v-model="show4" mode="right" length="80%">
 			<view class="school-bg">
 				<text>
-<<<<<<< HEAD
-					<text class="school">选择校区</text>
-=======
+
 					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
 					<text class="school font24">选择校区</text>
->>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
 				</text>
 			</view>
 			<scroll-view scroll-y="true" style="height:100%;">