Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
华国豪
Athena
Commits
e1b9ea5b
Commit
e1b9ea5b
authored
Oct 10, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录页面,修改其他样式问题,开放积分商城入口
parent
67160e2b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
16 deletions
+16
-16
newHead.css
src/assets/mall/newHead.css
+2
-1
search.css
src/assets/mall/search.css
+1
-1
newHead.vue
src/components/global/newHead.vue
+7
-4
integralHomeV2.vue
...nents/newPersonalCenter/integral/model/integralHomeV2.vue
+2
-2
newPersonalCenter.vue
src/components/newPersonalCenter/newPersonalCenter.vue
+2
-2
router.js
src/router.js
+2
-6
No files found.
src/assets/mall/newHead.css
View file @
e1b9ea5b
...
...
@@ -82,11 +82,12 @@ ul,li{list-style: none;}
.new_header_nav_two
.logo
{
height
:
50px
;
display
:
inline-block
;
cursor
:
pointer
;
}
.new_header_nav_two
._search_box
{
border
:
solid
3px
#EE4454
;
border-radius
:
6px
;
height
:
34
px
;
height
:
40
px
;
position
:
relative
;
}
.new_header_nav_two
._search_box
input
{
...
...
src/assets/mall/search.css
View file @
e1b9ea5b
...
...
@@ -117,7 +117,7 @@
background
:
rgba
(
255
,
255
,
255
,
1
);
border
:
1px
solid
rgba
(
229
,
229
,
229
,
1
);
border-radius
:
4px
;
height
:
148px
;
/* height:148px; */
padding
:
10px
;
display
:
flex
;
cursor
:
pointer
;
...
...
src/components/global/newHead.vue
View file @
e1b9ea5b
<
style
>
@import
"../../assets/mall/newHead.css"
;
div
{
box-sizing
:
border-box
;
}
.new_header
.el-menu--horizontal
>
.el-submenu.is-active
.el-submenu__title
{
color
:
#fff
!important
;
border-bottom
:
2px
solid
#df3343
!important
;
...
...
@@ -114,7 +117,7 @@
<el-dropdown-item
@
click
.
native=
"goUrl('newPersonalCenter', '9-1')"
>
定制游
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrl('newPersonalCenter', '8-1')"
>
订单中心
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrl('newPersonalCenter', '3-1')"
>
个人信息
</el-dropdown-item>
<
!-- <el-dropdown-item @click.native="goUrl('integral')">我的积分</el-dropdown-item> --
>
<
el-dropdown-item
@
click
.
native=
"goUrl('integral')"
>
我的积分
</el-dropdown-item
>
<el-dropdown-item
@
click
.
native=
"goUrl('newPersonalCenter', '5')"
>
我的优惠券
</el-dropdown-item>
<!-- <el-dropdown-item @click.native="">我的奖品</el-dropdown-item>
<el-dropdown-item @click.native="">活动中心</el-dropdown-item>-->
...
...
@@ -156,7 +159,7 @@
<el-row
class=
"_flex_center"
>
<!-- 左 logo -->
<el-col
:span=
"5"
>
<img
class=
"logo"
src=
"../../assets/img/logo_t.png"
alt
/>
<img
@
click=
"handleSelect('/Home', '0'),navActive = '0'"
class=
"logo"
src=
"../../assets/img/logo_t.png"
alt
/>
</el-col>
<!-- 中 搜索框 -->
<el-col
:span=
"2"
>
...
...
@@ -312,12 +315,12 @@
</div>
</li>-->
<!-- 积分商城 -->
<
!-- <
li :class="{_active: navActive === 8}">
<li
:class=
"{_active: navActive === 8}"
>
<div
@
click=
"handleSelect('/IntegralMall', 8), navActive = 8"
>
<span>
积分商城
</span>
<span
class=
"__splice"
>
|
</span>
</div>
</li>
-->
</li>
<!-- 活动中心 -->
<!-- <li :class="{_active: navActive === 9}" style="width: auto;">
<div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
...
...
src/components/newPersonalCenter/integral/model/integralHomeV2.vue
View file @
e1b9ea5b
...
...
@@ -83,7 +83,7 @@
}
.integralHomeV2
.class
.item
{
float
:
left
;
width
:
16.
505
%
;
width
:
16.
666
%
;
height
:
200px
;
padding
:
20px
;
text-align
:
center
;
...
...
@@ -97,7 +97,7 @@
border-left
:
1px
solid
rgba
(
236
,
236
,
236
,
1
);
}
.integralHomeV2
.class
.item
img
{
max-height
:
13
5px
;
max-height
:
9
5px
;
max-width
:
100%
;
}
.integralHomeV2
.class
.item
._name
{
...
...
src/components/newPersonalCenter/newPersonalCenter.vue
View file @
e1b9ea5b
...
...
@@ -83,7 +83,7 @@
<el-menu-item
index=
"3-3"
@
click=
"clickMenu('3-3')"
>
实名认证
</el-menu-item>
<el-menu-item
index=
"3-4"
@
click=
"clickMenu('3-4')"
>
收货地址管理
</el-menu-item>
</el-submenu>
<
!-- <
el-submenu index="4">
<el-submenu
index=
"4"
>
<
template
slot=
"title"
>
<i
class=
"iconfont icon-gerenxinxiicon"
></i>
<span>
我的积分
</span>
...
...
@@ -91,7 +91,7 @@
<el-menu-item
index=
"4-1"
@
click=
"goUrl('integral')"
>
积分首页
</el-menu-item>
<el-menu-item
index=
"4-2"
@
click=
"goUrl('IntegralDetail')"
>
积分明细
</el-menu-item>
<el-menu-item
index=
"4-3"
@
click=
"clickMenu('4-3')"
>
我的兑换
</el-menu-item>
</el-submenu>
-->
</el-submenu>
<el-menu-item
index=
"5"
@
click=
"clickMenu('5')"
>
<i
class=
"iconfont icon-youhuiquanicon"
></i>
<span>
我的优惠券
</span>
...
...
src/router.js
View file @
e1b9ea5b
...
...
@@ -4,6 +4,7 @@ import index from "./views/index";
import
login
from
"./views/login"
;
import
newLogin
from
"./views/newLogin"
;
import
loginNationalDay
from
"./views/loginNationalDay"
;
import
loginRed
from
"./views/loginRed"
;
import
IceCreamTask
from
"./components/taskPage/IceCream/IceCreamTask"
;
// import JuanSaid from "./components/taskPage/JuanSaid";
import
FoodImg
from
"./components/taskPage/FoodImg"
;
...
...
@@ -24,13 +25,8 @@ export default new Router({
{
path
:
"/login"
,
name
:
"login"
,
component
:
login
NationalDay
component
:
login
Red
},
// {
// path: "/newLogin",
// name: "newLogin",
// component: newLogin
// },
{
path
:
"/"
,
name
:
"index"
,
...
...
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