Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 mini-program/pages.json

@@ -290,6 +290,18 @@
               {
                  "navigationBarTitleText" : ""
               }
            },
            {
               "path": "pages/webview/webview",
               "style": {
                  "navigationBarTitleText": "富文本"
               }
            },
            {
               "path": "pages/richText/richText",
               "style": {
                  "navigationBarTitleText": "富文本"
               }
            }
         ]
      }