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
b0c19e39
authored
May 10, 2019
by
mamingqun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
af04d525
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
58 additions
and
36 deletions
+58
-36
src/components/Description.vue
+35
-11
src/modules/js/api.js
+20
-20
src/pages/index/Shouye.vue
+1
-1
src/pages/index/assets/images/shuoming/bottomBar.png
+0
-0
src/pages/index/assets/images/shuoming/middleBar.png
+0
-0
src/pages/index/assets/images/shuoming/topBar.png
+0
-0
src/pages/user/User.vue
+2
-4
No files found.
src/components/Description.vue
View file @
b0c19e39
...
...
@@ -5,7 +5,10 @@
<div
class=
"contentWrap"
>
<div
class=
"contentBox"
v-if=
"ruleInfo"
>
<div
class=
"shuomingTitle"
></div>
<div
class=
"text1"
v-html=
"ruleInfo.zhuti"
>
<div
class=
"text1"
>
<div
class=
"top"
></div>
<div
class=
"middle"
v-html=
"ruleInfo.zhuti"
></div>
<div
class=
"bottom"
></div>
<!--
<p>
以“春节回家”为主题方向,有奖征集与万达人和万达粉丝们春节回家过年相关的摄影作品。
</p>
<p>
反映春运返乡道路上的艰难与劳顿,回家后的放松与惬意,亲人团聚时刻的幸福和笑脸,传递亲人、爱人、朋友、同窗、战友等不同情感的动人瞬间和情感故事。
</p>
<p>
投稿作品要求立意鲜明、形象生动、情感真切,有较强的视觉表现力。
</p>
-->
...
...
@@ -100,7 +103,7 @@
<p>
6、投稿者应保证其为所投送作品的作者,并对该作品的整体及局部均拥有独立、完整、明确、无争议的著作权;投稿者还应保证其所投送的作品不侵犯第三人的包括著作权、肖像权、名誉权、隐私权等在内的合法权益。投稿者应承担由其稿件及投稿行为所引发的一切后果与责任。
</p>
<p>
7、本次摄影征集活动不收投稿费,不退稿。
</p>
<p>
8、对于所有入选作品,主办、承办方有权在著作权存续期内,以复制、发行、展览、放映、信息网络传播等方式用于非商业性的宣传,并不再支付稿酬。
</p>
<p>
9、本征稿启事解释权属于主办单位。凡投稿者,即视为其已同意本征稿启事之所有规定。
</p>
-->
<p>
9、本征稿启事解释权属于主办单位。凡投稿者,即视为其已同意本征稿启事之所有规定。
</p>
-->
</div>
</div>
</div>
...
...
@@ -168,8 +171,7 @@ export default {
.topBox5686
{
height
:
310px
;
background
:
url("~@/pages/index/assets/images/indexBanner.jpg")
no-repeat
;
background
:
url("~@/pages/index/assets/images/indexBanner.jpg")
no-repeat
;
background-size
:
100%
auto
;
position
:
relative
;
}
...
...
@@ -196,15 +198,38 @@ export default {
}
.text1
{
height
:
555px
;
background
:
url("~@/pages/index/assets/images/shuoming/text1.png")
no-repeat
center
;
//
height
:
555px
;
//
background
:
url("~@/pages/index/assets/images/shuoming/text1.png")
no-repeat
center
;
background-size
:
100%
auto
;
//
padding-left
:
40px
;
//
padding-right
:
40px
;
padding-top
:
55px
;
margin-bottom
:
47px
;
.top
{
background
:
url("~@/pages/index/assets/images/shuoming/topBar.png")
no-repeat
center
bottom
;
background-size
:
contain
;
height
:
60px
;
}
.middle
{
background
:
url("~@/pages/index/assets/images/shuoming/middleBar.png")
repeat-y
center
;
background-size
:
contain
;
padding-left
:
40px
;
padding-right
:
40px
;
padding-top
:
55px
;
margin-bottom
:
47px
;
padding-top
:
30px
;
}
.bottom
{
background
:
url("~@/pages/index/assets/images/shuoming/bottomBar.png")
no-repeat
center
top
;
height
:
60px
;
background-size
:
contain
;
position
:
relative
;
top
:
-10px
;
}
p
{
line-height
:
48px
;
...
...
@@ -282,8 +307,7 @@ export default {
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
width
:
210px
;
width
:
240px
;
//
background
:
red
;
}
...
...
src/modules/js/api.js
View file @
b0c19e39
import
store
from
'../store'
;
// api地址
var
server
=
'http://web-comment.canskj.cn/new'
;
var
extra
=
'8'
;
//
//
api地址
//
var server = 'http://web-comment.canskj.cn/new';
//
var extra = '8';
//包装的地址
var
wrapHref
=
'http://web-comment.canskj.cn/home/contest/h5/8'
;
//
//
包装的地址
//
var wrapHref = 'http://web-comment.canskj.cn/home/contest/h5/8';
//首页地址
var
indexHref
=
'http://web-comment.iyunfish.cn/home/contest/h5/8'
;
// 个人中心地址
var
userCenterHref
=
'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8'
;
//
//
首页地址
//
var indexHref = 'http://web-comment.iyunfish.cn/home/contest/h5/8';
//
//
个人中心地址
//
var userCenterHref = 'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8';
var
shareImg
=
'http://web-comment.iyunfish.cn/home/contest/h5/static/share1.jpg'
;
//
var shareImg = 'http://web-comment.iyunfish.cn/home/contest/h5/static/share1.jpg';
//
//
api地址
//
var server = 'http://wanda-qj.iyunfish.com/new';
//
var extra = '8';
// api地址
var
server
=
'http://wanda-qj.iyunfish.com/new'
;
var
extra
=
'8'
;
//
//
包装的地址
//
var wrapHref = 'http://wanda-qj.maxrocky.com/home/contest/h5/8';
//包装的地址
var
wrapHref
=
'http://wanda-qj.maxrocky.com/home/contest/h5/8'
;
//
//
首页地址
//
var indexHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/8';
//
//
个人中心地址
//
var userCenterHref = 'http://wanda-qj.iyunfish.com/home/contest/h5/newuser/8';
//首页地址
var
indexHref
=
'http://wanda-qj.iyunfish.com/home/contest/h5/8'
;
// 个人中心地址
var
userCenterHref
=
'http://wanda-qj.iyunfish.com/home/contest/h5/newuser/8'
;
//
var shareImg = 'http://wanda-qj.iyunfish.com/home/contest/h5/static/share1.jpg';
var
shareImg
=
'http://wanda-qj.iyunfish.com/home/contest/h5/static/share1.jpg'
;
export
default
{
...
...
src/pages/index/Shouye.vue
View file @
b0c19e39
...
...
@@ -204,7 +204,7 @@ export default {
var
_this
=
this
;
//http://web-comment.canskj.cn/wandah5/activity/info
//http://wanda-qj.iyunfish.com/wandah5/activity/info
axios
.
get
(
'http://w
eb-comment.canskj.cn
/wandah5/activity/info'
).
then
((
result
)
=>
{
axios
.
get
(
'http://w
anda-qj.iyunfish.com
/wandah5/activity/info'
).
then
((
result
)
=>
{
console
.
log
(
'活动的data'
)
...
...
src/pages/index/assets/images/shuoming/bottomBar.png
0 → 100644
View file @
b0c19e39
2.89 KB
src/pages/index/assets/images/shuoming/middleBar.png
0 → 100644
View file @
b0c19e39
2.13 KB
src/pages/index/assets/images/shuoming/topBar.png
0 → 100644
View file @
b0c19e39
15.6 KB
src/pages/user/User.vue
View file @
b0c19e39
...
...
@@ -402,8 +402,7 @@ export default {
.imageBox
{
height
:
34px
;
width
:
34px
;
background
:
url("~@/pages/user/assets/images/address.png")
no-repeat
;
background
:
url("~@/pages/user/assets/images/address.png")
no-repeat
;
background-size
:
100%
auto
;
}
...
...
@@ -423,8 +422,7 @@ export default {
.imageBox
{
height
:
34px
;
width
:
34px
;
background
:
url("~@/pages/user/assets/images/xinwhite.png")
no-repeat
;
background
:
url("~@/pages/user/assets/images/xinwhite.png")
no-repeat
;
background-size
:
100%
auto
;
}
...
...
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