Merge remote-tracking branch 'origin/master'

doum

21 小时以前 08300102d46271dd34073465763debd8507e8552

 mini-program/pages.json

@@ -185,6 +185,12 @@
         "style": {
            "navigationBarTitleText": "销售"
         }
      },
      {
         "path": "pages/zhuanqu/zhuanqu",
         "style": {
            "navigationBarTitleText": "专区"
         }
      }
   ],
   "subPackages": [
@@ -282,7 +288,7 @@
               "path" : "pages/rich-text-page/rich-text-page",
               "style" : 
               {
                  "navigationBarTitleText" : "富文本页面"
                  "navigationBarTitleText" : "详情"
               }
            }
         ]