Skip to content

M
mallapp
Commit 6f404002 authored by 黄奎's avatar 黄奎
Browse files
Options

修改

parent abee0f6d
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
pages/address/address2.vue
View file @ 6f404002
...@@ -61,11 +61,9 @@ ...@@ -61,11 +61,9 @@
<view class="school-bg"> <view class="school-bg">
<text> <text>
<!-- <u-icon name="arrow-left" size="20"></u-icon> --> <!-- <u-icon name="arrow-left" size="20"></u-icon> -->
<<<<<<< HEAD
<text class="school">{{title}}</text>
=======
<text class="school font24">选择就读学校</text> <text class="school font24">选择就读学校</text>
>>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
</text> </text>
</view> </view>
<!-- <view class="search"> <!-- <view class="search">
...@@ -101,12 +99,9 @@ ...@@ -101,12 +99,9 @@
<u-popup v-model="show4" mode="right" length="80%"> <u-popup v-model="show4" mode="right" length="80%">
<view class="school-bg"> <view class="school-bg">
<text> <text>
<<<<<<< HEAD
<text class="school">选择校区</text>
=======
<!-- <u-icon name="arrow-left" size="20"></u-icon> --> <!-- <u-icon name="arrow-left" size="20"></u-icon> -->
<text class="school font24">选择校区</text> <text class="school font24">选择校区</text>
>>>>>>> c95b144519a5881142bd955a62b080013c3fb1e4
</text> </text>
</view> </view>
<scroll-view scroll-y="true" style="height:100%;"> <scroll-view scroll-y="true" style="height:100%;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment