diff --git a/src/assets/images/Index/card_buttons.png b/src/assets/images/Index/card_buttons.png new file mode 100644 index 0000000..41491a5 Binary files /dev/null and b/src/assets/images/Index/card_buttons.png differ diff --git a/src/assets/images/Index/card_status.png b/src/assets/images/Index/card_status.png new file mode 100644 index 0000000..8e125b3 Binary files /dev/null and b/src/assets/images/Index/card_status.png differ diff --git a/src/assets/images/Index/double_button.png b/src/assets/images/Index/double_button.png new file mode 100644 index 0000000..32feb5f Binary files /dev/null and b/src/assets/images/Index/double_button.png differ diff --git a/src/components/index.js b/src/components/index.js index 104b317..e1cc1b3 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -13,6 +13,8 @@ import vTabGroup from "@/components/v-tab-group"; import vTabMode from "@/components/v-tab-mode"; import vEcharts from "@/components/v-echars"; import vBtn from "@/components/v-btn"; +import vCardButton from "@/components/v-card-button"; +import vDoubleButton from "@/components/v-double-button"; import vLabelCtx from "@/components/v-label-ctx" import vLabelTable from "@/components/v-label-table" import vPagination from "@/components/v-pagination" @@ -31,6 +33,8 @@ export default { vTabMode, vEcharts, vBtn, + vCardButton, + vDoubleButton, vLabelCtx, vLabelTable, vPagination, diff --git a/src/components/v-card-button/index.vue b/src/components/v-card-button/index.vue new file mode 100644 index 0000000..440f8df --- /dev/null +++ b/src/components/v-card-button/index.vue @@ -0,0 +1,69 @@ + + + + + + + + + diff --git a/src/components/v-double-button/index.vue b/src/components/v-double-button/index.vue new file mode 100644 index 0000000..4154407 --- /dev/null +++ b/src/components/v-double-button/index.vue @@ -0,0 +1,79 @@ + + + + + + + + + diff --git a/src/router/index.js b/src/router/index.js index ddab119..6ab3d04 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,6 +42,7 @@ import SaleRank from "@/views/SaleRank" import ThemeAnalize from "@/views/ThemeAnalize" import ThemeData from "@/views/ThemeData" import ThemeBoard from "@/views/ThemeBoard" +import ThemeComparison from "@/views/ThemeComparison" import iSwitchEvent from "@/lycomponents/iSwitchEvent" const router = [ { @@ -326,6 +327,12 @@ const router = [ desc: "数据看板", component: ThemeBoard }, + { + path: '/ThemeComparison', + name: "ThemeComparison", + desc: "主题对比", + component: ThemeComparison + }, ] }, diff --git a/src/styles/antd.less b/src/styles/antd.less index 61a0b62..9c14817 100644 --- a/src/styles/antd.less +++ b/src/styles/antd.less @@ -369,7 +369,7 @@ li.ant-calendar-time-picker-select-option-selected { } .ant-tabs-card > .ant-tabs-content > .ant-tabs-tabpane { - background: rgb(26, 38, 65) !important; + // background: rgb(26, 38, 65) !important; padding-bottom: 22px; } @@ -394,6 +394,14 @@ li.ant-calendar-time-picker-select-option-selected { } } +.ant-tabs-nav-scroll { + background: rgb(16, 35, 63) !important; + height: 56px; +} +.ant-tabs-extra-content { + background: rgb(16, 35, 63) !important; +} + .ant-descriptions-row { border-color: #63AECC !important; } diff --git a/src/views/BrandComparison/index.vue b/src/views/BrandComparison/index.vue index c3b3bad..bbbb2d5 100644 --- a/src/views/BrandComparison/index.vue +++ b/src/views/BrandComparison/index.vue @@ -28,7 +28,6 @@ export default { }; }, created() { - console.log(this.getBcStatus) this.hasData = this.getBcStatus; }, mounted() {}, diff --git a/src/views/EventInsight/industryTOPHE/index.vue b/src/views/EventInsight/industryTOPHE/index.vue index b49745a..8f06485 100644 --- a/src/views/EventInsight/industryTOPHE/index.vue +++ b/src/views/EventInsight/industryTOPHE/index.vue @@ -11,8 +11,9 @@