diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 0561aad2..61581dfc 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -81,10 +81,7 @@ -
  • - 店铺入驻 -
    • - + @@ -162,18 +159,6 @@ export default { }); } }, - shopEntry() { - // 店铺入驻 - if (storage.getItem('accessToken')) { - let routeUrl = this.$router.resolve({ - path: '/shopEntry', - query: {id: 1} - }); - window.open(routeUrl.href, '_blank'); - } else { - this.$router.push('login'); - } - }, getCartList() { // 获取购物车列表 if (this.userInfo.username) { diff --git a/buyer/src/components/indexDecorate/modelList/Carousel.vue b/buyer/src/components/indexDecorate/modelList/Carousel.vue index bad6be08..ef63f4e3 100644 --- a/buyer/src/components/indexDecorate/modelList/Carousel.vue +++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue @@ -95,11 +95,7 @@ export default { label: "宝贝收藏", path: "/home/Favorites" }, - { - icon: "shop", - label: "收藏店铺", - path: "/home/Favorites?type=STORE" - }, + { icon: "carts", label: "购物车", diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index f79282c2..6f5d75e6 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -57,15 +57,6 @@ :key="index" >
    -
    - - {{ - shop.storeName - }} -
    * { - width: 50%; - } - .go-shop-page:hover { - color: $theme_color; - cursor: pointer; - } - .customer-service { - margin-left: 5px; - color: #fcc217; - cursor: pointer; - &:hover { - color: $theme_color; - } - } - /** 优惠券 */ - .shop-coupon { - width: 80px; - height: 24px; - position: relative; - background: url(../assets/images/cart-coupon-icons02.png) 0 0 no-repeat; - > div { - position: absolute; - top: 35px; - left: 0; - width: 300px; - height: 300px; - background-color: #fff; - border: 1px solid $theme_color; - // border-radius: 3px; - z-index: 1; - padding: 10px 20px; - &::before { - content: ""; - display: block; - background: url(../assets/images/cart-coupon-icons02.png) 0 -58px no-repeat; - width: 80px; - height: 12px; - position: absolute; - top: -12px; - left: 0; - } - .coupon-item { - margin-bottom: 10px; - span:nth-child(1) { - border: 1px solid #e33937; - display: inline-block; - padding: 3px 10px; - color: $theme_color; - border-radius: 3px; - } - span:nth-child(2) { - font-size: 12px; - margin-left: 5px; - color: #999; - } - .coupon-btn { - height: 26px; - float: right; - font-size: 12px; - } - &::after { - display: block; - content: ""; - clear: right; - } - } - } - } - .promotion-notice { - text-align: right; - font-size: 12px; - } - .shop-coupon-show { - background-position-y: -34px; - } - } .goods-item { position: relative; @extend .cart-goods-title; diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 17d70b3e..41e5ed0b 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -12,13 +12,6 @@
    - {{ - goodsMsg.data.storeName - }} - - - - {{ storeCollected? "已收藏店铺": "收藏店铺" }} 联系客服
    diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index c49b6a5e..0e80b2fe 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -74,12 +74,6 @@ 已有{{ item.commentNum || 0 }}人评价
    -
    - {{ - item.storeName - }} -
    -
    - 商家申诉信息 + 平台仲裁 diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue index ccddf03a..4630a20c 100644 --- a/buyer/src/pages/home/memberCenter/Favorites.vue +++ b/buyer/src/pages/home/memberCenter/Favorites.vue @@ -16,7 +16,6 @@ {{ item.goodsName }}
    - {{ item.storeName }} 商家自营
    diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue index 04f085a6..973cd36f 100644 --- a/buyer/src/pages/home/orderCenter/AfterSale.vue +++ b/buyer/src/pages/home/orderCenter/AfterSale.vue @@ -42,9 +42,7 @@
    -
    - {{ order.storeName }} -
    +
    @@ -184,14 +182,7 @@ export default { }); window.open(routeUrl.href, '_blank'); }, - // 跳转店铺首页 - shopPage(id) { - let routeUrl = this.$router.resolve({ - path: '/Merchant', - query: {id: id} - }); - window.open(routeUrl.href, '_blank'); - }, + getList() { // 获取售后列表 this.spinShow = true; let params = JSON.parse(JSON.stringify(this.params)) diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue index ffd9359a..245e5412 100644 --- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue +++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue @@ -13,15 +13,7 @@

    {{ afterSale.orderStatusValue }}

    售后单号：{{ afterSale.sn }}    订单号：{{afterSale.orderSn}}

    创建时间：{{afterSale.createTime}}
    -
    -
    - 本次售后服务由{{afterSale.storeName}}为您提供 -
    -
    - - {{afterSale.goodsName}} -
    -
    +

    售后进程

    diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 633432e4..9636468f 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -59,9 +59,7 @@
    -
    - {{ order.storeName }} -
    +
    @@ -195,14 +193,7 @@ export default { } this.getList() }, - // 跳转店铺首页 - shopPage (id) { - let routeUrl = this.$router.resolve({ - path: '/Merchant', - query: { id: id } - }); - window.open(routeUrl.href, '_blank'); - }, + orderDetail (sn) { // 跳转订单详情 this.$router.push({ name: 'OrderDetail', query: {sn} }); diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 4d910b84..5106a05e 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -106,9 +106,7 @@
    -
    - {{order.order.storeName}} -
    +
    @@ -488,24 +486,6 @@ export default { top: 20px; } } -/** 店铺名称 */ -.shop-name { - margin: 15px 0; - span { - color: #438cde; - cursor: pointer; - &:hover { - color: $theme_color; - } - } - .ivu-icon { - color: #ff8f23; - cursor: pointer; - &:hover { - color: $theme_color; - } - } -} /** 商品列表 */ table { border: 1px solid #ddd; diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index a9c3463b..985cbf8a 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -115,13 +115,7 @@
    -
    - - {{ - shop.storeName - }}   - -
    +
    - {{ item.storeName }} -
    +
    diff --git a/buyer/src/pages/promotion/seckill.vue b/buyer/src/pages/promotion/seckill.vue index a80b84d4..56cbe1ce 100644 --- a/buyer/src/pages/promotion/seckill.vue +++ b/buyer/src/pages/promotion/seckill.vue @@ -66,9 +66,7 @@ : 100 " />
    -
    - {{ item.storeName }} -
    +