zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qiuqiu' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into qiuqiu

master
pikachu 2021-06-26 11:23:45 +08:00
parent c6e8545a03 f0914960a4
commit d7434f3e4a
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
buyer/src/components/header/Header.vue
View File

@ -34,27 +34,18 @@
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
</li> </li>
<<<<<<< HEAD
<li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
<li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
=======
<li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li> <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
<li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li> <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
<li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li> <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
>>>>>>> dev-ryan
<li v-if="$route.name !== 'Cart'" style="position:relative;"> <li v-if="$route.name !== 'Cart'" style="position:relative;">
<i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i> <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
<Dropdown placement="bottom-start"> <Dropdown placement="bottom-start">
<router-link to="/cart" target="_blank"> <router-link to="/cart" target="_blank">
<span @mouseenter="getCartList"> <span @mouseenter="getCartList">
<<<<<<< HEAD
<Icon size="18" class="cart-icon" type="ios-cart-outline"></Icon>
=======
<Icon <Icon
size="18" size="18"
type="ios-cart-outline" type="ios-cart-outline"
></Icon> ></Icon>
>>>>>>> dev-ryan
购物车 购物车
</span> </span>
@ -128,50 +119,21 @@ export default {
}, },
}, },
methods: { methods: {
<<<<<<< HEAD
handleClickTheme() {
this.themeType === "light"
? (this.themeType = "dark")
: (this.themeType = "light");
window.document.documentElement.setAttribute(
"data-theme",
this.themeType
);
},
changeCity(city) {
this.city = city;
},
goToPay() {
=======
changeCity (city) { // 选择所在城市 changeCity (city) { // 选择所在城市
this.city = city; this.city = city;
}, },
goToPay () { // 跳转购物车 goToPay () { // 跳转购物车
>>>>>>> dev-ryan
let url = this.$router.resolve({ let url = this.$router.resolve({
path: "/cart", path: "/cart",
}); });
window.open(url.href, "_blank"); window.open(url.href, "_blank");
}, },
<<<<<<< HEAD
myInfo() {
=======
myInfo () { // 跳转会员中心 myInfo () { // 跳转会员中心
>>>>>>> dev-ryan
let url = this.$router.resolve({ let url = this.$router.resolve({
path: "/home", path: "/home",
}); });
window.open(url.href, "_blank"); window.open(url.href, "_blank");
}, },
<<<<<<< HEAD
signOutFun() {
storage.removeItem("accessToken");
storage.removeItem("refreshToken");
storage.removeItem("userInfo");
storage.removeItem("cartNum");
this.$store.commit("SET_CARTNUM", 0);
this.$router.push("/login");
=======
signOutFun () { // 退出登录 signOutFun () { // 退出登录
storage.removeItem('accessToken'); storage.removeItem('accessToken');
storage.removeItem('refreshToken'); storage.removeItem('refreshToken');
@ -179,7 +141,6 @@ export default {
storage.removeItem('cartNum'); storage.removeItem('cartNum');
this.$store.commit('SET_CARTNUM', 0) this.$store.commit('SET_CARTNUM', 0)
this.$router.push('/login'); this.$router.push('/login');
>>>>>>> dev-ryan
}, },
goUserCenter(path) { goUserCenter(path) {
// 跳转我的订单，我的足迹 // 跳转我的订单，我的足迹
@ -410,13 +371,6 @@ export default {
.sign-out p { .sign-out p {
font-size: 12px; font-size: 12px;
} }
<<<<<<< HEAD
.cart-icon {
padding: 0 6px;
}
=======
>>>>>>> dev-ryan
.goods-title:hover { .goods-title:hover {
color: $theme_color; color: $theme_color;
} }