From 6b697f9ecd6658023e0e7ab352439ddabe6cfcdf Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Thu, 6 Jul 2023 11:44:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=9A=E6=A0=87=E7=AD=BETab=E9=A1=B5=E5=86=85=E5=B5=8C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/bill/bill-detail.vue | 1 - seller/src/api/common.js | 1 - seller/src/config/index.js | 9 ++- seller/src/config/setting.json | 6 ++ seller/src/main.js | 7 ++ seller/src/store/index.js | 2 + seller/src/store/modules/setting.js | 15 ++++ seller/src/utils/filters.js | 15 ++++ seller/src/views/ForgetPassword.vue | 1 - seller/src/views/Main.vue | 63 ++++++++++----- .../views/distribution/distributionOrder.vue | 1 - seller/src/views/goods/goods-seller/goods.vue | 1 - seller/src/views/lili-dialog/link-dialog.vue | 1 - seller/src/views/login.vue | 3 +- .../views/main-components/config-drawer.vue | 78 +++++++++++++++++++ seller/src/views/main.scss | 52 ++++++------- .../order/after-order/orderComplaint.vue | 4 +- .../order/after-order/returnGoodsOrder.vue | 4 +- .../order/after-order/returnMoneyOrder.vue | 4 +- .../views/order/order/exportOrderDeliver.vue | 1 - seller/src/views/order/order/orderDetail.vue | 8 +- seller/src/views/order/order/orderList.vue | 5 +- .../views/order/order/virtualOrderList.vue | 4 +- .../views/promotion/coupon/coupon-receive.vue | 2 +- .../full-discount/full-discount-add.vue | 2 +- .../src/views/promotion/pintuan/pintuan.vue | 3 +- seller/src/views/shop/bill/storeBill.vue | 5 +- seller/src/views/shop/ship/logistics.vue | 6 +- seller/src/views/shop/ship/shipTemplate.vue | 3 +- .../views/shop/system/clerk/clerkManage.vue | 13 ++-- .../department/storeDepartmentManage.vue | 6 +- .../shop/system/role/storeRoleManage.vue | 4 +- seller/src/views/shop/wap/index.vue | 6 +- seller/src/views/shop/wap/navbar.vue | 2 - seller/src/views/shop/wap/wapList.vue | 1 - seller/src/views/statistics/goods.vue | 35 +++------ seller/src/views/statistics/order.vue | 10 +-- seller/src/views/statistics/traffic.vue | 7 +- 38 files changed, 255 insertions(+), 136 deletions(-) create mode 100644 seller/src/config/setting.json create mode 100644 seller/src/store/modules/setting.js create mode 100644 seller/src/views/main-components/config-drawer.vue diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index 5d386b51..b3743bcf 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -516,7 +516,6 @@ export default { this.refundTotal = res.result.total; this.$set(this, "refund", res.result.records); - console.log(); } }); this.refundTotal = this.refund.length; diff --git a/seller/src/api/common.js b/seller/src/api/common.js index 5951ab3f..cad5dcfd 100644 --- a/seller/src/api/common.js +++ b/seller/src/api/common.js @@ -22,7 +22,6 @@ export function getBaseSite() { // 上传文件 export const upLoadFileMethods = (bold) => { - console.log(bold) return uploadFileRequest(uploadFile, bold); }; diff --git a/seller/src/config/index.js b/seller/src/config/index.js index ef4121c9..b9462ecb 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -1,3 +1,4 @@ + module.exports = { title: "lilishop", //配置显示在浏览器标签的title /** @@ -11,10 +12,12 @@ module.exports = { website: "https://www.pickmall.cn", //官网地址 enableCDN: true, //生产环境 是否启用cdn加载 vue等js port: 10002, //端口 - inputMaxLength:'140', //全局输入框默认最大输入长度字 + inputMaxLength: "140", //全局输入框默认最大输入长度字 /** * 如需更换主题请修改此处以及theme.less中修改 */ - mainColor:"#ff5c58", //主题色 - + mainColor: "#ff5c58", //主题色 + setting: { + isUseTabsRouter: true, //多标签Tab页模式 + }, }; diff --git a/seller/src/config/setting.json b/seller/src/config/setting.json new file mode 100644 index 00000000..44d624cf --- /dev/null +++ b/seller/src/config/setting.json @@ -0,0 +1,6 @@ +{ + "setting": { + "isUseTabsRouter": true, + "showFooter": false + } +} diff --git a/seller/src/main.js b/seller/src/main.js index 210b9457..d4b59700 100644 --- a/seller/src/main.js +++ b/seller/src/main.js @@ -94,6 +94,13 @@ Array.prototype.remove = function (from, to) { Object.keys(filters).forEach(key => { Vue.filter(key, filters[key]); }); + + + + + + + /* eslint-disable no-new */ new Vue({ el: "#app", diff --git a/seller/src/store/index.js b/seller/src/store/index.js index 2df323d7..67d963ab 100644 --- a/seller/src/store/index.js +++ b/seller/src/store/index.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import Vuex from 'vuex'; import app from './modules/app'; +import setting from './modules/setting'; import user from './modules/user'; import dict from './modules/dict'; @@ -21,6 +22,7 @@ const store = new Vuex.Store({ modules: { app, user, + setting, dict } }); diff --git a/seller/src/store/modules/setting.js b/seller/src/store/modules/setting.js new file mode 100644 index 00000000..da09484d --- /dev/null +++ b/seller/src/store/modules/setting.js @@ -0,0 +1,15 @@ +const { setting } = require("@/config"); + +const localSetting = window.localStorage.getItem('setting') +const settingData = { + state: { + setting:localSetting ? JSON.parse(localSetting) : setting, + }, + mutations: { + updateSetting(state, data) { + state.setting = data; + }, + }, +}; + +export default settingData; diff --git a/seller/src/utils/filters.js b/seller/src/utils/filters.js index a68a3203..06864eb4 100644 --- a/seller/src/utils/filters.js +++ b/seller/src/utils/filters.js @@ -32,6 +32,21 @@ export function enCode(v1) { return v1; } +import {router} from "@/router/index"; +/** + * 自定义跳转 + */ +export function customRouterPush(push){ + const setting = window.localStorage.getItem('setting'); + if(setting.isUseTabsRouter){ + router.push(push) + } + else{ + let url = router.resolve(push); + window.open(url.href, '_blank'); + } +} + /** * 订单来源 diff --git a/seller/src/views/ForgetPassword.vue b/seller/src/views/ForgetPassword.vue index 8c706cc8..915563be 100644 --- a/seller/src/views/ForgetPassword.vue +++ b/seller/src/views/ForgetPassword.vue @@ -186,7 +186,6 @@ export default { apiLogin.forgetAndModify(params).then(res => { this.loading1 = false; - console.log(res); if (res.success) { this.$Message.success('修改密码成功'); this.$router.push('login'); diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue index b0e61b74..cfba04fa 100644 --- a/seller/src/views/Main.vue +++ b/seller/src/views/Main.vue @@ -6,20 +6,20 @@
-
-
+
+ +
+ +
+
    +
  • + + + +
    • +
- {{ userInfo.storeName }} - + @@ -51,11 +58,11 @@
-
+
-
+
@@ -67,6 +74,8 @@
+ +
@@ -74,25 +83,34 @@ import shrinkableMenu from "./main-components/shrinkable-menu/shrinkable-menu.vue"; import tagsPageOpened from "./main-components/tags-page-opened.vue"; import circleLoading from "@/views/my-components/lili/circle-loading.vue"; +import configDrawer from "@/views/main-components/config-drawer.vue"; + import Cookies from "js-cookie"; import util from "@/libs/util.js"; import { logout } from "@/api/index"; - +const config = require("@/config/index.js"); export default { components: { shrinkableMenu, tagsPageOpened, - circleLoading + circleLoading, + configDrawer }, data() { return { + config, sliceNum: 5, // 展示nav数量 userInfo: {}, // 用户信息 - navType: 1, // nav类型 + storeSideLogo: "", //logo图片 }; }, computed: { + setting(){ + let data = this.$store.state.setting + + return data.setting + }, loading() { return this.$store.state.app.loading; }, @@ -110,6 +128,9 @@ export default { }, }, methods: { + handleClickSetting() { + this.$refs.config.open(); + }, // 初始化方法 init() { // 菜单 @@ -119,14 +140,14 @@ export default { } this.storeSideLogo = localStorage.getItem("sellerlogoImg"); window.document.title = localStorage.getItem("sellersiteName"); - //动态获取icon - let link = - document.querySelector("link[rel*='icon']") || - document.createElement("link"); - link.type = "image/x-icon"; - link.href = localStorage.getItem("sellerIconImg"); - link.rel = "shortcut icon"; - document.getElementsByTagName("head")[0].appendChild(link); + //动态获取icon + let link = + document.querySelector("link[rel*='icon']") || + document.createElement("link"); + link.type = "image/x-icon"; + link.href = localStorage.getItem("sellerIconImg"); + link.rel = "shortcut icon"; + document.getElementsByTagName("head")[0].appendChild(link); let userInfo = JSON.parse(Cookies.get("userInfoSeller")); this.userInfo = userInfo; diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue index 694358d9..90a8bd88 100644 --- a/seller/src/views/distribution/distributionOrder.vue +++ b/seller/src/views/distribution/distributionOrder.vue @@ -144,7 +144,6 @@ export default { endTime / 1000 ); } - console.log(this.searchForm); // 带多条件搜索参数获取表单数据 请自行修改接口 getDistributionOrder(this.searchForm).then((res) => { this.loading = false; diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 83f118a1..b1871120 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -563,7 +563,6 @@ export default { async exportGoods(){ downLoadGoods() .then((res) => { - console.log(res) const blob = new Blob([res], { type: "application/vnd.ms-excel;charset=utf-8", }); diff --git a/seller/src/views/lili-dialog/link-dialog.vue b/seller/src/views/lili-dialog/link-dialog.vue index 02fa89d6..a6d7f3f7 100755 --- a/seller/src/views/lili-dialog/link-dialog.vue +++ b/seller/src/views/lili-dialog/link-dialog.vue @@ -41,7 +41,6 @@ export default { }, mounted() { this.$nextTick(() => { - console.log( this.$refs["lili-component"]) this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选 }); diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue index 64b05c3c..1b8b31f7 100644 --- a/seller/src/views/login.vue +++ b/seller/src/views/login.vue @@ -144,7 +144,6 @@ export default { // location.reload(); // this.$router.go(0); - console.log("Huoqu "); this.setStore("saveLogin", this.saveLogin); if (this.saveLogin) { // 保存7天 @@ -296,6 +295,6 @@ export default { opacity: 0.9; border-radius: 10px; } - + } diff --git a/seller/src/views/main-components/config-drawer.vue b/seller/src/views/main-components/config-drawer.vue new file mode 100644 index 00000000..cc350556 --- /dev/null +++ b/seller/src/views/main-components/config-drawer.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss index f12849bc..1728fca6 100644 --- a/seller/src/views/main.scss +++ b/seller/src/views/main.scss @@ -145,9 +145,9 @@ .header-avator-con { display: flex; align-items: center; - position: absolute; - right: 0; - top: 0; + + padding: 0 30px; + justify-content: space-between; height: 100%; @@ -188,32 +188,6 @@ align-items: center; } - .user-dropdown { - &-menu-con { - - .main-user-name { - font-size: 14px; - display: inline-block; - cursor: pointer; - margin-right: 5px; - width: 200px; - overflow: hidden; - word-wrap: normal; - white-space: nowrap; - text-overflow: ellipsis; - - vertical-align: middle; - overflow: hidden; - - text-align: right; - } - } - - &-innercon { - height: 100%; - padding-right: 14px; - } - } .full-screen-btn-con { display: inline-block; @@ -317,3 +291,23 @@ z-index: 100; top: 1px; } +.nav-item { + cursor: pointer; + width: 30px; + height: 30px; + border-radius: 50%; + border: 1px solid #ededed; + display: flex; + align-items: center; + justify-content: center; + margin: 0 10px; +} +.footer-page-on{ + + width: 100%; + height: 30px; + display: flex; + align-items: center; + justify-content: center; + z-index: 999; +} diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue index a3d7f6e5..92530067 100644 --- a/seller/src/views/order/after-order/orderComplaint.vue +++ b/seller/src/views/order/after-order/orderComplaint.vue @@ -237,10 +237,10 @@ //投诉详情 detail(v) { let id = v.id; - this.$router.push({ + this.$options.filters.customRouterPush({ name: "order-complaint-detail", query: { id: id }, - }); + }) }, }, mounted() { diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index cb2d0c9f..8b38de0a 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -270,10 +270,10 @@ // 退货订单详情 detail(v) { let sn = v.sn; - this.$router.push({ + this.$options.filters.customRouterPush({ name: "return-goods-order-detail", query: { sn: sn }, - }); + }) }, }, diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index e6d9d918..d01ffeea 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -264,10 +264,10 @@ // 退款订单详情 detail(v) { let sn = v.sn; - this.$router.push({ + this.$options.filters.customRouterPush({ name: "return-goods-order-detail", query: { sn: sn }, - }); + }) }, }, diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index d0af22fb..c66a2393 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -81,7 +81,6 @@ export default { // 点击选择步骤 handleCheckStep(val) { if (val.title.search("3") == -1) { - console.warn(val); this.stepList.map((item) => { item.checked = false; }); diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index ef8ba4fa..edeefd31 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -228,7 +228,7 @@ 修改金额： ¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }} -