Merge branch 'weixin_guange' into develop
This commit is contained in:
commit
7a71a7bd47
|
@ -13,7 +13,7 @@ module Mobile
|
|||
else
|
||||
case f
|
||||
when :img_url
|
||||
"/images/#{url_to_avatar(u)}"
|
||||
"/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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
);
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue