Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
2d52a99f
Commit
2d52a99f
authored
Aug 04, 2021
by
zhujian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:ghjkl;kjhlljkljkl
parent
41fa2160
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
23 deletions
+26
-23
src/common/js/axios.ts
+0
-2
src/common/js/wechatApi.js
+1
-15
src/modules/root/CollegeManagePage.jsx
+1
-1
src/store/actions/basicAction.ts
+9
-2
src/store/actions/constants.ts
+3
-0
src/store/actions/index.ts
+5
-2
src/store/reducers/basicReducer.ts
+7
-1
No files found.
src/common/js/axios.ts
View file @
2d52a99f
...
@@ -130,9 +130,7 @@ class Axios {
...
@@ -130,9 +130,7 @@ class Axios {
if
(
method
===
'GET'
)
{
if
(
method
===
'GET'
)
{
config
=
Object
.
assign
({
params
,
url
:
`
${
BASIC_HOST
}${
_url
}
`
,
method
});
config
=
Object
.
assign
({
params
,
url
:
`
${
BASIC_HOST
}${
_url
}
`
,
method
});
}
else
{
}
else
{
console
.
log
(
corpType
)
config
=
Object
.
assign
({
data
:
{
corpType
,
...(
params
||
{})
},
url
:
`
${
BASIC_HOST
}${
_url
}
`
,
method
});
config
=
Object
.
assign
({
data
:
{
corpType
,
...(
params
||
{})
},
url
:
`
${
BASIC_HOST
}${
_url
}
`
,
method
});
console
.
log
(
config
,
'config'
)
}
}
instance
(
config
).
then
((
res
:
AxiosResponse
):
void
=>
{
instance
(
config
).
then
((
res
:
AxiosResponse
):
void
=>
{
...
...
src/common/js/wechatApi.js
View file @
2d52a99f
...
@@ -29,7 +29,6 @@ export default class WechatApi {
...
@@ -29,7 +29,6 @@ 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
(()
=>
{
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
,
...
@@ -54,7 +53,6 @@ export default class WechatApi {
...
@@ -54,7 +53,6 @@ export default class WechatApi {
},
},
});
});
});
});
});
})
})
...
@@ -112,19 +110,7 @@ export default class WechatApi {
...
@@ -112,19 +110,7 @@ export default class WechatApi {
}
}
static
async
agentConfig
(
config
)
{
static
async
agentConfig
(
config
)
{
return
new
Promise
((
success
,
fail
)
=>
{
wx
.
agentConfig
({
...
config
});
console
.
info
(
'wx.agentConfig'
,
config
);
wx
.
agentConfig
({
...
config
,
success
,
fail
});
}).
then
(
(
res
)
=>
{
console
.
info
(
'wx.agentConfig success'
,
res
);
return
res
;
},
(
error
)
=>
{
console
.
error
(
'wx.agentConfig fail'
,
error
);
throw
error
;
}
);
}
}
static
getCurExternalContact
()
{
static
getCurExternalContact
()
{
...
...
src/modules/root/CollegeManagePage.jsx
View file @
2d52a99f
...
@@ -266,7 +266,7 @@ export default class CollegeManagePage extends React.Component {
...
@@ -266,7 +266,7 @@ export default class CollegeManagePage extends React.Component {
<
span
className=
"name"
>
<
span
className=
"name"
>
{
name
}
{
name
}
{
{
initWechat
&&
<
WWOpenDataCom
type=
"userName"
openid=
{
name
}
/>
<
WWOpenDataCom
type=
"userName"
openid=
{
name
}
/>
}
}
</
span
>
</
span
>
...
...
src/store/actions/basicAction.ts
View file @
2d52a99f
...
@@ -10,7 +10,8 @@ import {
...
@@ -10,7 +10,8 @@ import {
STORE_GROUP_PERMISSION
,
STORE_GROUP_PERMISSION
,
STORE_PERMISSION
,
STORE_PERMISSION
,
STORE_GROUP_LIST
,
STORE_GROUP_LIST
,
STORE_LIST
STORE_LIST
,
WECHAT_LOGIN
}
from
'./constants'
}
from
'./constants'
...
@@ -34,12 +35,18 @@ const setStoreList = (payload: any) => ({
...
@@ -34,12 +35,18 @@ const setStoreList = (payload: any) => ({
payload
payload
})
})
const
setWechatLogin
=
(
payload
:
any
)
=>
({
type
:
WECHAT_LOGIN
,
payload
})
export
{
export
{
setStoreGroupPermission
,
setStoreGroupPermission
,
setStorePermission
,
setStorePermission
,
setStoreGroupList
,
setStoreGroupList
,
setStoreList
setStoreList
,
setWechatLogin
}
}
src/store/actions/constants.ts
View file @
2d52a99f
...
@@ -10,11 +10,13 @@ const STORE_GROUP_PERMISSION = 'STORE_GROUP_PERMISSION';
...
@@ -10,11 +10,13 @@ const STORE_GROUP_PERMISSION = 'STORE_GROUP_PERMISSION';
const
STORE_PERMISSION
=
'STORE_PERMISSION'
;
const
STORE_PERMISSION
=
'STORE_PERMISSION'
;
const
STORE_GROUP_LIST
=
'STORE_GROUP_LIST'
;
const
STORE_GROUP_LIST
=
'STORE_GROUP_LIST'
;
const
STORE_LIST
=
'STORE_LIST'
;
const
STORE_LIST
=
'STORE_LIST'
;
const
WECHAT_LOGIN
=
'WECHAT_LOGIN'
;
export
{
export
{
STORE_GROUP_PERMISSION
,
STORE_GROUP_PERMISSION
,
STORE_PERMISSION
,
STORE_PERMISSION
,
STORE_GROUP_LIST
,
STORE_GROUP_LIST
,
STORE_LIST
,
STORE_LIST
,
WECHAT_LOGIN
,
}
}
\ No newline at end of file
src/store/actions/index.ts
View file @
2d52a99f
...
@@ -4,12 +4,14 @@ import {
...
@@ -4,12 +4,14 @@ import {
setStoreGroupPermission
,
setStoreGroupPermission
,
setStorePermission
,
setStorePermission
,
setStoreGroupList
,
setStoreGroupList
,
setStoreList
setStoreList
,
setWechatLogin
}
from
'./basicAction'
;
}
from
'./basicAction'
;
export
{
export
{
setStoreGroupPermission
,
setStoreGroupPermission
,
setStorePermission
,
setStorePermission
,
setStoreGroupList
,
setStoreGroupList
,
setStoreList
setStoreList
,
setWechatLogin
}
}
\ No newline at end of file
src/store/reducers/basicReducer.ts
View file @
2d52a99f
...
@@ -10,7 +10,8 @@ import {
...
@@ -10,7 +10,8 @@ import {
STORE_GROUP_PERMISSION
,
STORE_GROUP_PERMISSION
,
STORE_PERMISSION
,
STORE_PERMISSION
,
STORE_GROUP_LIST
,
STORE_GROUP_LIST
,
STORE_LIST
STORE_LIST
,
WECHAT_LOGIN
,
}
from
'@/store/actions/constants'
;
}
from
'@/store/actions/constants'
;
import
_
from
'underscore'
;
import
_
from
'underscore'
;
import
Permission
from
'@/common/js/permission'
;
import
Permission
from
'@/common/js/permission'
;
...
@@ -45,6 +46,11 @@ const basicReducer = (state: any, action: any) => {
...
@@ -45,6 +46,11 @@ const basicReducer = (state: any, action: any) => {
return
Object
.
assign
({},
state
,
{
return
Object
.
assign
({},
state
,
{
storeList
,
storeList
,
});
});
case
WECHAT_LOGIN
:
const
wechatLogin
:
any
=
action
.
payload
;
return
Object
.
assign
({},
state
,
{
wechatLogin
,
});
default
:
default
:
return
state
;
return
state
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment