diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue index 511cffb3..322c6e50 100644 --- a/buyer/src/pages/forgetPassword.vue +++ b/buyer/src/pages/forgetPassword.vue @@ -93,13 +93,13 @@
- 帮助 - 隐私 - 条款 + 帮助 + 隐私 + 条款 Copyright © 2020 - Present - lili-shop 版权所有 diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index c66c1ec5..fa03011e 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -29,7 +29,6 @@
{{ filterOrderStatus(order.orderStatus) }}
订单号：{{ order.sn }}      {{order.createTime}} -    {{ order.memberName | secrecyMobile }}
diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index 42173562..0c7c6113 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -30,7 +30,7 @@ export const getLiveList = params => { // 获取直播间详情 export const getLiveInfo = studioId => { - return getRequest(`/broadcast/studio/studioInfo/${studioId}`); + return getRequest(`/broadcast/studio/${studioId}`); }; // 获取当前进行中的促销活动商品 diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..680fb1b1 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,14 +17,14 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - // seller: "https://store-api.pickmall.cn", - // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109: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" + // common: 'http://192.168.0.109:8890', + // buyer: 'http://192.168.0.109:8888', + // seller: 'http://192.168.0.109:8889', + // manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue index a78c5830..05acecf5 100644 --- a/manager/src/views/distribution/distributionGoods.vue +++ b/manager/src/views/distribution/distributionGoods.vue @@ -67,10 +67,12 @@ export default { { type: "selection", width: 60, - align: "center" + align: "center", + fixed: "left", }, { title: "商品图片", + fixed: "left", key: "thumbnail", width: 120, align: "center", diff --git a/manager/src/views/main-components/footer.vue b/manager/src/views/main-components/footer.vue index 666ae443..e471877c 100644 --- a/manager/src/views/main-components/footer.vue +++ b/manager/src/views/main-components/footer.vue @@ -8,7 +8,7 @@ Copyright © 2020 - Present lili-shop {{ $t('rights') }} diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index c78cb517..ae5d0fd6 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -40,7 +40,7 @@
- @@ -72,10 +72,6 @@ export default { 订单编号: "sn", 下单时间: "createTime", 客户名称: "memberName", - 客户账号: "", - 收货人: "", - 收货人手机号: "", - 收货人地址: "", 支付方式: { field: "clientType", callback: (value) => { @@ -92,15 +88,7 @@ export default { } }, }, - 配送方式: "", - 配送费用: "", - 订单商品金额: "", - 订单优惠金额: "", - 订单应付金额: "", - 商品SKU编号: "", 商品数量: "groupNum", - 买家备注: "", - 订单状态: "", 付款状态: { field: "payStatus", callback: (value) => { @@ -111,9 +99,6 @@ export default { : ""; }, }, - 发货状态: "", - 发票类型: "", - 发票抬头: "", 店铺: "storeName", }, loading: true, // 表单加载状态 @@ -222,56 +207,23 @@ export default { title: "下单时间", key: "createTime", width: 170, - sortable: true, - sortType: "desc", }, - { title: "操作", key: "action", align: "center", width: 150, render: (h, params) => { - return h("div", [ - h( - "Button", - - { - props: { - type: "primary", - size: "small", - }, - attrs: { - disabled: params.row.orderStatus == "UNPAID" ? false : true, - }, - style: { - marginRight: "5px", - }, - on: { - click: () => { - this.confirmPrice(params.row); - }, - }, - }, - "收款" + return h("div", [h("Button", {props: {type: "primary", size: "small",}, + attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,}, + style: {marginRight: "5px",}, + on: {click: () => {this.confirmPrice(params.row);},}, + }, "收款" ), - h( - "Button", - { - props: { - type: "info", - size: "small", - }, - style: { - marginRight: "5px", - }, - on: { - click: () => { - this.detail(params.row); - }, - }, - }, - "查看" + h("Button", {props: {type: "info", size: "small",}, + style: {marginRight: "5px",}, + on: {click: () => {this.detail(params.row);},}, + }, "查看" ), ]); }, diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue index 360492c8..cc66d389 100644 --- a/manager/src/views/page/article-manage/articleList.vue +++ b/manager/src/views/page/article-manage/articleList.vue @@ -57,7 +57,7 @@ - + @@ -435,28 +435,13 @@ export default { this.form.categoryId = res.result.categoryId; this.treeValue = data.articleCategoryName; this.form.id = data.id; - this.form.content = htmlEscape(res.result.content); + this.form.content =res.result.content; this.form.title = res.result.title; this.form.sort = res.result.sort; this.form.openStatus = res.result.openStatus; } }); }, - - htmlEscape(text) { - return text.replace(/[<>"&]/g, function (match, pos, originalText) { - switch (match) { - case "<": - return "<"; - case ">": - return ">"; - case "&": - return "&"; - case '"': - return """; - } - }); - }, remove(v) { this.$Modal.confirm({ title: "确认删除", diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 306a25af..b39dd19d 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -161,7 +161,7 @@ export default { }, { title: "活动时间", - + width: 150, render: (h, params) => { if (params.row.getType === "ACTIVITY") { return h("div", "长期有效"); diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue index dd209a87..fcb82b30 100644 --- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue @@ -2,78 +2,37 @@
-
+ - + - + - - + - +
- + - +
- +
@@ -159,55 +85,62 @@ export default { pageSize: 10, // 页面大小 order: "desc", // 默认排序方式 }, - statusList: [ // 活动状态 + statusList: [ + // 活动状态 { label: "未开始", value: "NEW" }, { label: "已开始", value: "START" }, { label: "已结束", value: "END" }, { label: "已关闭", value: "CLOSE" }, ], - columns: [ // 表头 + columns: [ + // 表头 { title: "商品名称", slot: "goodsName", - minWidth: 120, + minWidth: 150, + fixed: "left", tooltip: true, }, { title: "市场价", slot: "price", + width: 100, }, { title: "结算价", slot: "settlementPrice", + width: 100, }, - { - title: "分类", - key: "pointsGoodsCategoryName", - }, + { title: "库存数量", slot: "quantity", + width: 100, }, { title: "活动剩余库存", key: "activeStock", + width: 150, }, { title: "兑换积分", key: "points", + width: 100, }, { title: "所属店铺", key: "storeName", + width: 100, }, { title: "活动开始时间", slot: "startTime", - minWidth:100 + minWidth: 150, }, { title: "状态", key: "promotionStatus", + width: 100, render: (h, params) => { let text = "未知", color = ""; @@ -227,10 +160,16 @@ export default { return h("div", [h("Tag", { props: { color: color } }, text)]); }, }, + { + title: "分类", + key: "pointsGoodsCategoryName", + width: 100, + }, { title: "操作", slot: "action", align: "center", + fixed: "right", width: 150, }, ], @@ -327,5 +266,5 @@ export default { }; diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue index f8b32ce4..7ee3c957 100644 --- a/manager/src/views/promotion/seckill/seckill.vue +++ b/manager/src/views/promotion/seckill/seckill.vue @@ -102,13 +102,13 @@ export default { width: 100, render: (h, params) => { if (params.row.promotionStatus == "NEW") { - return h("Tag", {props: {color: "volcano",},},"新建"); + return h("Tag", {props: {color: "geekblue",},},"新建"); } else if (params.row.promotionStatus == "START") { - return h("Tag", {props: {color: "blue",},},"开始"); + return h("Tag", {props: {color: "green",},},"开始"); } else if (params.row.promotionStatus == "END") { - return h("Tag", {props: {color: "green",},},"结束"); - } else if (params.row.promotionStatus == "CLOSE") { return h("Tag", {props: {color: "volcano",},},"结束"); + } else if (params.row.promotionStatus == "CLOSE") { + return h("Tag", {props: {color: "red",},},"结束"); } }, }, diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index ccafc805..c2fea83e 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -65,13 +65,13 @@ - +
diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js index 958e3770..36359d22 100644 --- a/seller/src/api/goods.js +++ b/seller/src/api/goods.js @@ -132,13 +132,13 @@ export const delSpec = (id, params) => { return deleteRequest(`/goods/spec/del/${id}`, params); }; // 获取商品规格值列表 -export const getSpecValuesListData = (id, params) => { - return getRequest(`/goods/spec-values/values/${id}`, params); -}; +// export const getSpecValuesListData = (id, params) => { +// return getRequest(`/goods/spec-values/values/${id}`, params); +// }; // 添加商品规格值 -export const saveSpecValues = (id, params) => { - return postRequest(`/goods/spec-values/save/${id}`, params); -}; +// export const saveSpecValues = (id, params) => { +// return postRequest(`/goods/spec-values/save/${id}`, params); +// }; // 查询某分类下的全部子分类列表 export const getGoodsCategory = parent_id => { diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 27da5927..a7163666 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,14 +18,14 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: 'https://common-api.pickmall.cn', - // buyer: 'https://buyer-api.pickmall.cn', - // seller: 'https://store-api.pickmall.cn', - // manager: 'https://admin-api.pickmall.cn', - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109: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', + // common: 'http://192.168.0.109:8890', + // buyer: 'http://192.168.0.109:8888', + // seller: 'http://192.168.0.109:8889', + // manager: 'http://192.168.0.109:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 48bae50e..d0d7a00e 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -4,7 +4,7 @@
- + - + @@ -55,8 +55,7 @@
- +
@@ -67,15 +66,21 @@ - + - -
+ + +
+ + + + + +
@@ -86,8 +91,7 @@ - + 卖家承担运费 @@ -397,10 +401,10 @@ export default { this.getDataList(); }, addGoods() { - this.$router.push({name: "goods-operation"}); + this.$router.push({ name: "goods-operation" }); }, editGoods(v) { - this.$router.push({name: "goods-operation-edit", query: {id: v.id}}); + this.$router.push({ name: "goods-operation-edit", query: { id: v.id } }); }, //批量操作 @@ -423,7 +427,7 @@ export default { } }, getStockDetail(id) { - getGoodsSkuListDataSeller({goodsId: id, pageSize: 1000}).then((res) => { + getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => { if (res.success) { this.updateStockModalVisible = true; this.stockAllUpdate = undefined; @@ -433,7 +437,7 @@ export default { }, updateStock() { let updateStockList = this.stockList.map((i) => { - let j = {skuId: i.id, quantity: i.quantity}; + let j = { skuId: i.id, quantity: i.quantity }; if (this.stockAllUpdate) { j.quantity = this.stockAllUpdate; } diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index d892cdf4..b5dbab40 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -185,10 +185,7 @@
- + @@ -197,22 +194,8 @@
- - + +
@@ -853,6 +836,7 @@ export default { fieldData.unshift(fieldData.splice(index, 1)[0]); } }, + // 获取商品模板 GET_GoodsTemplate() { let searchParams = { saveType: "TEMPLATE", @@ -865,6 +849,7 @@ export default { } }); }, + // 编辑sku图片 editSkuPicture(row) { console.log(row); if (row.images && row.images.length > 0) { @@ -952,26 +937,6 @@ export default { } return !check; }, - async getActiveSkuItem(index, $index, item, val) { - this.specSelected = ""; - await this.GET_SkuSpec(); - }, - async getActiveSkuValueItem(index, $index, item, val) { - this.specValSelected = ""; - await this.GET_SkuSpecVal(item.spec_id); - }, - async editSkuItem(item, $index) { - if (item.name) { - API_GOODS.insertSpecSeller({ - specName: item.name, - categoryPath: this.baseInfoForm.categoryPath, - }).then((res) => { - if (res.message !== "60001") { - this.skuItemChange(item.name, $index); - } - }); - } - }, gotoGoodsList() { this.$router.push({ name: "goods" }); @@ -1170,25 +1135,7 @@ export default { } ); }, - async GET_SkuSpec() { - if(!this.specSelected){ - return; - } - let specResult = await API_GOODS.getSpecListSellerData({ - pageNumber: 1, - pageSize: 10, - specName: this.specSelected, - categoryPath: this.baseInfoForm.categoryPath, - }); - if (specResult.success && specResult.result.records.length > 0) { - this.specListSelected = specResult.result.records.map( - (i) => i.specName - ); - this.specList = specResult.result.records; - } else { - this.specListSelected = []; - } - }, + /** 添加规格项 */ addSkuItem() { if (this.skuInfo.length >= 5) { @@ -1296,49 +1243,6 @@ export default { */ this.renderTableData(); }, - /** 编辑规格值时触发 */ - async editSkuIValue(item, val, $index, index) { - await API_GOODS.saveSpecValuesSeller(item.spec_id, { - spec_value: [val.value], - }); - - /** - * 渲染规格详细表格 - */ - this.renderTableData(); - }, - /** 获取编辑时的skuInfo信息 */ - getSkuInfo() { - /** 下拉列表数据(skuData)存在时 检测productSkuInfo中对应的规格(spec_id)项 并且赋值于skuInfo中对应的规格项信息（描述 + 名称） */ - if (this.categoryId) { - API_GOODS.getSpecValuesListData(this.categoryId, {}).then( - (response) => { - this.skuData = response; - if ( - this.skuData.length > 0 && - Array.isArray(this.productSkuInfo) && - this.productSkuInfo.length > 0 - ) { - this.skuInfo = cloneObj(this.productSkuInfo); - if (this.skuInfo.length > 0) { - this.skuInfo.forEach((key) => { - this.skuData.forEach((item) => { - if (key.spec_id === item.spec_id) { - key.name = item.name; - key.spec_memo = item.spec_memo; - } - }); - }); - } - } - } - ); - } - /** - * 渲染规格详细表格 - */ - this.renderTableData(); - }, /** * 渲染table所需要的column 和 data */ diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue index bb014b1a..a1bd088a 100644 --- a/seller/src/views/login.vue +++ b/seller/src/views/login.vue @@ -162,7 +162,7 @@ export default { } .login { height: 100%; - background: url("../assets/background.svg") no-repeat; + background: url("../assets/background.png") no-repeat; background-size: 100%; background-position-y: bottom; background-color: #edf0f3; diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue index 4df03af6..c1fb9ba6 100644 --- a/seller/src/views/main-components/footer.vue +++ b/seller/src/views/main-components/footer.vue @@ -1,14 +1,14 @@ diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue index 9f44bb6d..3f4c4d9f 100644 --- a/seller/src/views/promotion/fullCut/newFullCut.vue +++ b/seller/src/views/promotion/fullCut/newFullCut.vue @@ -113,9 +113,11 @@ >  送积分 +