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 @@