asd/myrcar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/asd/myrcar into car

Browse Source
This commit is contained in:
myr1111
2020-01-09 10:27:00 +08:00
parent b17630f88b c5f771a597
commit 1527e8f188
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages/index/index.wxml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
<<<<<<< HEAD
<!--index.wxml--> <!--index.wxml-->
<view class="container"> <view class="container">
<view class="header"> <view class="header">
@@ -22,11 +20,17 @@
======= =======
======= =======
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
=======
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
<view> <view>
<view> <view>
<image src="../../utils/img/a.jpeg"></image> <image src="../../utils/img/a.jpeg"></image>
</view> </view>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
</view>
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
=======
</view> </view>
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
======= =======

5
project.config.json
View File

@@ -14,6 +14,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"libVersion": "2.0.4", "libVersion": "2.0.4",
"appid": "wxae4f3cb3357e0b55", "appid": "wxae4f3cb3357e0b55",
@@ -21,6 +22,10 @@
"libVersion": "2.9.4", "libVersion": "2.9.4",
"appid": "wx5766b7aac7c938b3", "appid": "wx5766b7aac7c938b3",
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
=======
"libVersion": "2.9.4",
"appid": "wx5766b7aac7c938b3",
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
======= =======
"libVersion": "2.9.4", "libVersion": "2.9.4",
"appid": "wx5766b7aac7c938b3", "appid": "wx5766b7aac7c938b3",