Commit 42b28f9a by golton_gao

update: 调整顶部头型为云之家头像url

parent 09b93b61
Showing with 8 additions and 2 deletions
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"dev": "cross-env PACK_ENV=dev && node build/dev-server.js", "dev": "cross-env PACK_ENV=dev && node build/dev-server.js",
"start": "npm run dev", "start": "npm run dev",
"build": "npm run build:test", "build": "npm run build:test",
"build:test": "cross-env PACK_ENV=test && node build/build.js", "build:test": "cross-env PACK_ENV=test node build/build.js",
"build:prod": "cross-env PACK_ENV=product && node build/build.js", "build:prod": "cross-env PACK_ENV=product node build/build.js",
"build:report": "npm run build --report" "build:report": "npm run build --report"
}, },
"dependencies": { "dependencies": {
......
...@@ -116,6 +116,7 @@ function getUserInfoByOid(oId) { ...@@ -116,6 +116,7 @@ function getUserInfoByOid(oId) {
}); });
resolve({ resolve({
uid: userInfo.username || '', uid: userInfo.username || '',
avatar: userInfo.avatar || '',
employeenumber: (employeenumberInfo[0] || {}).value employeenumber: (employeenumberInfo[0] || {}).value
}); });
}; };
...@@ -145,12 +146,14 @@ function initUser() { ...@@ -145,12 +146,14 @@ function initUser() {
createWatermark({ content: `${user.cn}${user.uid}` }); createWatermark({ content: `${user.cn}${user.uid}` });
// todo:目前先写死房产,待黄延龄确认orgType怎么获取后再将orgType变成动态的。 // todo:目前先写死房产,待黄延龄确认orgType怎么获取后再将orgType变成动态的。
const extra = { const extra = {
avatar: viewee.avatar,
employeenumber: viewee.employeenumber, employeenumber: viewee.employeenumber,
uid: viewee.uid, uid: viewee.uid,
extra: '{"orgType": 1}' extra: '{"orgType": 1}'
}; };
userid = isFromPersonDetail ? extra.employeenumber : user.employeenumber; userid = isFromPersonDetail ? extra.employeenumber : user.employeenumber;
_uid = isFromPersonDetail ? extra.uid : user.uid; _uid = isFromPersonDetail ? extra.uid : user.uid;
photoUrl = isFromPersonDetail ? extra.avatar : user.avatar;
if (!userid || !_uid) { if (!userid || !_uid) {
alert('应用启动发生错误,请联系开发人员'); alert('应用启动发生错误,请联系开发人员');
} }
...@@ -287,6 +290,8 @@ function mount() { ...@@ -287,6 +290,8 @@ function mount() {
.catch(e => { .catch(e => {
}); });
// 获取头像 // 获取头像
renderPhoto()
/*
$mas.getData(configuration.baseUrl + configuration.methods.photo, { $mas.getData(configuration.baseUrl + configuration.methods.photo, {
uid: _uid, uid: _uid,
appKey appKey
...@@ -300,6 +305,7 @@ function mount() { ...@@ -300,6 +305,7 @@ function mount() {
.catch(e => { .catch(e => {
console.log('getData err', e); console.log('getData err', e);
}); });
*/
} }
function scrollBehavior() { function scrollBehavior() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment