From ca66bf918c299360585048fc8fdb3a671c210016 Mon Sep 17 00:00:00 2001 From: "271556543@qq.com" <271556543@qq.com> Date: Tue, 12 Jul 2022 17:26:30 +0800 Subject: [PATCH] pages --- src/components/MyTable/index.vue | 84 +++++++ src/layout/components/Sidebar/Item.vue | 12 +- src/main.js | 11 +- src/styles/index.scss | 219 +++++++++--------- src/views/activity/activityList.vue | 91 ++++++++ src/views/business/component/addMerchant.vue | 94 ++++++++ src/views/business/merchantManage.vue | 96 ++++++++ src/views/business/storeManage.vue | 80 +++++++ src/views/finance/flow.vue | 92 ++++++++ src/views/order/orderList.vue | 179 ++++++++++++++ src/views/productService/classifyManage.vue | 49 ++++ .../components/productCombine.vue | 87 +++++++ src/views/productService/policyManage.vue | 68 ++++++ .../productService/productServiceManage.vue | 124 ++++++++++ src/views/productService/welfare.vue | 97 ++++++++ 15 files changed, 1270 insertions(+), 113 deletions(-) create mode 100644 src/components/MyTable/index.vue create mode 100644 src/views/activity/activityList.vue create mode 100644 src/views/business/component/addMerchant.vue create mode 100644 src/views/business/merchantManage.vue create mode 100644 src/views/business/storeManage.vue create mode 100644 src/views/finance/flow.vue create mode 100644 src/views/order/orderList.vue create mode 100644 src/views/productService/classifyManage.vue create mode 100644 src/views/productService/components/productCombine.vue create mode 100644 src/views/productService/policyManage.vue create mode 100644 src/views/productService/productServiceManage.vue create mode 100644 src/views/productService/welfare.vue diff --git a/src/components/MyTable/index.vue b/src/components/MyTable/index.vue new file mode 100644 index 0000000..e803a23 --- /dev/null +++ b/src/components/MyTable/index.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 77c1742..3500fd8 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -20,13 +20,13 @@ export default { if (icon.includes('el-icon')) { vnodes.push() } - else if(icon.includes("Icon")){ - let _icon=icon.split("/")[1]; - vnodes.push() + else if(icon.includes("viewicon")){ + let _icon=icon.split("/")[1]; + vnodes.push() } - else if(icon.includes("MeIcon")){ - let _icon=icon.split("/")[1]; - vnodes.push() + else if(icon.includes("iconfont")){ + let _icon=icon.split("/")[1]; + vnodes.push() } else { vnodes.push() diff --git a/src/main.js b/src/main.js index 92ce1ab..e00a3c3 100644 --- a/src/main.js +++ b/src/main.js @@ -7,7 +7,7 @@ import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/en' // lang i18n import '@/styles/index.scss' // global css - + import '@/styles/iconfont.css' import App from './App' import store from './store' @@ -35,8 +35,8 @@ if (process.env.NODE_ENV === 'production') { const { mockXHR } = require('../mock') mockXHR() } -import VueParticles from 'vue-particles' -Vue.use(VueParticles) +import VueParticles from 'vue-particles' +Vue.use(VueParticles) // set ElementUI lang to EN //Vue.use(ElementUI, { locale }) // 如果想要中文版 element-ui,按如下方式声明 @@ -44,6 +44,11 @@ Vue.use(VueParticles) Vue.config.productionTip = false +import LxHeader from "@/components/LxHeader/index" +Vue.component('lx-header',LxHeader) +import MyTable from "@/components/MyTable/index" +Vue.component('my-table',MyTable) + new Vue({ el: '#app', router, diff --git a/src/styles/index.scss b/src/styles/index.scss index 6e3237a..cbd9bf1 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -22,7 +22,7 @@ html { } #app { - height: 100%; + min-height: 100%; background-color: #eff2f9; } @@ -66,109 +66,109 @@ div:focus { background-color: #eff2f9; } - - /*表头错行 .el-table th.gutter{ - display: table-cell!important; -} */ -.pagination { - text-align: right; - /* margin-top: 8px; */ - padding: 2px 28px; - border: 1px solid #eee; - border-top: 0px; -} - -.v-table .el-table__header th { - padding: 0px !important; - background-color: #f8f8f9 !important; - font-size: 13px; - height: 42px; - color: #616161; -} - -.v-table .el-table__header th.is-sortable { - padding: 3px !important; -} - -.table-tree.text-inline .el-table__body .cell { - word-break: inherit !important; - white-space: nowrap !important; -} - -.v-table .el-table__body td { - padding: 9px 0 !important; -} - -.v-table .el-table__footer td { - padding: 7px 0 !important; -} - -/* 2021.01.30修复火狐checkbox错位问题 */ -.table-tree .el-table-column--selection .cell { - display: inline; -} - -.table-tree.text-inline .el-table th>.cell { - white-space: nowrap !important; -} - -.table-tree .el-table__body-wrapper::-webkit-scrollbar { - width: 10px; - height: 10px; -} - -.table-tree .el-table__body-wrapper::-webkit-scrollbar-thumb { - border-radius: 5px; - background: #ddd; -} - -.table-tree .table-img { - height: 40px; - border-radius: 5px; - margin-right: 10px; - width: 40px; - object-fit: cover; -} - -.table-tree .table-img:hover { - cursor: pointer; -} - -.v-table .ivu-tag-default { - border: none !important; - background: none !important; -} - -/* .v-table >>> .el-table__fixed-body-wrapper { -top: 41px !important; -} */ -.v-table .el-table__fixed:before { - border-color: none !important; -} - -/* 2021.06.19判断谷歌内核浏览重新计算table高度 */ -.chrome .el-table__fixed { - height: calc(100% - 11px) !important; - background: white; - /* box-shadow: 0px -11px 10px rgb(0 0 0 / 12%) !important; */ -} - -.chrome .el-table__body-wrapper::-webkit-scrollbar { - width: 11px; - height: 11px; -} - -.chrome .el-table__body-wrapper::-webkit-scrollbar-thumb { - border-radius: 5px; - background: #ddd; -} - -.chrome .el-table__fixed:before { - background-color: unset; -} - -.chrome .el-table__fixed-footer-wrapper { - bottom: -11.5px; + + /*表头错行 .el-table th.gutter{ + display: table-cell!important; +} */ +.pagination { + text-align: right; + /* margin-top: 8px; */ + padding: 2px 28px; + border: 1px solid #eee; + border-top: 0px; +} + +.v-table .el-table__header th { + padding: 0px !important; + background-color: #f8f8f9 !important; + font-size: 13px; + height: 42px; + color: #616161; +} + +.v-table .el-table__header th.is-sortable { + padding: 3px !important; +} + +.table-tree.text-inline .el-table__body .cell { + word-break: inherit !important; + white-space: nowrap !important; +} + +.v-table .el-table__body td { + padding: 9px 0 !important; +} + +.v-table .el-table__footer td { + padding: 7px 0 !important; +} + +/* 2021.01.30修复火狐checkbox错位问题 */ +.table-tree .el-table-column--selection .cell { + display: inline; +} + +.table-tree.text-inline .el-table th>.cell { + white-space: nowrap !important; +} + +.table-tree .el-table__body-wrapper::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +.table-tree .el-table__body-wrapper::-webkit-scrollbar-thumb { + border-radius: 5px; + background: #ddd; +} + +.table-tree .table-img { + height: 40px; + border-radius: 5px; + margin-right: 10px; + width: 40px; + object-fit: cover; +} + +.table-tree .table-img:hover { + cursor: pointer; +} + +.v-table .ivu-tag-default { + border: none !important; + background: none !important; +} + +/* .v-table >>> .el-table__fixed-body-wrapper { +top: 41px !important; +} */ +.v-table .el-table__fixed:before { + border-color: none !important; +} + +/* 2021.06.19判断谷歌内核浏览重新计算table高度 */ +.chrome .el-table__fixed { + height: calc(100% - 11px) !important; + background: white; + /* box-shadow: 0px -11px 10px rgb(0 0 0 / 12%) !important; */ +} + +.chrome .el-table__body-wrapper::-webkit-scrollbar { + width: 11px; + height: 11px; +} + +.chrome .el-table__body-wrapper::-webkit-scrollbar-thumb { + border-radius: 5px; + background: #ddd; +} + +.chrome .el-table__fixed:before { + background-color: unset; +} + +.chrome .el-table__fixed-footer-wrapper { + bottom: -11.5px; } .searchFields { @@ -179,3 +179,14 @@ top: 41px !important; height: 32px !important; line-height: 32px !important; } + +::-webkit-scrollbar { + width: 4px; + height: 4px; + +} + +::-webkit-scrollbar-thumb { + border-radius: 5px; + background: #ddd; +} diff --git a/src/views/activity/activityList.vue b/src/views/activity/activityList.vue new file mode 100644 index 0000000..5baa749 --- /dev/null +++ b/src/views/activity/activityList.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/business/component/addMerchant.vue b/src/views/business/component/addMerchant.vue new file mode 100644 index 0000000..60e3a86 --- /dev/null +++ b/src/views/business/component/addMerchant.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue new file mode 100644 index 0000000..997d0b6 --- /dev/null +++ b/src/views/business/merchantManage.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/views/business/storeManage.vue b/src/views/business/storeManage.vue new file mode 100644 index 0000000..25e90ae --- /dev/null +++ b/src/views/business/storeManage.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/views/finance/flow.vue b/src/views/finance/flow.vue new file mode 100644 index 0000000..c4d7d21 --- /dev/null +++ b/src/views/finance/flow.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue new file mode 100644 index 0000000..80ae6a5 --- /dev/null +++ b/src/views/order/orderList.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/productService/classifyManage.vue b/src/views/productService/classifyManage.vue new file mode 100644 index 0000000..aa37956 --- /dev/null +++ b/src/views/productService/classifyManage.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/views/productService/components/productCombine.vue b/src/views/productService/components/productCombine.vue new file mode 100644 index 0000000..3131035 --- /dev/null +++ b/src/views/productService/components/productCombine.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/views/productService/policyManage.vue b/src/views/productService/policyManage.vue new file mode 100644 index 0000000..0b75dfb --- /dev/null +++ b/src/views/productService/policyManage.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue new file mode 100644 index 0000000..f4cf48c --- /dev/null +++ b/src/views/productService/productServiceManage.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/productService/welfare.vue b/src/views/productService/welfare.vue new file mode 100644 index 0000000..cf7e9b7 --- /dev/null +++ b/src/views/productService/welfare.vue @@ -0,0 +1,97 @@ + + + + +