Merge branch 'develop' into test

package.json

 {
 	"name": "wx-school-app-public",
-	"version": "1.0.9",
+	"version": "1.0.11",
 	"private": true,
 	"description": "",
 	"scripts": {

src/pages/pay/pay.scss

@@ -48,7 +48,7 @@
       align-items: center;
       text-align: center;
       width: 218px;
-      height: 160px;
+      height: 110px;
       font-size: 28px;
       border-radius: 24px;
       border: 1px solid #ccc;
@@ -61,6 +61,6 @@
     }
   }
   .Pay-btn {
-    margin: 20px 32px 0;
+    margin: 20px 32px 80px;
   }
 }

src/pages/pay/pay.tsx

@@ -909,6 +909,8 @@ class Pay extends Component {
             确定支付
           </Button>
         )}
+
+        <ad unit-id="adunit-8d48f17389f7e2aa"></ad>
       </View>
     );
   }