From 5b8ecf6657333353438daa28b9c6e60581ca9b74 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 8 Sep 2016 18:50:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/user.rb | 3 ++- config/menu.yml.production | 6 +++--- public/javascripts/wechat/controllers/edit_userinfo.js | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb index 30a2a7edd..f4fc7cb66 100644 --- a/app/api/mobile/entities/user.rb +++ b/app/api/mobile/entities/user.rb @@ -13,7 +13,8 @@ module Mobile else case f when :img_url - "/images/#{url_to_avatar(u)}" + "/images/#{url_to_avatar(u)}"+"?t="+Time.now.to_i.to_s + #Time.now.strftime('%Y-%m-%d') when :gender u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender when :work_unit diff --git a/config/menu.yml.production b/config/menu.yml.production index d825a8727..0b8cd5b37 100644 --- a/config/menu.yml.production +++ b/config/menu.yml.production @@ -31,6 +31,6 @@ button: name: "联系我们" key: "FEEDBACK" - - type: "click" - name: "解除绑定" - key: "UNBIND" + type: "view" + name: "个人资料" + url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=edit_userinfo#wechat_redirect" diff --git a/public/javascripts/wechat/controllers/edit_userinfo.js b/public/javascripts/wechat/controllers/edit_userinfo.js index f367adf31..94722398d 100644 --- a/public/javascripts/wechat/controllers/edit_userinfo.js +++ b/public/javascripts/wechat/controllers/edit_userinfo.js @@ -21,7 +21,6 @@ app.controller('EditUserInfoController', ['$scope', 'config','$http', 'auth','$l vm.lastname = vm.user.lastname; vm.mail = vm.user.mail; vm.sex = vm.user.gender; - vm.user.img_url = vm.user.img_url +"?t="+Math.random(); } ); }; From a6b03ed9f17fb884508ace873697fe376c2a0980 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 8 Sep 2016 18:53:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/user.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb index f4fc7cb66..5c6b95771 100644 --- a/app/api/mobile/entities/user.rb +++ b/app/api/mobile/entities/user.rb @@ -13,8 +13,7 @@ module Mobile else case f when :img_url - "/images/#{url_to_avatar(u)}"+"?t="+Time.now.to_i.to_s - #Time.now.strftime('%Y-%m-%d') + "/images/#{url_to_avatar(u)}"+"?t="+Time.now.strftime('%Y-%m-%d') when :gender u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender when :work_unit