Merge branch 'develop' into test

miniprogram/pages/home/home.wxml

@@ -29,7 +29,7 @@
     <price-and-count tag-data="{{comsumerData}}" />
     <price-and-count tag-data="{{comsumerCount}}" />
     <view class="padding"></view>
-    <service-count wx:for="{{serviceList}}" wx:key="{{item.serviceId}}" tag-data="{{item}}" />
+    <service-count wx:for="{{serviceList}}" wx:key="serviceId" tag-data="{{item}}" />
   </view>
   <view class="home-box">
     <price-and-count tag-data="{{refundData}}" />

project.config.json

@@ -29,7 +29,8 @@
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		}
+		},
+		"bundle": false
 	},
 	"appid": "wx458799fcb933d34f",
 	"simulatorType": "wechat",