Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app.js
#	packageA/pages/order/order.wxml

@@ -268,7 +268,8 @@ page {
 
 
 .wxParse-img {
 .wxParse-img {
   width: 100% !important;
   width: 100% !important;
-  margin: -30rpx auto 0 !important;
+  /* margin: -30rpx auto 0 !important; */
+  display: block;
 }
 }
 
 
 .template image {
 .template image {

@@ -124,5 +124,9 @@
                 }
                 }
             ]
             ]
         }
         }
+    },
+    "projectname": "binhaineigouopen",
+    "setting": {
+        "compileHotReLoad": true
     }
     }
 }
 }