Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/pages/index/index.js
#	unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js

pages/module/maintain.vue

@@ -225,7 +225,6 @@ export default {
 			for(let k in this.maintainCarData){this.maintainCarData[k] = this.maintainCarData[k]==null?'':this.maintainCarData[k]}
 			this.$http('miniAppMyBMemberCar/updateMemberCar',this.maintainCarData,'POST').then(res => {
 				uni.hideLoading();
-				
 					uni.setStorage({
 						key: 'maintainCarData',
 						data: that.maintainCarData,

unpackage/dist/dev/mp-weixin/app.json

@@ -0,0 +1,78 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/shop/shopList",
+    "pages/me/me",
+    "pages/login/login",
+    "pages/login/empower",
+    "pages/login/iphoneLogin",
+    "pages/module/maintain",
+    "pages/module/replaceGoods",
+    "pages/module/confirmOrder",
+    "pages/module/orderShop",
+    "pages/index/addCar",
+    "pages/index/cailist",
+    "pages/index/carModel",
+    "pages/me/setup",
+    "pages/iPhone/phoneList",
+    "pages/iPhone/addphone",
+    "pages/me/treaty",
+    "pages/me/intimity",
+    "pages/order/myorder",
+    "pages/order/orderDetail",
+    "pages/order/evaluate",
+    "pages/me/discountCard",
+    "pages/me/discountDetail",
+    "pages/me/myAppraise",
+    "pages/me/myAppraiseDetail",
+    "pages/me/feedBack",
+    "pages/shop/ckShop",
+    "pages/shop/shopDetail",
+    "pages/changeStore/changeStore",
+    "pages/refundMoney/refundMoney",
+    "pages/refundMoney/refundMoneyList",
+    "pages/refundMoney/refundMoneyDetail",
+    "pages/changeStore/changeStoreList",
+    "pages/changeStore/changeStoreDetail"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "color": "#8a8a8a",
+    "selectedColor": "#FF4F00",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/img/tabme1.png",
+        "selectedIconPath": "static/img/tabme2.png",
+        "text": "4S保养"
+      },
+      {
+        "pagePath": "pages/shop/shopList",
+        "iconPath": "static/img/tabshop1.png",
+        "selectedIconPath": "static/img/tabshop2.png",
+        "text": "4S门店"
+      },
+      {
+        "pagePath": "pages/me/me",
+        "iconPath": "static/img/tabme1.png",
+        "selectedIconPath": "static/img/tabme2.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "获取定位"
+    }
+  },
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
+}