Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -162,7 +162,11 @@ const yoho = {
      * @param fail 调用失败的回调方法
      * @param fail 调用失败的回调方法
      */
      */
     goNewPage(args, success, fail) {
     goNewPage(args, success, fail) {
-        if (this.isApp && window.yohoInterface) {
+        if (this.isApp) {
+            if (!window.yohoInterface) {
+                return false;
+            }
+
             window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
             window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.newPage',
                 method: 'go.newPage',
                 arguments: args
                 arguments: args
@@ -300,7 +304,7 @@ const yoho = {
      * @param fail
      * @param fail
      */
      */
     updateNavigationBar(args, success, fail) {
     updateNavigationBar(args, success, fail) {
-        if (this.isApp) {
+        if (this.isApp && window.yohoInterface) {
             window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
             window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'update.navigationBarStyle',
                 method: 'update.navigationBarStyle',
                 arguments: args
                 arguments: args

@@ -9,7 +9,7 @@
             </label>
             </label>
         </li>
         </li>
         <li>
         <li>
-            <label>昵称<input class="nickname" v-model='nickname' @input="setNickname" @change="checkNickname"></label>
+            <label>昵称<input class="nickname" v-model='nickname' maxlength="20" @input="setNickname" @change="checkNickname"></label>
         </li>
         </li>
         <li>
         <li>
             <label @click="setAender">性别
             <label @click="setAender">性别
@@ -54,7 +54,7 @@
                 yoho.goSetAvatar();
                 yoho.goSetAvatar();
             },
             },
             checkNickname: function() {
             checkNickname: function() {
-                if (!this.nickname) {
+                if (!(this.nickname.trim())) {
                     tip('昵称不能为空');
                     tip('昵称不能为空');
                     this.nickname = this.currentval;
                     this.nickname = this.currentval;
                     return false;
                     return false;
@@ -62,7 +62,7 @@
                 this.currentval = this.nickname;
                 this.currentval = this.nickname;
             },
             },
             setNickname: function() {
             setNickname: function() {
-                if (!this.nickname || this.currentval === this.nickname) {
+                if (!(this.nickname.trim()) || this.currentval === this.nickname) {
                     return false;
                     return false;
                 }
                 }
 
 

@@ -100,7 +100,7 @@
                 const header = $.extend({}, interceptClick.defaultTitleMap[2]);
                 const header = $.extend({}, interceptClick.defaultTitleMap[2]);
 
 
                 header.title.des = '订单详情';
                 header.title.des = '订单详情';
-                yoho.updateNavigationBar({
+                yohoAPI.updateNavigationBar({
                     header: header
                     header: header
                 });
                 });
             },
             },