Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
html
/
h5wandahuijia
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b47b7968
authored
Feb 28, 2019
by
mamingqun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复了微信接口没有system的问题
parent
c3268cb3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
7 deletions
+20
-7
src/modules/store/index.js
+1
-1
src/pages/index/App.vue
+2
-2
src/pages/index/Shouye.vue
+8
-1
src/pages/user/App.vue
+2
-2
src/pages/user/User.vue
+7
-1
No files found.
src/modules/store/index.js
View file @
b47b7968
...
@@ -40,7 +40,7 @@ export default new Vuex.Store({
...
@@ -40,7 +40,7 @@ export default new Vuex.Store({
axios
.
get
(
'http://web-comment.canskj.cn/wandah5/activity/info'
).
then
((
result
)
=>
{
axios
.
get
(
'http://web-comment.canskj.cn/wandah5/activity/info'
).
then
((
result
)
=>
{
state
.
publicActiveInfo
=
result
.
data
.
data
state
.
publicActiveInfo
=
result
.
data
.
data
axios
.
defaults
.
headers
.
common
[
'systemtype'
]
=
state
.
publicActiveInfo
.
system_type
;
//
axios.defaults.headers.common['systemtype'] =state.publicActiveInfo.system_type;
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
...
...
src/pages/index/App.vue
View file @
b47b7968
...
@@ -38,8 +38,8 @@ export default {
...
@@ -38,8 +38,8 @@ export default {
}
}
},
},
created
()
{
created
()
{
store
.
commit
(
'getPublicActiveInfo'
);
//
store.commit('getPublicActiveInfo');
store
.
commit
(
'getPublicShareInfo'
);
//
store.commit('getPublicShareInfo');
},
},
mounted
()
{
mounted
()
{
// var tar_userinfo = localStorage.getItem('tar_userinfo');
// var tar_userinfo = localStorage.getItem('tar_userinfo');
...
...
src/pages/index/Shouye.vue
View file @
b47b7968
...
@@ -214,6 +214,7 @@ export default {
...
@@ -214,6 +214,7 @@ export default {
axios
.
get
(
'http://web-comment.canskj.cn/wandah5/activity/info'
).
then
((
result
)
=>
{
axios
.
get
(
'http://web-comment.canskj.cn/wandah5/activity/info'
).
then
((
result
)
=>
{
console
.
log
(
'活动的data'
);
console
.
log
(
'活动的data'
);
console
.
log
(
result
.
data
.
data
);
console
.
log
(
result
.
data
.
data
);
...
@@ -230,6 +231,9 @@ export default {
...
@@ -230,6 +231,9 @@ export default {
axios
.
defaults
.
headers
.
common
[
'systemtype'
]
=
type
;
axios
.
defaults
.
headers
.
common
[
'systemtype'
]
=
type
;
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
store
.
commit
(
'getPublicActiveInfo'
);
store
.
commit
(
'getPublicShareInfo'
);
_this
.
judgeShare
();
_this
.
judgeShare
();
_this
.
getIsAward
();
_this
.
getIsAward
();
_this
.
getActiveInfo
();
_this
.
getActiveInfo
();
...
@@ -240,7 +244,10 @@ export default {
...
@@ -240,7 +244,10 @@ export default {
_this
.
userCenter
=
window
.
windowUserCenterHref
_this
.
userCenter
=
window
.
windowUserCenterHref
_this
.
getUserInfo
();
_this
.
getUserInfo
();
_this
.
getRuweiList
();
_this
.
getRuweiList
();
_this
.
getWeixinPowerShare
();
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
console
.
log
(
err
);
console
.
log
(
err
);
});
});
...
@@ -257,7 +264,7 @@ export default {
...
@@ -257,7 +264,7 @@ export default {
this
.
tongbudianzan
(
this
.
huojiang
,
data
);
this
.
tongbudianzan
(
this
.
huojiang
,
data
);
});
});
this
.
getWeixinPowerShare
();
this
.
watchEventBus
();
this
.
watchEventBus
();
...
...
src/pages/user/App.vue
View file @
b47b7968
...
@@ -46,8 +46,8 @@ export default {
...
@@ -46,8 +46,8 @@ export default {
this
.
judgeShare
()
this
.
judgeShare
()
this
.
getActiveInfo
()
this
.
getActiveInfo
()
store
.
commit
(
'getPublicActiveInfo'
);
//
store.commit('getPublicActiveInfo');
store
.
commit
(
'getPublicShareInfo'
);
//
store.commit('getPublicShareInfo');
},
},
activated
(){
activated
(){
// this.hiddenBar();
// this.hiddenBar();
...
...
src/pages/user/User.vue
View file @
b47b7968
...
@@ -95,17 +95,23 @@ export default {
...
@@ -95,17 +95,23 @@ export default {
axios
.
defaults
.
headers
.
common
[
'systemtype'
]
=
type
;
axios
.
defaults
.
headers
.
common
[
'systemtype'
]
=
type
;
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
$
(
'title'
).
text
(
result
.
data
.
data
.
title
);
store
.
commit
(
'getPublicActiveInfo'
);
store
.
commit
(
'getPublicShareInfo'
);
_this
.
getUserInfo
();
_this
.
getUserInfo
();
_this
.
getUserImgList
();
_this
.
getUserImgList
();
_this
.
indexHref
=
window
.
windowIndexHref
;
_this
.
indexHref
=
window
.
windowIndexHref
;
this
.
getWeixinPowerShare
();
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
console
.
log
(
err
);
console
.
log
(
err
);
});
});
},
},
mounted
()
{
mounted
()
{
this
.
getWeixinPowerShare
();
//
this.getWeixinPowerShare();
$eventbus
.
$on
(
'dianzanle'
,
data
=>
{
$eventbus
.
$on
(
'dianzanle'
,
data
=>
{
this
.
tongbudianzan
(
this
.
userList
,
data
);
this
.
tongbudianzan
(
this
.
userList
,
data
);
...
...
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