Merge branch 'car' of asd/myrcar into master

Merge branch 'master' of http://git.luyuan.tk/asd/myrcar into car
Merge branch 'master' of http://git.luyuan.tk/asd/myrcar
2020-01-09 10:29:24 +08:00 · 2020-01-09 10:27:00 +08:00 · 2020-01-09 10:15:29 +08:00 · 2020-01-09 09:46:20 +08:00 · 2020-01-09 08:59:12 +08:00
20 changed files with 49 additions and 1 deletions
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,38 @@
+<!--index.wxml-->
+<view class="container">
+    <view class="header"> 
+      <image src="../../utils/img/banner.png"></image>  
+    
+    </view>
+
+
+
+
+
+
+
+
+
+
+
+
+</view>
+=======
+=======
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 <view>
  <view>
    <image src="../../utils/img/a.jpeg"></image>
  </view>
+<<<<<<< HEAD
+<<<<<<< HEAD
 </view>
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+</view>
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+</view>
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
--- a/project.config.json
+++ b/project.config.json
@@ -13,8 +13,23 @@
 		"coverView": true
 	},
 	"compileType": "miniprogram",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+	"libVersion": "2.0.4",
+	"appid": "wxae4f3cb3357e0b55",
+=======
 	"libVersion": "2.9.4",
 	"appid": "wx5766b7aac7c938b3",
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+	"libVersion": "2.9.4",
+	"appid": "wx5766b7aac7c938b3",
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+	"libVersion": "2.9.4",
+	"appid": "wx5766b7aac7c938b3",
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 	"projectname": "car",
 	"debugOptions": {
 		"hidedInDevtools": []
--- a/utils/img/banner.png
+++ b/utils/img/banner.png
--- a/utils/img/e0a4120f56503d02d61d5f6e92071dda.png
+++ b/utils/img/e0a4120f56503d02d61d5f6e92071dda.png
--- a/utils/img/万能泡沫清洗剂.png
+++ b/utils/img/万能泡沫清洗剂.png
--- a/utils/img/保养.png
+++ b/utils/img/保养.png
--- a/utils/img/冷却系统养护.png
+++ b/utils/img/冷却系统养护.png
--- a/utils/img/发动机.png
+++ b/utils/img/发动机.png
--- a/utils/img/图层
+++ b/utils/img/图层
--- a/utils/img/圆角矩形
+++ b/utils/img/圆角矩形
--- a/utils/img/广告位.png
+++ b/utils/img/广告位.png
--- a/utils/img/形状
+++ b/utils/img/形状
--- a/utils/img/形状
+++ b/utils/img/形状
--- a/utils/img/椭圆
+++ b/utils/img/椭圆
--- a/utils/img/汽车空调换油保养.png
+++ b/utils/img/汽车空调换油保养.png
--- a/utils/img/矩形
+++ b/utils/img/矩形
--- a/utils/img/矩形
+++ b/utils/img/矩形
--- a/utils/img/类目品类分类类别.png
+++ b/utils/img/类目品类分类类别.png
--- a/utils/img/道路救援.png
+++ b/utils/img/道路救援.png
--- a/utils/img/雨刮.png
+++ b/utils/img/雨刮.png
Author	SHA1	Message	Date
myr	fb0ee2b18e	Merge branch 'car' of asd/myrcar into master	2020-01-09 10:29:24 +08:00
myr1111	1527e8f188	Merge branch 'master' of http://git.luyuan.tk/asd/myrcar into car	2020-01-09 10:27:00 +08:00
myr1111	b17630f88b	Merge branch 'master' of http://git.luyuan.tk/asd/myrcar	2020-01-09 10:15:29 +08:00
myr1111	07e6576a29	car	2020-01-09 09:46:20 +08:00
asd	c5f771a597	Merge branch 'asd' of asd/myrcar into master	2020-01-09 08:59:12 +08:00