Skip to content

X
xiaomai-cloud-class-web
Commit bc1e34d2 by zhujian
Options

fix:rtyuiopk

parent 3420f33f
Showing with 46 additions and 45 deletions
src/common/js/wechatApi.js
...@@ -14,7 +14,7 @@ import Service from '@/common/js/service'; ...@@ -14,7 +14,7 @@ import Service from '@/common/js/service';
export default class WechatApi { export default class WechatApi {
static async initConfig(params = { isAgentConfig: false, url: '' }) { static async initConfig(params = { isAgentConfig: false, url: '' }) {
if(Platform.isWorkWx()){ if (Platform.isWorkWx()) {
return Service.Hades('anon/hades/getWxCorpJSAPISignature', { return Service.Hades('anon/hades/getWxCorpJSAPISignature', {
storeId: User.getStoreId(), storeId: User.getStoreId(),
url: params.url, url: params.url,
...@@ -29,41 +29,40 @@ export default class WechatApi { ...@@ -29,41 +29,40 @@ export default class WechatApi {
signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法 signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法
jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'], jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'],
}).then(() => { }).then(() => {
if (params.isAgentConfig) { return new Promise(async (resolve, reject) => {
return new Promise(async (resolve, reject) => { Service.Hades('anon/hades/getWxWorkJSAPISignature', {
Service.Hades('anon/hades/getWxWorkJSAPISignature', { storeId: User.getStoreId(),
storeId: User.getStoreId(), url: params.url,
url: params.url, }).then((result2) => {
}).then((result2) => { const res2 = result2.result;
const res2 = result2.result; this.agentConfig({
this.agentConfig({ corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致 agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247） timestamp: res2.timestamp, // 必填，生成签名的时间戳
timestamp: res2.timestamp, // 必填，生成签名的时间戳 nonceStr: res2.nonceStr, // 必填，生成签名的随机串
nonceStr: res2.nonceStr, // 必填，生成签名的随机串 signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法 jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'], success: (res) => {
success: (res) => { console.log(res, 'res-agentconfig');
console.log(res, 'res-agentconfig'); console.info('window.WWOpenData', window.WWOpenData);
console.info('window.WWOpenData', window.WWOpenData); resolve(res);
resolve(res); },
}, fail: (err) => {
fail: (err) => { console.log(1213545344545)
console.log(1213545344545) console.log(err, 'err-agentconfig');
console.log(err, 'err-agentconfig'); reject(err);
reject(err); },
},
});
}); });
}); });
} });
}) })
}); });
}else{ } else {
if (params.isAgentConfig) { if (params.isAgentConfig) {
console.log(32132132,'cesgu') console.log(32132132, 'cesgu')
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
Service.Hades('anon/hades/getWxWorkJSAPISignature', { Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(), storeId: User.getStoreId(),
...@@ -92,7 +91,7 @@ export default class WechatApi { ...@@ -92,7 +91,7 @@ export default class WechatApi {
}); });
} }
} }
} }
static async config(config) { static async config(config) {
......
src/modules/root/App.tsx
...@@ -29,12 +29,12 @@ declare var window: any; ...@@ -29,12 +29,12 @@ declare var window: any;
const App: React.FC = (props: any) => { const App: React.FC = (props: any) => {
const [storeUserId, setStoreUserId] = useState('') const [storeUserId, setStoreUserId] = useState('')
const ctx: any = useContext(XMContext); const ctx: any = useContext(XMContext);
const [versionInfo, setVersionInfo] = useState<VersionInfo|null>(null) const [versionInfo, setVersionInfo] = useState<VersionInfo | null>(null)
const userId = User.getUserId(); const userId = User.getUserId();
const [menuType, setMenuType] = useState(true); const [menuType, setMenuType] = useState(true);
const enterpriseId = User.getEnterpriseId(); const enterpriseId = User.getEnterpriseId();
window.ctx = ctx; window.ctx = ctx;
useEffect(() => { useEffect(() => {
initWechatConfig(); initWechatConfig();
...@@ -47,8 +47,10 @@ const App: React.FC = (props: any) => { ...@@ -47,8 +47,10 @@ const App: React.FC = (props: any) => {
} }
}, []) }, [])
async function initWechatConfig() { async function initWechatConfig() {
WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }) WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }).then(() => {
} console.log('注册完成')
})
}
useEffect(() => { useEffect(() => {
getStorePermission(); getStorePermission();
}, [window.location.hash]) }, [window.location.hash])
...@@ -70,7 +72,7 @@ const App: React.FC = (props: any) => { ...@@ -70,7 +72,7 @@ const App: React.FC = (props: any) => {
let version = res.result; let version = res.result;
User.setVersion(version); User.setVersion(version);
User.setExpirationTime(res.result.validEndTime) User.setExpirationTime(res.result.validEndTime)
let versioninfo:VersionInfo = { let versioninfo: VersionInfo = {
dayTime: version.dayTime, dayTime: version.dayTime,
stateEnum: version.stateEnum, stateEnum: version.stateEnum,
userNum: version.userNum === -1 ? '不限人数' : version.userNum, userNum: version.userNum === -1 ? '不限人数' : version.userNum,
...@@ -89,30 +91,30 @@ const App: React.FC = (props: any) => { ...@@ -89,30 +91,30 @@ const App: React.FC = (props: any) => {
async function getStoreAndUserInfo() { async function getStoreAndUserInfo() {
await (enterpriseId ? getStoreInfo() : getStoreGroupAndStoreList()); await (enterpriseId ? getStoreInfo() : getStoreGroupAndStoreList());
} }
function getStoreInfo() { function getStoreInfo() {
console.log("currentStoreUserInfo",window.currentStoreUserInfo); console.log("currentStoreUserInfo", window.currentStoreUserInfo);
const params = { const params = {
storeId: User.getStoreId(), storeId: User.getStoreId(),
userId: User.getUserId(), userId: User.getUserId(),
}; };
Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => { Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
if(res.success){ if (res.success) {
const { id, storeUserId, storeName, userRole, storeType } = res.result; const { id, storeUserId, storeName, userRole, storeType } = res.result;
User.setStoreId(id); User.setStoreId(id);
User.setStoreUserId(storeUserId); User.setStoreUserId(storeUserId);
User.setStoreName(storeName); User.setStoreName(storeName);
Bus.trigger('storeNameChange',storeName); Bus.trigger('storeNameChange', storeName);
User.setUserRole(userRole); User.setUserRole(userRole);
User.setStoreType(storeType); User.setStoreType(storeType);
setCurrentStoreUserInfo(id,storeUserId) setCurrentStoreUserInfo(id, storeUserId)
setStoreUserId(storeUserId); setStoreUserId(storeUserId);
getUserPermission(); getUserPermission();
} }
}) })
} }
function setCurrentStoreUserInfo(storeId:any,storeUserId:any){ function setCurrentStoreUserInfo(storeId: any, storeUserId: any) {
window.currentStoreUserInfo.storeId = storeId; window.currentStoreUserInfo.storeId = storeId;
window.currentStoreUserInfo.storeUserId = storeUserId; window.currentStoreUserInfo.storeUserId = storeUserId;
window.currentStoreUserInfo.userId = User.getUserId(); window.currentStoreUserInfo.userId = User.getUserId();
...@@ -138,7 +140,7 @@ const App: React.FC = (props: any) => { ...@@ -138,7 +140,7 @@ const App: React.FC = (props: any) => {
Bus.trigger('storeNameChange', storeName); Bus.trigger('storeNameChange', storeName);
User.setUserRole(userRole); User.setUserRole(userRole);
User.setStoreType(storeType); User.setStoreType(storeType);
setCurrentStoreUserInfo(id,storeUserId); setCurrentStoreUserInfo(id, storeUserId);
ctx.dispatch(setStoreGroupList(storeGroupVOS)) ctx.dispatch(setStoreGroupList(storeGroupVOS))
ctx.dispatch(setStoreList(storeVOS)); ctx.dispatch(setStoreList(storeVOS));
setStoreUserId(storeUserId) setStoreUserId(storeUserId)
......
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 to comment