Commit e1b9ea5b authored by 华国豪's avatar 华国豪 🙄

修改登录页面,修改其他样式问题,开放积分商城入口

parent 67160e2b
...@@ -82,11 +82,12 @@ ul,li{list-style: none;} ...@@ -82,11 +82,12 @@ ul,li{list-style: none;}
.new_header_nav_two .logo{ .new_header_nav_two .logo{
height: 50px; height: 50px;
display: inline-block; display: inline-block;
cursor: pointer;
} }
.new_header_nav_two ._search_box{ .new_header_nav_two ._search_box{
border: solid 3px #EE4454; border: solid 3px #EE4454;
border-radius: 6px; border-radius: 6px;
height: 34px; height: 40px;
position: relative; position: relative;
} }
.new_header_nav_two ._search_box input{ .new_header_nav_two ._search_box input{
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(229,229,229,1); border:1px solid rgba(229,229,229,1);
border-radius:4px; border-radius:4px;
height:148px; /* height:148px; */
padding: 10px; padding: 10px;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
......
<style> <style>
@import "../../assets/mall/newHead.css"; @import "../../assets/mall/newHead.css";
div {
box-sizing: border-box;
}
.new_header .el-menu--horizontal > .el-submenu.is-active .el-submenu__title { .new_header .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
color: #fff !important; color: #fff !important;
border-bottom: 2px solid #df3343 !important; border-bottom: 2px solid #df3343 !important;
...@@ -114,7 +117,7 @@ ...@@ -114,7 +117,7 @@
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '9-1')">定制游</el-dropdown-item> <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', '8-1')">订单中心</el-dropdown-item>
<el-dropdown-item @click.native="goUrl('newPersonalCenter', '3-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="goUrl('newPersonalCenter', '5')">我的优惠券</el-dropdown-item>
<!-- <el-dropdown-item @click.native="">我的奖品</el-dropdown-item> <!-- <el-dropdown-item @click.native="">我的奖品</el-dropdown-item>
<el-dropdown-item @click.native="">活动中心</el-dropdown-item>--> <el-dropdown-item @click.native="">活动中心</el-dropdown-item>-->
...@@ -156,7 +159,7 @@ ...@@ -156,7 +159,7 @@
<el-row class="_flex_center"> <el-row class="_flex_center">
<!-- 左 logo --> <!-- 左 logo -->
<el-col :span="5"> <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>
<!-- 中 搜索框 --> <!-- 中 搜索框 -->
<el-col :span="2"> <el-col :span="2">
...@@ -312,12 +315,12 @@ ...@@ -312,12 +315,12 @@
</div> </div>
</li>--> </li>-->
<!-- 积分商城 --> <!-- 积分商城 -->
<!-- <li :class="{_active: navActive === 8}"> <li :class="{_active: navActive === 8}">
<div @click="handleSelect('/IntegralMall', 8), navActive = 8"> <div @click="handleSelect('/IntegralMall', 8), navActive = 8">
<span>积分商城</span> <span>积分商城</span>
<span class="__splice">|</span> <span class="__splice">|</span>
</div> </div>
</li>--> </li>
<!-- 活动中心 --> <!-- 活动中心 -->
<!-- <li :class="{_active: navActive === 9}" style="width: auto;"> <!-- <li :class="{_active: navActive === 9}" style="width: auto;">
<div @click="handleSelect('/IceCreamTask', 9), navActive = 9"> <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
} }
.integralHomeV2 .class .item{ .integralHomeV2 .class .item{
float: left; float: left;
width: 16.505%; width: 16.666%;
height: 200px; height: 200px;
padding: 20px; padding: 20px;
text-align: center; text-align: center;
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
border-left: 1px solid rgba(236, 236, 236, 1); border-left: 1px solid rgba(236, 236, 236, 1);
} }
.integralHomeV2 .class .item img{ .integralHomeV2 .class .item img{
max-height: 135px; max-height: 95px;
max-width:100%; max-width:100%;
} }
.integralHomeV2 .class .item ._name{ .integralHomeV2 .class .item ._name{
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<el-menu-item index="3-3" @click="clickMenu('3-3')">实名认证</el-menu-item> <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-menu-item index="3-4" @click="clickMenu('3-4')">收货地址管理</el-menu-item>
</el-submenu> </el-submenu>
<!-- <el-submenu index="4"> <el-submenu index="4">
<template slot="title"> <template slot="title">
<i class="iconfont icon-gerenxinxiicon"></i> <i class="iconfont icon-gerenxinxiicon"></i>
<span>我的积分</span> <span>我的积分</span>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<el-menu-item index="4-1" @click="goUrl('integral')">积分首页</el-menu-item> <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-2" @click="goUrl('IntegralDetail')">积分明细</el-menu-item>
<el-menu-item index="4-3" @click="clickMenu('4-3')">我的兑换</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')"> <el-menu-item index="5" @click="clickMenu('5')">
<i class="iconfont icon-youhuiquanicon"></i> <i class="iconfont icon-youhuiquanicon"></i>
<span>我的优惠券</span> <span>我的优惠券</span>
......
...@@ -4,6 +4,7 @@ import index from "./views/index"; ...@@ -4,6 +4,7 @@ import index from "./views/index";
import login from "./views/login"; import login from "./views/login";
import newLogin from "./views/newLogin"; import newLogin from "./views/newLogin";
import loginNationalDay from "./views/loginNationalDay"; import loginNationalDay from "./views/loginNationalDay";
import loginRed from "./views/loginRed";
import IceCreamTask from "./components/taskPage/IceCream/IceCreamTask"; import IceCreamTask from "./components/taskPage/IceCream/IceCreamTask";
// import JuanSaid from "./components/taskPage/JuanSaid"; // import JuanSaid from "./components/taskPage/JuanSaid";
import FoodImg from "./components/taskPage/FoodImg"; import FoodImg from "./components/taskPage/FoodImg";
...@@ -24,13 +25,8 @@ export default new Router({ ...@@ -24,13 +25,8 @@ export default new Router({
{ {
path: "/login", path: "/login",
name: "login", name: "login",
component: loginNationalDay component: loginRed
}, },
// {
// path: "/newLogin",
// name: "newLogin",
// component: newLogin
// },
{ {
path: "/", path: "/",
name: "index", name: "index",
......
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