Merge branch 'master' into dev

src/main.js

@@ -48,7 +48,7 @@ Vue.prototype.setPageNavState = function () {
       );
     });
   } catch (err) {
-    console.log("setPageNavState is error",err);
+    console.log("setPageNavState is error,err=",err);
   }
 };