28 lines
317 B
Plaintext
28 lines
317 B
Plaintext
<<<<<<< HEAD
|
|
<!--index.wxml-->
|
|
<view class="container">
|
|
<view class="header">
|
|
<image src="../../utils/img/banner.png"></image>
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</view>
|
|
=======
|
|
<view>
|
|
<view>
|
|
<image src="../../utils/img/a.jpeg"></image>
|
|
</view>
|
|
</view>
|
|
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
|