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

Browse Source
This commit is contained in:
myr1111
2020-01-09 10:15:29 +08:00
parent 07e6576a29
commit b17630f88b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/index/index.wxml
View File

@@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
<!--index.wxml-->
<view class="container">
<view class="header">
@@ -19,9 +20,15 @@
</view>
=======
=======
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
<view>
<view>
<image src="../../utils/img/a.jpeg"></image>
</view>
<<<<<<< HEAD
</view>
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
=======
</view>
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c

5
project.config.json
View File

@@ -13,9 +13,14 @@
"coverView": true
},
"compileType": "miniprogram",
<<<<<<< HEAD
<<<<<<< HEAD
"libVersion": "2.0.4",
"appid": "wxae4f3cb3357e0b55",
=======
"libVersion": "2.9.4",
"appid": "wx5766b7aac7c938b3",
>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
=======
"libVersion": "2.9.4",
"appid": "wx5766b7aac7c938b3",