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

* 'master' of http://47.98.226.240:3000/twt/txCar:
  ad
  add
  change orderDetail
  delete unpackage

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

pages/order/orderDetail.vue

@@ -531,6 +531,7 @@
 			},
 			refundMoney(){
 				console.log('退款');
+
 				
 				// 是否可以退款
 				this.haveRefundMoney();

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

@@ -1,78 +0,0 @@
-{
-  "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"
-}

unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js

@@ -733,6 +733,7 @@ __webpack_require__.r(__webpack_exports__);
     refundMoney: function refundMoney() {
       console.log('退款');
 
+
       // 是否可以退款
       this.haveRefundMoney();
     },