From 166e889b6fbaac7981f270ad89801a21a182bec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com> Date: Tue, 15 Feb 2022 10:12:49 +0800 Subject: [PATCH] commit --- buyer/src/assets/styles/global.scss | 2 +- buyer/src/components/Search.vue | 2 + buyer/src/components/footer/Footer.vue | 24 ++++- buyer/src/components/header/hoverSearch.vue | 46 +++++++-- .../indexDecorate/ModelFormItem.vue | 85 +++++++++------- .../indexDecorate/modelList/Carousel.vue | 95 +++++++++++------- .../indexDecorate/modelList/NotEnough.vue | 85 +++++++++++----- buyer/src/components/nav/CateNav.vue | 16 ++-- buyer/src/components/nav/GoodsClassNav.vue | 38 ++++---- buyer/src/pages/GoodsList.vue | 6 +- buyer/src/pages/user/Home.vue | 56 +++++------ buyer/src/plugins/request.js | 7 +- .../views/distribution/distributionCash.vue | 4 +- .../src/views/lili-dialog/goods-dialog.vue | 6 +- .../views/lili-dialog/template/marketing.vue | 3 +- .../wap/template/tpl_goods.vue | 31 +++++- .../lili-floor-renovation/wap/wapList.vue | 12 ++- seller/src/views/shop/ship/shipTemplate.vue | 96 +++++++++++-------- 18 files changed, 391 insertions(+), 223 deletions(-) diff --git a/buyer/src/assets/styles/global.scss b/buyer/src/assets/styles/global.scss index 18a358d8..8a74a333 100644 --- a/buyer/src/assets/styles/global.scss +++ b/buyer/src/assets/styles/global.scss @@ -10,7 +10,7 @@ $warning_color: #ff9900; $error_color: #ed3f14; $handle-btn-color: #438cde; -$theme_color: #ff5c58; +$theme_color: #e4393c; $border_color: #dddee1; $title_color: #8c8c8c; diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue index a14ae482..0d19bed0 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -147,9 +147,11 @@ export default { cursor: pointer; } .store-search{ + width:63px; padding: 0 9px; border-radius: 0; &:nth-child(2){ + width:62px; margin-left: -5px; } } diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue index 754c383f..5ff1aa92 100644 --- a/buyer/src/components/footer/Footer.vue +++ b/buyer/src/components/footer/Footer.vue @@ -43,7 +43,7 @@ {{config.icpCard}} -
  • +
  • {{config.icpMessage}} @@ -51,7 +51,7 @@ -
    +
    {{config.company.name}} @@ -173,12 +173,19 @@ export default { cursor: pointer; line-height: 26px; } +.servece-type-info li:hover{ + color:#b8b8be; +} .servece-type-info li:first-child { font-size: 16px; line-height: 28px; font-weight: bold; } - +.servece-type-info li:first-child:hover{ + // font-size:15px; + // font-weight: bold; + color:#b8b8be; +} .friend-link { display: flex; align-items: flex-start; @@ -207,6 +214,17 @@ export default { padding: 5px 0px; float: left; } + +.friend-link-item li:hover{ + color:#b8b8be; + margin-top:-2px; +} +.footer-bottmom:hover{ + margin-top:0 !important; +} +.footer-bottmom>a:hover{ + color:#e4393c; +} .link-item { padding: 0px 8px; cursor: pointer; diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue index a18ba978..09861ddf 100644 --- a/buyer/src/components/header/hoverSearch.vue +++ b/buyer/src/components/header/hoverSearch.vue @@ -1,10 +1,14 @@ @@ -48,25 +52,46 @@ export default { diff --git a/buyer/src/components/nav/CateNav.vue b/buyer/src/components/nav/CateNav.vue index f62223d6..b1ef8554 100644 --- a/buyer/src/components/nav/CateNav.vue +++ b/buyer/src/components/nav/CateNav.vue @@ -12,7 +12,7 @@ {{ item.name }}
    • -
    +
    @@ -157,7 +157,7 @@ export default { diff --git a/buyer/src/components/nav/GoodsClassNav.vue b/buyer/src/components/nav/GoodsClassNav.vue index 7faa76a7..2b852d44 100644 --- a/buyer/src/components/nav/GoodsClassNav.vue +++ b/buyer/src/components/nav/GoodsClassNav.vue @@ -414,7 +414,7 @@ export default { font-size: 18px; font-weight: bold; &:hover { - color: #e4393c; + color: $theme_color; cursor: pointer; } } @@ -428,8 +428,8 @@ export default { text-align: center; margin: 0 3px; &:hover { - color: #e4393c; - border-color: #e4393c; + color: $theme_color; + border-color: $theme_color; border-bottom-color: #fff; cursor: pointer; ul { @@ -447,7 +447,7 @@ export default { width: 300px; padding: 5px 10px; background: #fff; - border: 1px solid #e4393c; + border: 1px solid $theme_color; z-index: 1; &::before { content: ""; @@ -470,7 +470,7 @@ export default { margin: 3px 0; text-align: left; &:hover { - color: #e4393c; + color: $theme_color; cursor: pointer; } } @@ -489,23 +489,23 @@ export default { background-color: #f3f3f3; border: 1px solid #ddd; &:hover { - border-color: #e4393c; + border-color: $theme_color; background-color: #fff; .ivu-icon { color: #fff; - background-color: #e4393c; + background-color: $theme_color; } } span:nth-child(2) { - color: #e4393c; + color: $theme_color; } .ivu-icon { position: absolute; right: 0; top: 0; - color: #e4393c; + color: $theme_color; line-height: 22px; width: 21px; height: 22px; @@ -557,8 +557,8 @@ export default { } &:hover { - border-color: #e4393c; - border: 2px solid #e4393c; + border-color: $theme_color; + border: 2px solid $theme_color; top: 0; left: 0; position: relative; @@ -572,7 +572,7 @@ export default { display: inline-block; width: 100%; height: 100%; - color: #e4393c; + color: $theme_color; text-align: center; font-size: 12px; cursor: pointer; @@ -585,7 +585,7 @@ export default { div { width: 0; border-top: 20px solid transparent; - border-right: 20px solid #e4393c; + border-right: 20px solid $theme_color; } .ivu-icon { font-size: 12px; @@ -598,7 +598,7 @@ export default { } } .border-color { - border-color: #e4393c; + border-color: $theme_color; z-index: 1; } } @@ -620,8 +620,8 @@ export default { font-size: 12px; &:hover { cursor: pointer; - color: #e4393c; - border-color: #e4393c; + color: $theme_color; + border-color: $theme_color; } } } @@ -674,7 +674,7 @@ export default { padding: 2px; cursor: pointer; &:hover { - color: #e4393c; + color: $theme_color; } } } @@ -696,8 +696,8 @@ export default { font-size: 12px; &:hover { cursor: pointer; - color: #e4393c; - border-color: #e4393c; + color: $theme_color; + border-color: $theme_color; } } } diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 25dd3c0d..8c04149a 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -271,7 +271,7 @@ export default { .item-as-title { width: 100%; height: 36px; - color: #e4393c; + color: $theme_color; line-height: 36px; font-size: 18px; } @@ -372,7 +372,7 @@ export default { background-color: #fff; } .goods-list-tool span:hover { - border-color: #e4393c; + border-color: $theme_color; position: relative; text-decoration: none; z-index: 1; @@ -384,7 +384,7 @@ export default { .goods-list-tool-active { color: #fff; border-left: 1px solid #ccc; - background-color: #e4393c !important; + background-color: $theme_color !important; } /* ---------------商品栏结束------------------- */ diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue index cafae433..28d53b3f 100644 --- a/buyer/src/pages/user/Home.vue +++ b/buyer/src/pages/user/Home.vue @@ -15,10 +15,15 @@ >
    - +
    -

    {{userInfo.nickName}}

    +

    {{ userInfo.nickName }}

    @@ -38,7 +43,6 @@ >{{ chlidren.title }} - @@ -54,47 +58,33 @@ diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index e815e862..5f39f210 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -5,7 +5,7 @@ import Storage from './storage'; import router from '../router/index.js'; import store from '../vuex/store'; import { handleRefreshToken } from '@/api/index'; -import {v4 as uuidv4} from 'uuid'; +import { v4 as uuidv4} from 'uuid'; const qs = require('qs'); // api地址 @@ -88,7 +88,7 @@ service.interceptors.request.use( } ); -async function refresh (error) { +async function refresh(error) { const getTokenRes = await refreshToken(); if (getTokenRes === 'success') { // 刷新token @@ -121,7 +121,8 @@ async function refresh (error) { }); }, onCancel: () => { - router.go(0) + // router.go(0) + router.push("/"); Modal.remove(); } }); diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue index c1316360..89645b85 100644 --- a/manager/src/views/distribution/distributionCash.vue +++ b/manager/src/views/distribution/distributionCash.vue @@ -4,12 +4,12 @@
    - +
    @@ -187,6 +187,7 @@ export default { on: { click: () => { this.selectedPromotion(params); + console.log(this.index) }, }, }, diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue index 21ff4b23..1bb3566f 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue @@ -1,15 +1,36 @@