diff --git a/manager/src/App.vue b/manager/src/App.vue index 5e8a245d..e75223ee 100644 --- a/manager/src/App.vue +++ b/manager/src/App.vue @@ -8,7 +8,6 @@ import {getCategoryTree} from '@/api/goods.js' export default { updated() { - if (!localStorage.getItem('category') && this.$route.path !== '/login') { getCategoryTree(0).then(res => { if (res.success) { diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 111c90d7..61e60083 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,10 +17,10 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, api_prod: { common: 'http://127.0.0.1:8890', diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue index 177a8811..491b10d4 100644 --- a/manager/src/views/Main.vue +++ b/manager/src/views/Main.vue @@ -77,14 +77,10 @@ export default { }, data() { return { - sliceNum: 5, - userInfo: "", - userId: "", - openedSubmenuArr: this.$store.state.app.openedSubmenuArr, - firstThreeNav: [], - lastNav: [], - navType: 1, - tipsMessage: "", + sliceNum: 5, // 展示nav数量 + userInfo: "", // 用户信息 + navType: 1, // nav类型 + tipsMessage: "", // 通知消息 }; }, computed: { @@ -118,7 +114,6 @@ export default { let userInfo = JSON.parse(Cookies.get("userInfo")); this.userInfo = userInfo; - this.userId = userInfo.id; this.checkTag(this.$route.name); let currWidth = document.body.clientWidth; if (currWidth <= 1200) { diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue index 265bde3c..605cf9e5 100644 --- a/manager/src/views/login.vue +++ b/manager/src/views/login.vue @@ -52,16 +52,14 @@ export default { }, data() { return { - error: false, - loading: false, - sending: false, - form: { + loading: false, // 加载状态 + form: { // 表单数据 username: "", password: "", mobile: "", code: "", }, - rules: { + rules: { // 验证规则 username: [ { required: true, diff --git a/manager/src/views/promotion/seckill/seckillGoods.vue b/manager/src/views/promotion/seckill/seckillGoods.vue index c92dd69f..b1d4646e 100644 --- a/manager/src/views/promotion/seckill/seckillGoods.vue +++ b/manager/src/views/promotion/seckill/seckillGoods.vue @@ -296,14 +296,14 @@ align: "center", }, ], - goodsList: [], - params: { + goodsList: [], // 商品列表 + params: { // 请求参数 seckillId: this.$route.query.id, applyStatus: "PASS", failReason: "", ids: "", }, - rules: { + rules: { // 验证规则 failReason: [{required: true, message: "请输入拒绝原因"}], }, }; diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue index ffe9ce16..596d3fe8 100644 --- a/manager/src/views/seller/bill/accountStatementBill.vue +++ b/manager/src/views/seller/bill/accountStatementBill.vue @@ -76,7 +76,7 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - selectDate: null, + selectDate: null, // 选择一个事件段 form: { // 添加或编辑表单对象初始化数据 sn: "", diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index 70d5ebed..db1dece7 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -107,7 +107,7 @@ export default { name: "bill-detail", data() { return { - columns: [ + columns: [ // 表头 { title: "项目", key: "name", @@ -118,7 +118,7 @@ export default { key: "value", }, ], - data: [ + data: [ // 数据 { name: "计算中", value: 0, @@ -153,10 +153,10 @@ export default { value: 0, }, ], - id: "", - bill: {}, - order: [], - orderParam: { + id: "", // 账单id + bill: {}, // 账单详情 + order: [], // 订单列表 + orderParam: { // 请求参数 pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 sort: "id", // 默认排序字段 @@ -165,7 +165,7 @@ export default { startDate: null, endDate: null, }, - orderColumns: [ + orderColumns: [ // 订单表头 { title: "入账时间", key: "createTime", @@ -251,8 +251,8 @@ export default { }, ], - refund: [], - refundParam: { + refund: [], // 退款单 + refundParam: { // 请求参数 flowTypeEnum: "PAY", pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 @@ -262,22 +262,25 @@ export default { startDate: null, endDate: null, }, - refundColumns: [ + refundColumns: [ // 退款单表头 { title: "退款时间", key: "createTime", minWidth: 120, - tooltip: true }, + tooltip: true + }, { title: "退款流水编号", key: "sn", minWidth: 120, - tooltip: true }, + tooltip: true + }, { title: "订单编号", key: "sn", minWidth: 120, - tooltip: true }, + tooltip: true + }, { title: "退款金额", key: "finalPrice", @@ -348,8 +351,8 @@ export default { ], - orderTotal: 0, - refundTotal: 0, + orderTotal: 0, // 订单总数 + refundTotal: 0, // 退款单总数 }; }, methods: { diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue index 7c1d8f2d..494bc366 100644 --- a/manager/src/views/seller/bill/bill.vue +++ b/manager/src/views/seller/bill/bill.vue @@ -89,7 +89,7 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - selectDate: null, + selectDate: null, // 选择一个时间段 form: { // 添加或编辑表单对象初始化数据 sn: "", diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue index cb24d860..f352a6dd 100644 --- a/manager/src/views/seller/shop/shopAuditList.vue +++ b/manager/src/views/seller/shop/shopAuditList.vue @@ -57,10 +57,9 @@ }, data() { return { - shopId: "", - modalFlag: false, + shopId: "", // 店铺id + modalFlag: false, // 新增、编辑标识 loading: true, // 表单加载状态 - drop: false, searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -70,7 +69,7 @@ startDate: "", // 起始时间 endDate: "", // 终止时间 }, - selectDate: null, + selectDate: null, // 创建时间 form: { // 添加或编辑表单对象初始化数据 memberName: "", @@ -79,9 +78,6 @@ id: "", createTime: "", }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 9142513f..a10a074a 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -176,8 +176,7 @@ :name="item" style="marrgin-left: 10px" >{{ item }} - +

@@ -558,7 +557,7 @@ loading: true, // 表单加载状态 storeInfo: {},//店铺信息 checkAllGroup: [], //选中的经营分类 - selectDate: null, + selectDate: null, // 申请时间 submitLoading: false, // 添加或编辑提交状态 orderColumns: [ diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue index ca659c50..4872459f 100644 --- a/manager/src/views/seller/shop/shopList.vue +++ b/manager/src/views/seller/shop/shopList.vue @@ -69,10 +69,9 @@ export default { }, data() { return { - shopId: "", - modalFlag: false, + shopId: "", // 店铺id + modalFlag: false, // 新增、编辑标识 loading: true, // 表单加载状态 - drop: false, searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -82,7 +81,7 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - selectDate: null, + selectDate: null, // 创建时间 form: { // 添加或编辑表单对象初始化数据 memberName: "", @@ -91,8 +90,6 @@ export default { id: "", createTime: "", }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index 1f54ba9e..58851a74 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -232,9 +232,8 @@ export default { data() { return { - shopId: this.$route.query.shopId, + shopId: this.$route.query.shopId, // 店铺id isRead: false, //是否只读,只有在店铺通过审核才可修改 - regionAddressFlag: true, selectedFormBtnName: "", //点击图片绑定form picModalFlag: false, //图片选择器 memberModalFlag: false, //商家账号 @@ -333,15 +332,13 @@ export default { }, ], }, - selectMemberList: [], - memberList: [], - indeterminate: true, - checkAll: false, - checkAllGroup: [], - showRegion: false, + indeterminate: true, // 复选框全选样式 + checkAll: false, // 全选 + checkAllGroup: [], // 全选数组 + showRegion: false, // 显示地区 submitLoading: false, // 添加或编辑提交状态 - settlementCycle: [], - shopForm: { + settlementCycle: [], // 结算周期 + shopForm: { // 店铺数据 settlementCycle: "", selfOperated: 0, memberName: "", @@ -371,9 +368,9 @@ export default { storeDesc: "", ddCode: "", }, - categories: [], + categories: [], // 分类 - infoResult: "", + infoResult: "", // 店铺详情 }; }, methods: { diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue index 2d43c4e3..dba70f7f 100644 --- a/manager/src/views/sensitiveWords/index.vue +++ b/manager/src/views/sensitiveWords/index.vue @@ -73,9 +73,6 @@ export default { modalType: 0, // 添加或编辑标识 modalVisible: false, // 添加或编辑显示 modalTitle: "", // 添加或编辑标题 - drop: false, - dropDownContent: "展开", - dropDownIcon: "ios-arrow-down", searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -84,7 +81,6 @@ export default { order: "desc", // 默认排序方式 sensitiveWord: "", }, - selectDate: null, form: { // 添加或编辑表单对象初始化数据 sensitiveWord: "", diff --git a/manager/src/views/statistics/goods.vue b/manager/src/views/statistics/goods.vue index 17b9b4e3..09006c59 100644 --- a/manager/src/views/statistics/goods.vue +++ b/manager/src/views/statistics/goods.vue @@ -32,16 +32,14 @@ export default { }, data() { return { - total: 0, - year: "", - params: { + params: { // 请求参数 searchType: "LAST_SEVEN", year: "", month: "", shopId: "", type: "NUM" }, - columns: [ + columns: [ // 表头 { title: "商品名称", key: "goodsName", @@ -61,7 +59,7 @@ export default { }, }, ], - data: [], + data: [], // 数据 }; }, methods: { diff --git a/manager/src/views/statistics/member.vue b/manager/src/views/statistics/member.vue index a233660f..f762111f 100644 --- a/manager/src/views/statistics/member.vue +++ b/manager/src/views/statistics/member.vue @@ -33,7 +33,7 @@ export default { data() { return { - columns: [ + columns: [ // 表头 { key: "createDate", title: "日期", @@ -75,23 +75,16 @@ export default { value: "LAST_THIRTY", }, ], - year: "", - orderChart: "", - defaultParams: { - month: "", - searchType: "LAST_SEVEN", // TODAY , YESTERDAY , LAST_SEVEN , LAST_THIRTY - storeId: "", - year: "", - }, - - params: { + year: "", // 当前年限 + orderChart: "", // 订单表格 + params: { // 请求参数 searchType: "LAST_SEVEN", year: "", month: "", shopId: "", }, - data: [], + data: [], // 数据 }; }, watch: { diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index d36c84db..5c56535a 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -173,8 +173,8 @@ export default { data() { return { - total: "0", - orderType: [ + total: "0", // 总数 + orderType: [ // 订单类型 { title: "订单", selected: true, @@ -195,13 +195,13 @@ export default { TAKE: "已完成", }, - serviceTypeList: { + serviceTypeList: { // 服务类型 CANCEL: "取消", RETURN_GOODS: "退货", EXCHANGE_GOODS: "换货", RETURN_MONEY: "退款", }, - serviceStatusList: { + serviceStatusList: { // 服务状态 APPLY: "申请售后", PASS: "通过售后", REFUSE: "拒绝售后", @@ -220,7 +220,7 @@ export default { columns: [], // 定退单title - orderColumns: [ + orderColumns: [ // 表头 { type: "expand", width: 50, @@ -271,7 +271,7 @@ export default { }, }, ], - refundColumns: [ + refundColumns: [ // 表头 { type: "expand", width: 50, @@ -400,8 +400,6 @@ export default { value: "LAST_THIRTY", }, ], - year: "", - // 订单传参 orderParams: { searchType: "LAST_SEVEN", // TODAY , YESTERDAY , LAST_SEVEN , LAST_THIRTY diff --git a/manager/src/views/statistics/order/orderDetail.vue b/manager/src/views/statistics/order/orderDetail.vue index 3d445e01..48a55ed2 100644 --- a/manager/src/views/statistics/order/orderDetail.vue +++ b/manager/src/views/statistics/order/orderDetail.vue @@ -76,7 +76,7 @@ export default { data() { return { - orderStatusList: { + orderStatusList: { // 订单状态 UNDELIVERED: "待发货", UNPAID: "未付款", PAID: "已付款", diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue index 1967b0b8..6e37b7fe 100644 --- a/manager/src/views/statistics/order/refundOrder.vue +++ b/manager/src/views/statistics/order/refundOrder.vue @@ -76,7 +76,7 @@ export default { data() { return { - orderStatusList: { + orderStatusList: { // 订单状态 UNDELIVERED: "待发货", UNPAID: "未付款", PAID: "已付款", diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue index 7d39af66..6f571a97 100644 --- a/manager/src/views/statistics/traffic.vue +++ b/manager/src/views/statistics/traffic.vue @@ -50,7 +50,6 @@ -