From 238d5346edbf37da8248639760581e8058abfe48 Mon Sep 17 00:00:00 2001 From: Devil Date: Sun, 6 Dec 2020 13:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E4=B8=A2=E5=A4=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/User.php | 1 + sourcecode/alipay/default/pages/user/user.js | 6 +++--- sourcecode/baidu/default/pages/user/user.js | 6 +++--- sourcecode/qq/default/pages/user/user.js | 6 +++--- sourcecode/toutiao/default/pages/user/user.js | 6 +++--- sourcecode/weixin/default/app.js | 2 +- sourcecode/weixin/default/pages/user/user.js | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 3c7669303..39c520cc6 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -537,6 +537,7 @@ class User extends Common 'avatar' => $this->user['avatar'], 'nickname' => $this->user['nickname'], 'username' => $this->user['username'], + 'user_name_view' => $this->user['user_name_view'], 'user_order_status' => $user_order_status['data'], 'user_order_count' => $user_order_count, 'user_goods_favor_count' => $user_goods_favor_count, diff --git a/sourcecode/alipay/default/pages/user/user.js b/sourcecode/alipay/default/pages/user/user.js index ec7a10139..b728730f2 100644 --- a/sourcecode/alipay/default/pages/user/user.js +++ b/sourcecode/alipay/default/pages/user/user.js @@ -87,14 +87,14 @@ Page({ } self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); }, }); } else { self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); self.get_data(); @@ -138,7 +138,7 @@ Page({ this.setData({ user_order_status_list: temp_user_order_status_list, avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), - nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname, + nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, navigation: data.navigation || [], diff --git a/sourcecode/baidu/default/pages/user/user.js b/sourcecode/baidu/default/pages/user/user.js index 7bb56e608..60118ef80 100755 --- a/sourcecode/baidu/default/pages/user/user.js +++ b/sourcecode/baidu/default/pages/user/user.js @@ -78,14 +78,14 @@ Page({ } self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); }, }); } else { self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); self.get_data(); @@ -129,7 +129,7 @@ Page({ this.setData({ user_order_status_list: temp_user_order_status_list, avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar, - nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname, + nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname, message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, navigation: data.navigation || [], diff --git a/sourcecode/qq/default/pages/user/user.js b/sourcecode/qq/default/pages/user/user.js index 7281f7b62..03d8bce80 100755 --- a/sourcecode/qq/default/pages/user/user.js +++ b/sourcecode/qq/default/pages/user/user.js @@ -73,14 +73,14 @@ Page({ } self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); }, }); } else { self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); self.get_data(); @@ -124,7 +124,7 @@ Page({ this.setData({ user_order_status_list: temp_user_order_status_list, avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), - nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname, + nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, navigation: data.navigation || [], diff --git a/sourcecode/toutiao/default/pages/user/user.js b/sourcecode/toutiao/default/pages/user/user.js index d612ee2bc..4e07b0780 100755 --- a/sourcecode/toutiao/default/pages/user/user.js +++ b/sourcecode/toutiao/default/pages/user/user.js @@ -73,14 +73,14 @@ Page({ } self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); }, }); } else { self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); self.get_data(); @@ -124,7 +124,7 @@ Page({ this.setData({ user_order_status_list: temp_user_order_status_list, avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), - nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname, + nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, navigation: data.navigation || [], diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index 77243572e..1ed872248 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -74,7 +74,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - request_url: 'https://demo.shopxo.net/', + // request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/sourcecode/weixin/default/pages/user/user.js b/sourcecode/weixin/default/pages/user/user.js index 81f29df4e..7a79ba89a 100755 --- a/sourcecode/weixin/default/pages/user/user.js +++ b/sourcecode/weixin/default/pages/user/user.js @@ -73,14 +73,14 @@ Page({ } self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); }, }); } else { self.setData({ avatar: user.avatar || app.data.default_user_head_src, - nickname: user.nickname || '用户名', + nickname: user.user_name_view || user.nickname || '用户名', }); self.get_data(); @@ -124,7 +124,7 @@ Page({ this.setData({ user_order_status_list: temp_user_order_status_list, avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar), - nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname, + nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, navigation: data.navigation || [],