Merge remote-tracking branch 'origin/master'

rk

16 小时以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 app/.hbuilderx/launch.json

@@ -2,9 +2,16 @@
    "version" : "1.0",
    "configurations" : [
        {
            "customPlaygroundType" : "device",
            "playground" : "standard",
            "customPlaygroundType" : "local",
            "localRepoPath" : "D:/豆米/gtzxinglijicun/app",
            "packageName" : "com.doumee.app",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        },
        {
            "customPlaygroundType" : "local",
            "playground" : "custom",
            "type" : "uni-app:app-ios"
        }
    ]
}