Commit f1f3bede by zhujian

fix

parent 5c312a53
import React, { useRef, useLayoutEffect } from 'react'
export default function WWOpenDataCom({ type, openid }) {
const ref = useRef(null)
useLayoutEffect(() => {
console.log('1111');
console.log(WWOpenData);
WWOpenData && WWOpenData.bind(ref.current)
})
return <ww-open-data ref={ref} type={type} openid={openid} />
}
\ No newline at end of file
import React, { useRef, useLayoutEffect } from 'react' import React, { useContext, useRef, useLayoutEffect } from 'react'
export default function WWOpenDataCom({ type, openid }) { import { XMContext } from '@/store/context';
import WWOpenData from './WWOpenData'
export default function WWOpenDataCom(props) {
const ctx = useContext(XMContext);
const ref = useRef(null) const ref = useRef(null)
useLayoutEffect(() => {
console.log('1111'); return ctx.xmState.wechatLogin ? <WWOpenData {...props} /> : <div></div>
console.log(WWOpenData);
WWOpenData && WWOpenData.bind(ref.current)
})
return <ww-open-data ref={ref} type={type} openid={openid} />
} }
\ No newline at end of file
...@@ -16,7 +16,7 @@ import User from '@/common/js/user'; ...@@ -16,7 +16,7 @@ import User from '@/common/js/user';
import BaseService from "@/domains/basic-domain/baseService"; import BaseService from "@/domains/basic-domain/baseService";
import moment from 'moment'; import moment from 'moment';
import { VersionContext, VersionInfo, XMContext } from '@/store/context'; import { VersionContext, VersionInfo, XMContext } from '@/store/context';
import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList } from '@/store/actions/index'; import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
import Service from "@/common/js/service"; import Service from "@/common/js/service";
import Bus from '@/core/tbus'; import Bus from '@/core/tbus';
import WechatApi from '@/common/js/wechatApi'; import WechatApi from '@/common/js/wechatApi';
...@@ -39,7 +39,7 @@ const App: React.FC = (props: any) => { ...@@ -39,7 +39,7 @@ const App: React.FC = (props: any) => {
useEffect(() => { useEffect(() => {
initWechatConfig(); initWechatConfig();
getStoreAndUserInfo();
getVersion(); getVersion();
if (window.location.hash === "#/") { if (window.location.hash === "#/") {
window.RCHistory.replace({ window.RCHistory.replace({
...@@ -49,20 +49,10 @@ const App: React.FC = (props: any) => { ...@@ -49,20 +49,10 @@ const App: React.FC = (props: any) => {
}, []) }, [])
async function initWechatConfig() { async function initWechatConfig() {
WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }).then(() => { WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }).then(() => {
if (!initWechat) { ctx.dispatch(setWechatLogin(true))
getStoreAndUserInfo();
setInitWechat(true)
}
}) })
setTimeout(() => {
if (!initWechat) {
getStoreAndUserInfo();
setInitWechat(true)
}
}, 1000)
} }
useEffect(() => { useEffect(() => {
getStorePermission(); getStorePermission();
......
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