Merge branch 'lxl' into develop

pages.json

 {
   "pages": [
+    // {
+    //   "path" : "pages/login/login",
+    //   "style" : {
+    //     "navigationBarTitleText": "登录页面",
+    //     "enablePullDownRefresh": false
+    //   }
+    // },
     //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
     {
       "path": "pages/tabbar-a/tabbar-a",

style/css/common.scss

@@ -79,6 +79,14 @@
   height: 100%;
 }
 
+/* flex */
+
+.f-c-c{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 /* 图片 */
 .img-p-100{
   width: 100%;