Merge remote-tracking branch 'origin/master'

rk

昨天 cc4c386f1883667651321bb0fc7b57c71b6d0dc4

1
2
3
4
5
6
{
  "navigationBarTitleText": "设置",
  "usingComponents": {
    "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup"
  }
}