From 7729031efa31b4ff0c343af146fed4f034802025 Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 17:08:23 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 25 -- .../src/views/goods/goods-info/goodsApply.vue | 10 - .../src/views/goods/goods-refund/index.vue | 249 ------------------ .../src/views/goods/goods-review/index.vue | 10 - .../src/views/lili-dialog/goods-dialog.vue | 2 + manager/src/views/lili-dialog/index.vue | 9 +- manager/src/views/lili-dialog/link-dialog.vue | 2 +- .../views/lili-dialog/template/marketing.vue | 4 +- .../modelList/newGoodsSort.vue | 6 +- .../modelList/notEnough.vue | 5 +- .../modelList/recommend.vue | 2 +- manager/src/views/order/flow/refundLog.vue | 8 - .../views/order/order/fictitiousOrderList.vue | 10 - manager/src/views/order/order/orderDetail.vue | 2 +- manager/src/views/order/order/orderList.vue | 10 - manager/src/views/order/receipt/receipt.vue | 12 +- .../views/promotion/coupon/couponPublish.vue | 20 +- .../promotion/pointsGoods/editPointsGoods.vue | 16 +- .../views/promotion/seckill/addSeckill.vue | 18 +- .../seller/bill/accountStatementBill.vue | 71 ----- manager/src/views/seller/bill/bill.vue | 105 +------- manager/src/views/statistics/order.vue | 2 +- .../views/statistics/order/refundOrder.vue | 2 +- 23 files changed, 53 insertions(+), 547 deletions(-) delete mode 100644 manager/src/views/goods/goods-refund/index.vue diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index 9ac9e257..33d8e705 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -105,7 +105,6 @@ ref="underForm" :model="underForm" :label-width="100" - :rules="formValidate" > @@ -133,9 +132,6 @@ export default { modalType: 0, // 添加或编辑标识 modalVisible: false, // 添加或编辑显示 modalTitle: "", // 添加或编辑标题 - drop: false, // 展开搜索框 - dropDownContent: "展开", // 展开标签文字 - dropDownIcon: "ios-arrow-down", // 展开图标 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -146,17 +142,6 @@ export default { underForm: { // 下架原因 reason: "", }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 @@ -379,16 +364,6 @@ export default { this.selectList = e; this.selectCount = e.length; }, - dropDown() { - if (this.drop) { - this.dropDownContent = "展开"; - this.dropDownIcon = "ios-arrow-down"; - } else { - this.dropDownContent = "收起"; - this.dropDownIcon = "ios-arrow-up"; - } - this.drop = !this.drop; - }, getDataList() { this.loading = true; // 带多条件搜索参数获取表单数据 diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue index 895f23fb..114fceee 100644 --- a/manager/src/views/goods/goods-info/goodsApply.vue +++ b/manager/src/views/goods/goods-info/goodsApply.vue @@ -105,16 +105,6 @@ goodsAuditForm: { // 商品编辑表单 is_auth: 1, }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/goods/goods-refund/index.vue b/manager/src/views/goods/goods-refund/index.vue deleted file mode 100644 index 75a7b91f..00000000 --- a/manager/src/views/goods/goods-refund/index.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue index c837f4ae..5bfb371c 100644 --- a/manager/src/views/goods/goods-review/index.vue +++ b/manager/src/views/goods/goods-review/index.vue @@ -114,16 +114,6 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - form: { - // 添加或编辑表单对象初始化数据 - memberName: "", - storeName: "", - shopDisable: "", - id: "", - createTime: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue index ed8cf77a..ba878753 100644 --- a/manager/src/views/lili-dialog/goods-dialog.vue +++ b/manager/src/views/lili-dialog/goods-dialog.vue @@ -111,9 +111,11 @@ export default { initGoods(res) { if (res.result.records.length !=0) { + console.log(this.selectedWay); res.result.records.forEach((item) => { item.selected = false; item.___type = "goods"; //设置为goods让pc wap知道标识 + this.selectedWay.forEach(e => { if (e.id === item.id) { item.selected = true diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue index 3c283d43..1fed5b96 100644 --- a/manager/src/views/lili-dialog/index.vue +++ b/manager/src/views/lili-dialog/index.vue @@ -25,9 +25,6 @@ export default { flag: false, // modal显隐 }; }, - props: ["types"], - watch: {}, - mounted() {}, methods: { // 关闭弹窗 clickClose() { @@ -51,13 +48,17 @@ export default { } this.clickClose(); }, - open(type) { + open(type, mutiple) { this.flag = true; if (type == "goods") { this.goodsFlag = true; + if (mutiple) { + this.singleGoods() + } } else { this.goodsFlag = false; } + }, close() { this.flag = false; diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue index a5294ce5..0c68f0e3 100644 --- a/manager/src/views/lili-dialog/link-dialog.vue +++ b/manager/src/views/lili-dialog/link-dialog.vue @@ -40,7 +40,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选 + this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选 }); this.wap.forEach((item) => { diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue index 4b89cd6d..04af40de 100644 --- a/manager/src/views/lili-dialog/template/marketing.vue +++ b/manager/src/views/lili-dialog/template/marketing.vue @@ -65,7 +65,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { @@ -113,7 +113,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue index 42da8019..c74d4b48 100644 --- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue +++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue @@ -176,12 +176,16 @@ export default { handleSelectGoods(item) { // 调起选择商品 console.warn(item); if (item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink (val) { this.selected.url = this.$options.filters.formatLinkType(val); }, selectedGoodsData (val) { + console.log(val); let goods = val[0] console.log(this.selected); this.selected.img = goods.thumbnail diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue index 2a93c86f..11b369b6 100644 --- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue +++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue @@ -108,7 +108,10 @@ export default { }, handleSelectGoods(item) { // 调起选择链接弹窗 if(item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue index 588709dc..d37a34a2 100644 --- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue +++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue @@ -241,7 +241,7 @@ export default { }, handleSelectGoods(item) { // 调起选择商品 - this.$refs.liliDialog.open("goods"); + this.$refs.liliDialog.open('goods', 'single') }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue index 3b99a5fd..8e60beaf 100644 --- a/manager/src/views/order/flow/refundLog.vue +++ b/manager/src/views/order/flow/refundLog.vue @@ -57,14 +57,6 @@ export default { isRefund: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, columns: [ { title: "售后单号", diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue index 50387891..5256a2cb 100644 --- a/manager/src/views/order/order/fictitiousOrderList.vue +++ b/manager/src/views/order/order/fictitiousOrderList.vue @@ -106,16 +106,6 @@ orderStatus: "" }, selectDate: null, // 下单时间 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 545b8ed6..2005fe73 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -212,7 +212,7 @@
  • 应付金额： ¥{{ orderInfo.order.priceDetailDTO.flowPrice }}¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}
    • diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index a36f93c8..beda900e 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -64,16 +64,6 @@ export default { orderStatus: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue index 52f36e32..1018b8a5 100644 --- a/manager/src/views/order/receipt/receipt.vue +++ b/manager/src/views/order/receipt/receipt.vue @@ -114,20 +114,10 @@ receiptStatus: "", // 起始时间 }, shopsData: [], // 店铺数据 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, params: { pageNumber: 1, - pageSize: 1, + pageSize: 10, }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index cc017088..07102b18 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -70,7 +70,7 @@
    - +
    @@ -392,6 +392,14 @@ export default { ); this.$router.go(-1); }, + openSkuList() { // 显示商品选择器 + this.$refs.skuSelect.open("goods"); + let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList)) + data.forEach(e => { + e.id = e.skuId + }) + this.$refs.skuSelect.goodsData = data; + }, changeSelect(e) { // 已选商品批量选择 this.selectedGoods = e; @@ -424,25 +432,19 @@ export default { }, selectedGoodsData(item) { // 回显已选商品 - let ids = []; let list = []; - this.form.promotionGoodsList.forEach((e) => { - ids.push(e.skuId); - }); item.forEach((e) => { - if (!ids.includes(e.id)) { list.push({ goodsName: e.goodsName, price: e.price, originalPrice: e.price, quantity: e.quantity, storeId: e.storeId, - sellerName: e.sellerName, + storeName: e.storeName, skuId: e.id, }); - } }); - this.form.promotionGoodsList.push(...list); + this.form.promotionGoodsList = list; }, getGoodsCategory(e) { // 获取级联选择器商品分类id diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue index d8646b58..082b27ac 100644 --- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue @@ -5,19 +5,19 @@

    积分商品信息

    - +
    {{ form.goodsSku.goodsName }}
     - +
    {{ form.goodsSku.id }}
     - -
    {{ form.goodsSku.sellerName }}
    + +
    {{ form.goodsSku.storeName }}
     - +
    {{ form.goodsSku.price | unitPrice('￥') }}
     - +
    {{ form.goodsSku.quantity }}
     @@ -90,9 +90,7 @@
    - + - -
    -
    @@ -65,9 +39,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -78,17 +49,6 @@ export default { endDate: "", // 终止时间 }, selectDate: null, // 选择一个事件段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -227,8 +187,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -248,35 +206,6 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, detail(v) { let id = v.id; this.$router.push({ diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue index d014ce8e..2a4f5b3c 100644 --- a/manager/src/views/seller/bill/bill.vue +++ b/manager/src/views/seller/bill/bill.vue @@ -24,11 +24,10 @@ - -
    +
    @@ -38,32 +37,6 @@ - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    -     @@ -76,9 +49,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -90,17 +60,6 @@ export default { billStatus:"" //状态 }, selectDate: null, // 选择一个时间段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -201,28 +160,20 @@ export default { init() { this.getDataList(); }, - changePage(v) { + changePage(v) { // 改变页码 this.searchForm.pageNumber = v; this.getDataList(); }, - changePageSize(v) { + changePageSize(v) { // 改变页数 this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch() { // 搜索 this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - changeSort(e) { - this.searchForm.sort = e.key; - this.searchForm.order = e.order; - if (e.order === "normal") { - this.searchForm.order = ""; - } - this.getDataList(); - }, - changeSelect(e) { + changeSelect(e) { // 表格选中 this.selectList = e; this.selectCount = e.length; }, @@ -235,8 +186,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -256,43 +205,7 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, - add() { - this.modalType = 0; - this.modalTitle = "添加"; - this.$refs.form.resetFields(); - delete this.form.id; - this.modalVisible = true; - }, - detail(v) { + detail(v) { // 账单详情 let id = v.id; this.$router.push({ name: "bill-detail", @@ -314,14 +227,10 @@ export default { this.getDataList(); } }); - // 模拟请求成功 - //this.$Message.success("操作成功"); - //this.$Modal.remove(); - //this.getDataList(); }, }); }, - delAll() { + delAll() { // 多选删除数据 if (this.selectCount <= 0) { this.$Message.warning("您还未选择要删除的数据"); return; diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 5c56535a..308af93e 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -305,7 +305,7 @@ export default { }, { title: "商家名称", - key: "sellerName", + key: "storeName", }, { title: "售后单类型", diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue index 6e37b7fe..65753284 100644 --- a/manager/src/views/statistics/order/refundOrder.vue +++ b/manager/src/views/statistics/order/refundOrder.vue @@ -38,7 +38,7 @@
    店铺名称 - {{res.sellerName}} + {{res.storeName}}
    创建时间 From 978db4e6248c2cacb0a7eeb072c5a24e0784ff96 Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 18:37:29 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/seller/shop/shopOperation.vue | 8 +++++ seller/src/views/goods/goods-seller/goods.vue | 2 +- .../goods/goods-seller/goodsOperation.vue | 32 ++++++++--------- seller/src/views/shop/ship/shipTemplate.vue | 35 ++++++++----------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index e3db7ae4..61206931 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -65,9 +65,17 @@ + 腾讯云智服 + + + + + +
    +
    只读不可修改
    diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 165f9944..69362191 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -31,7 +31,7 @@ 批量上架 批量下架 批量删除 - 批量设置运费模板 + diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 24b6be3f..58204d99 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -522,7 +522,7 @@ kg     - + { - if (res.success) { - this.logisticsTemplate = res.result; - } - }); - this.logisticsTemplateShow = true; - } + // if (this.baseInfoForm.freightPayer === "BUYER") { + // API_Shop.getShipTemplate().then((res) => { + // if (res.success) { + // this.logisticsTemplate = res.result; + // } + // }); + // this.logisticsTemplateShow = true; + // } this.baseInfoForm.release = "true"; this.baseInfoForm.recommend = this.baseInfoForm.recommend ? "true" @@ -1840,9 +1840,9 @@ export default { return; } //如果选择的是卖家承担运费 则运费模板重置为0 - if (this.baseInfoForm.freightPayer !== "BUYER") { - this.baseInfoForm.templateId = 0; - } + // if (this.baseInfoForm.freightPayer !== "BUYER") { + // this.baseInfoForm.templateId = 0; + // } this.baseInfoForm.skuList = this.skuTableData.map((sku) => { delete sku._index; diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index e86405e8..9e002f58 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -69,9 +69,10 @@ 按重量 按件数 + 包邮 - +
    @@ -101,17 +102,17 @@ - - 元 - + + 元 + - - 元 - + + 元 +
    - @@ -312,6 +313,7 @@ export default { const regNumber = /^\+?[1-9][0-9]*$/; const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; if (valid) { + debugger; //校验运费模板详细信息 for (let i = 0; i < this.form.freightTemplateChildList.length; i++) { if ( @@ -341,6 +343,8 @@ export default { return; } } + console.log(1111); + if (this.operation == "ADD") { API_Shop.addShipTemplate(this.form, headers).then((res) => { if (res.success) { @@ -541,7 +545,8 @@ textarea { } .w60 { - width: 80px !important; + width: 100px !important; + margin: 0 auto; } Input[type="text"], @@ -555,18 +560,6 @@ Input.password { outline: 0 none; } -.add-on { - line-height: 28px; - background-color: #f6f7fb; - vertical-align: top; - display: inline-block; - text-align: center; - width: 30px; - height: 30px; - border: solid #e6e9ee; - border-width: 1px 1px 1px 0; -} - ncsc-default-table { line-height: 20px; width: 100%; From ff85c3f68fd9b8085ae7d3cf13482837ec8f6f4e Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 18:58:55 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/shop/ship/shipTemplate.vue | 317 ++++++++++---------- 1 file changed, 158 insertions(+), 159 deletions(-) diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index 9e002f58..a1f22716 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -1,45 +1,43 @@ diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index f5bbad04..00c86956 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -48,15 +48,13 @@ - -
    -     +
    - -
    -     +
    - - - - -
    - - - - - - - - - - - -
    -     - - - - - -
    -     - - - -     - -     + + +
    + + + + + + + + + + + +
    +     + + + + +
    + + + +
    diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue index 701f5f30..2101d6c7 100644 --- a/manager/src/views/seller/shop/shopAuditList.vue +++ b/manager/src/views/seller/shop/shopAuditList.vue @@ -1,44 +1,38 @@ diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 3737568d..ab3cb70a 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -246,22 +246,20 @@
    - - - - -
    -     + + + +
    - - - - - - -
    -     + + + + + +
    - - - - - - -
    -     + + + + + +
    - - - - -
    - - - - - - - - - - - - - -
    -     - - - - -
    -     - - - -     - -     + + +
    + + + + + + + + + + + + + +
    +     + + + +
    + + + +
    diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue index dba70f7f..beb50ee4 100644 --- a/manager/src/views/sensitiveWords/index.vue +++ b/manager/src/views/sensitiveWords/index.vue @@ -1,41 +1,35 @@ diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue index 5b7e6b91..fdd63905 100644 --- a/seller/src/views/goods/goods-seller/draftGoods.vue +++ b/seller/src/views/goods/goods-seller/draftGoods.vue @@ -1,88 +1,82 @@ diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index 66db4536..cc41f994 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -1,105 +1,99 @@ diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index 38dd451c..cfda0899 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -1,179 +1,173 @@ diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index d30a8a41..d513fb03 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -47,15 +47,13 @@ - -
    -     +
    - -
    -     +
    - -
    -     +
    重置 - -
    -     +
    - - - - -
    -     - -     - -     - + +
    +
    diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue index 13cbe0f4..707a635c 100644 --- a/seller/src/views/shop/shopAddress.vue +++ b/seller/src/views/shop/shopAddress.vue @@ -7,17 +7,15 @@ - -
    -     +
    -
    diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue index 2330a69d..642bdb22 100644 --- a/seller/src/views/statistics/order/orderStatistics.vue +++ b/seller/src/views/statistics/order/orderStatistics.vue @@ -59,17 +59,14 @@ - - - -
    -     + +
    Date: Thu, 27 May 2021 18:03:33 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/addressManage/index.vue | 10 +++++----- buyer/src/components/card/index.vue | 1 - buyer/src/components/coupon/Coupon.vue | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/buyer/src/components/addressManage/index.vue b/buyer/src/components/addressManage/index.vue index a7b2669a..ee0dc4e0 100644 --- a/buyer/src/components/addressManage/index.vue +++ b/buyer/src/components/addressManage/index.vue @@ -57,7 +57,7 @@ import { export default { name: 'addressManage', props: { - id: { + id: { // 传入的地址id defalut: '', type: String } @@ -89,7 +89,7 @@ export default { }; }, methods: { - save () { + save () { // 保存地址 this.$refs.form.validate((valid) => { if (valid) { const params = JSON.parse(JSON.stringify(this.formData)); @@ -138,15 +138,15 @@ export default { this.formData.lat = item.position.lat; this.formData.lon = item.position.lng; }, - show () { + show () { // 地址模态框显示 this.showAddr = true; }, - hide () { + hide () { // 地址模态框隐藏 this.showAddr = false; } }, watch: { - id: { + id: { // 传入的地址id handler: function (v) { if (v) { this.getAddrById(v); diff --git a/buyer/src/components/card/index.vue b/buyer/src/components/card/index.vue index 397eb531..9dfbc055 100644 --- a/buyer/src/components/card/index.vue +++ b/buyer/src/components/card/index.vue @@ -59,7 +59,6 @@ export default { isActive: 0 // 已激活tab栏下标 }; }, - mounted () {}, methods: { // 点击右侧的回调 callBack () { diff --git a/buyer/src/components/coupon/Coupon.vue b/buyer/src/components/coupon/Coupon.vue index bad97edc..f73aabe4 100644 --- a/buyer/src/components/coupon/Coupon.vue +++ b/buyer/src/components/coupon/Coupon.vue @@ -44,7 +44,7 @@ export default { }; }, methods: { - getList () { + getList () { // 获取优惠券列表 this.loading = true memberCouponList(this.params).then(res => { this.loading = false @@ -67,18 +67,18 @@ export default { } }, - changePageNum (val) { + changePageNum (val) { // 分页改变页码 this.params.pageNumber = val; this.getList() }, - changePageSize (val) { + changePageSize (val) { // 分页改变页数 this.pageNumber = 1; this.params.pageSize = val; this.getList() }, - useScope (type, storeName) { + useScope (type, storeName) { // 根据字段返回 优惠券适用范围 let shop = '平台'; let goods = '全部商品' if (storeName !== 'platform') shop = storeName From 6780654aae5c65aaeab218fd84cb71563831796e Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 28 May 2021 17:25:07 +0800 Subject: [PATCH 08/17] =?UTF-8?q?im=E5=AF=B9=E6=8E=A5=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/index.html | 2 +- buyer/src/components/coupon/Coupon.vue | 4 +- .../src/components/goodsDetail/ShowGoods.vue | 30 +------- buyer/src/components/header/ShopHeader.vue | 52 ++----------- buyer/src/components/nav/cateNav.vue | 75 +++++++++---------- buyer/src/config/index.js | 16 ++-- buyer/src/main.js | 4 + buyer/src/pages/GoodsDetail.vue | 35 ++++++--- buyer/src/pages/Merchant.vue | 5 +- seller/src/styles/common.scss | 3 - seller/src/styles/table-common.scss | 3 - seller/src/views/goods/goods-seller/goods.vue | 7 +- 12 files changed, 85 insertions(+), 151 deletions(-) diff --git a/buyer/index.html b/buyer/index.html index 13a70c4d..3b299f1a 100644 --- a/buyer/index.html +++ b/buyer/index.html @@ -4,7 +4,7 @@ - + LILI diff --git a/buyer/src/components/coupon/Coupon.vue b/buyer/src/components/coupon/Coupon.vue index f73aabe4..30055ed6 100644 --- a/buyer/src/components/coupon/Coupon.vue +++ b/buyer/src/components/coupon/Coupon.vue @@ -104,7 +104,7 @@ export default { diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 26cbbab2..871f9ecd 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -20,7 +20,7 @@
    {{isCollected?'已收藏':'收藏'}} - +
    @@ -60,7 +60,7 @@ :key="index" @click="receiveCoupon(item.id)" > - 满{{ item.consumeThreshold }}减{{item.price | unitPrice}} + 满{{ item.consumeThreshold }}减{{item.price}} 满{{ item.consumeThreshold }}打{{item.couponDiscount}}折

    @@ -126,32 +126,6 @@
    - -
    diff --git a/buyer/src/components/header/ShopHeader.vue b/buyer/src/components/header/ShopHeader.vue index 3d7ec3e6..0b2bda67 100644 --- a/buyer/src/components/header/ShopHeader.vue +++ b/buyer/src/components/header/ShopHeader.vue @@ -1,10 +1,10 @@ @@ -86,12 +84,12 @@ export default { } }, computed: { - navList () { + navList () { // 导航列表 return JSON.parse(storage.getItem('navList')) || [] } }, methods: { - getCate () { + getCate () { // 获取分类数据 getCategory(0).then(res => { if (res.success) { this.cateList = res.result; @@ -99,7 +97,7 @@ export default { } }); }, - showDetail (index) { + showDetail (index) { // 展示全部分类 this.panel = true this.panelData = this.cateList[index].children }, @@ -245,9 +243,6 @@ export default { .nav-detail-item span:hover { background-color: $theme_color; } -.detail-item-panel ul { - list-style: none; -} .detail-item-panel li { line-height: 30px; // margin-left: 40px; diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index a2cfb5f5..89602323 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,15 +17,15 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: 'http://192.168.0.103:8890', - // buyer: 'http://192.168.0.103:8888', - // seller: 'http://192.168.0.103:8889', - // manager: 'http://192.168.0.103:8887' + 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: '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: 'https://common-api.pickmall.cn', diff --git a/buyer/src/main.js b/buyer/src/main.js index c2274aa3..752532ae 100644 --- a/buyer/src/main.js +++ b/buyer/src/main.js @@ -37,6 +37,10 @@ Vue.prototype.linkTo = function (url) { window.open(url, '_blank') } } +Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') { // 联系客服 + const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign + window.open(url, '_blank') +} Vue.prototype.Cookies = storage /* eslint-disable no-new */ new Vue({ diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 663bd301..773d4b50 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -3,7 +3,7 @@ - +
    @@ -11,8 +11,9 @@ {{item.name}}
    - {{goodsMsg.data.storeName}} + {{goodsMsg.data.storeName}} {{storeCollected?'已收藏店铺':'收藏店铺'}} + 联系客服
    @@ -40,6 +41,7 @@ import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail'; import ShowLikeGoods from '@/components/like'; import { goodsSkuDetail } from '@/api/goods'; import { cancelCollect, collectGoods, isCollection } from '@/api/member'; +import {getDetailById} from '@/api/shopentry' export default { name: 'GoodsDetail', beforeRouteEnter (to, from, next) { @@ -48,20 +50,15 @@ export default { }, created () { this.getGoodsDetail(); - if (this.Cookies.getItem('userInfo')) { - isCollection('STORE', this.goodsMsg.data.storeId).then(res => { - if (res.success && res.result) { - this.storeCollected = true; - } - }) - } + }, data () { return { goodsMsg: {}, // 商品信息 isLoading: false, // 加载状态 categoryBar: [], // 分类 - storeCollected: false // 商品收藏 + storeCollected: false, // 商品收藏 + storeMsg: {} // 店铺信息 }; }, methods: { @@ -83,6 +80,20 @@ export default { }); this.categoryBar = cateArr; this.goodsMsg = res.result; + // 判断是否收藏 + if (this.Cookies.getItem('userInfo')) { + isCollection('STORE', this.goodsMsg.data.storeId).then(res => { + if (res.success && res.result) { + this.storeCollected = true; + } + }) + } + // 获取店铺信息 + getDetailById(this.goodsMsg.data.storeId).then(res => { + if (res.success) { + this.storeMsg = res.result + } + }) } else { this.$Message.error(res.message) this.$router.push('/') @@ -91,7 +102,7 @@ export default { this.$router.push('/') }); }, - goGoodsList (currIndex) { + goGoodsList (currIndex) { // 跳转商品列表 const arr = [] this.categoryBar.forEach((e, index) => { if (index <= currIndex) { @@ -132,7 +143,6 @@ export default { } }; - From 8163cc588218d6fbb48daec0019ed7966560ff71 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 28 May 2021 17:26:15 +0800 Subject: [PATCH 09/17] =?UTF-8?q?tab=E6=A0=8F=E5=88=86=E7=B1=BB=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/nav/cateNav.vue | 75 +++++++++++++--------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue index 9cdd66c6..e4fd092c 100644 --- a/buyer/src/components/nav/cateNav.vue +++ b/buyer/src/components/nav/cateNav.vue @@ -13,11 +13,12 @@ - +
    -
    + +
      -
    • +
    • {{item.name}} / @@ -26,38 +27,35 @@
    - -
    -
    - -
    -
      -
    • - - {{ items.name }} - - -
      - {{ item.name }} -
      -
      • -
    + +
    +
    +
    - +
      +
    • + + {{ items.name }} + + +
      + {{ item.name }} +
      +
      • +
    +
    @@ -86,12 +84,12 @@ export default { } }, computed: { - navList () { + navList () { // 导航列表 return JSON.parse(storage.getItem('navList')) || [] } }, methods: { - getCate () { + getCate () { // 获取分类数据 getCategory(0).then(res => { if (res.success) { this.cateList = res.result; @@ -99,7 +97,7 @@ export default { } }); }, - showDetail (index) { + showDetail (index) { // 展示全部分类 this.panel = true this.panelData = this.cateList[index].children }, @@ -245,9 +243,6 @@ export default { .nav-detail-item span:hover { background-color: $theme_color; } -.detail-item-panel ul { - list-style: none; -} .detail-item-panel li { line-height: 30px; // margin-left: 40px; From 78bd4021a6d369285bcbd20a15045bc1e1cca81c Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 28 May 2021 18:05:38 +0800 Subject: [PATCH 10/17] =?UTF-8?q?api=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/config/index.js | 16 ++++++++-------- buyer/src/pages/GoodsDetail.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 89602323..6fe90b0b 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,15 +17,15 @@ export default { * @description api请求基础路径 */ api_dev: { - 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: '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: '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: 'https://common-api.pickmall.cn', diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 773d4b50..f065d152 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -13,7 +13,7 @@
    {{goodsMsg.data.storeName}} {{storeCollected?'已收藏店铺':'收藏店铺'}} - 联系客服 + 联系客服
    From 411f36150b6219b1a84cb630629b7e090d0ade0c Mon Sep 17 00:00:00 2001 From: mabo Date: Mon, 31 May 2021 18:03:48 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E?= =?UTF-8?q?=EF=BC=8C=E7=AB=99=E5=86=85=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/member.js | 36 ++++ .../src/components/goodsDetail/ShowGoods.vue | 1 - buyer/src/components/header/Header.vue | 16 +- buyer/src/main.js | 3 +- buyer/src/pages/PointGoods.vue | 171 ++++++++++++++++++ buyer/src/pages/PointMall.vue | 40 +++- buyer/src/pages/ShoppingCart.vue | 27 --- .../pages/home/memberCenter/CommentList.vue | 4 + .../home/memberCenter/memberMsg/MsgDetail.vue | 17 ++ .../home/memberCenter/memberMsg/MsgList.vue | 41 +++++ buyer/src/pages/user/menu.js | 5 + buyer/src/router/index.js | 14 ++ .../promotion/coupon/memberReceiveCoupon.vue | 48 ++--- manager/src/views/sys/message/sms.scss | 4 - 14 files changed, 358 insertions(+), 69 deletions(-) create mode 100644 buyer/src/pages/PointGoods.vue create mode 100644 buyer/src/pages/home/memberCenter/memberMsg/MsgDetail.vue create mode 100644 buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index 063ccd17..efa6255a 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -441,3 +441,39 @@ export function memberPointHistory (params) { params }); } +/** + * 分页获取会员站内信 + * @param {Object} params 请求参数，包括pageNumber、pageSize、status + */ +export function memberMsgList (params) { + return request({ + url: `/buyer/member/message`, + method: Method.GET, + needToken: true, + params + }); +} +/** + * 设置消息为已读 + * @param {String} messageId 消息id + */ + export function readMemberMsg (params) { + return request({ + url: `/buyer/member/message`, + method: Method.PUT, + needToken: true, + params + }); +} +/** + * 删除会员消息 + * @param {String} messageId 消息id + */ + export function delMemberMsg (params) { + return request({ + url: `/buyer/member/message`, + method: Method.DELETE, + needToken: true, + params + }); +} diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 871f9ecd..cd79acca 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -20,7 +20,6 @@
    {{isCollected?'已收藏':'收藏'}} -
    diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 0c621781..8293b17a 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -51,16 +51,16 @@ -
  • 我的订单
    • -
  • 我的足迹
    • -
  • +
  • 我的订单
    • +
  • 我的足迹
    • +
  • 我的消息
    • +
  • {{cartNum < 100 ? cartNum : '99'}} 购物车 @@ -260,12 +260,12 @@ export default { float: left; font-size: 14px; line-height: 35px; - margin-right: 15px; + margin-right: 10px; font-weight: bold; } .nav a,.nav-item { text-decoration: none; - padding-left: 15px; + padding-left: 10px; border-left: 1px solid #ccc; color: #999; cursor: pointer; @@ -406,9 +406,7 @@ export default { .sign-out p { font-size: 12px; } -.cart-icon{ - padding: 0 6px; -} + .goods-title:hover { color: $theme_color; } diff --git a/buyer/src/main.js b/buyer/src/main.js index 752532ae..001edee4 100644 --- a/buyer/src/main.js +++ b/buyer/src/main.js @@ -37,7 +37,8 @@ Vue.prototype.linkTo = function (url) { window.open(url, '_blank') } } -Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') { // 联系客服 +// 联系客服 +Vue.prototype.connectCs = function (sign = '37ef9b97807d03c6741298ed4eb5b536d2d238e08a3c00fb01fe48f03a569974c99ad767e72c04b3165ef29aca2c488b505fe4ca') { const url = 'https://yzf.qq.com/xv/web/static/chat/index.html?sign=' + sign window.open(url, '_blank') } diff --git a/buyer/src/pages/PointGoods.vue b/buyer/src/pages/PointGoods.vue new file mode 100644 index 00000000..7a69eff6 --- /dev/null +++ b/buyer/src/pages/PointGoods.vue @@ -0,0 +1,171 @@ + + + + diff --git a/buyer/src/pages/PointMall.vue b/buyer/src/pages/PointMall.vue index 23d3df3e..7cf5ae32 100644 --- a/buyer/src/pages/PointMall.vue +++ b/buyer/src/pages/PointMall.vue @@ -4,7 +4,7 @@
      -
    • {{cate.name}}
      • +
    • {{cate.name}}

    积分商品

    @@ -39,6 +39,13 @@ +
    + + +
    @@ -79,11 +86,27 @@ export default { } }) }, - selectCate (id) { + selectCate (id) { // 选择商品分类 this.params.pointsGoodsCategoryId = id this.getList() this.$router.push({query: {categoryId: id}}) - } + }, + goGoodsDetail (skuId, goodsId) { // 跳转商品详情 + let routerUrl = this.$router.resolve({ + path: '/goodsDetail', + query: {skuId, goodsId} + }) + window.open(routerUrl.href, '_blank') + }, + changePageNum (val) { // 修改页码 + this.params.pageNumber = val; + this.getList() + }, + changePageSize (val) { // 修改页数 + this.pageNumber = 1; + this.params.pageSize = val; + this.getList() + }, } } @@ -104,8 +127,19 @@ export default { margin: 0 10px; &:hover{ cursor: pointer; + color: $theme_color; } } + .selected-cate{ + color: $theme_color; + } + +} +.page-size { + width: 1200px; + margin: 10px auto; + display: flex; + justify-content: flex-end; } .promotion-decorate::before,.promotion-decorate::after{ background-image: url('../../static/sprite@2x.png'); diff --git a/buyer/src/pages/ShoppingCart.vue b/buyer/src/pages/ShoppingCart.vue index cf38d0e5..843fc981 100644 --- a/buyer/src/pages/ShoppingCart.vue +++ b/buyer/src/pages/ShoppingCart.vue @@ -34,33 +34,6 @@ - diff --git a/buyer/src/pages/home/memberCenter/CommentList.vue b/buyer/src/pages/home/memberCenter/CommentList.vue index 661669fe..ad3839c1 100644 --- a/buyer/src/pages/home/memberCenter/CommentList.vue +++ b/buyer/src/pages/home/memberCenter/CommentList.vue @@ -112,6 +112,10 @@ export default { \ No newline at end of file diff --git a/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue new file mode 100644 index 00000000..d36c6927 --- /dev/null +++ b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/buyer/src/pages/user/menu.js b/buyer/src/pages/user/menu.js index 78c3c093..7a9cf9ab 100644 --- a/buyer/src/pages/user/menu.js +++ b/buyer/src/pages/user/menu.js @@ -41,6 +41,11 @@ const member = [{ title: '账户安全', path: 'AccountSafe' }, + { + icon: '', + title: '我的消息', + path: 'MsgList' + }, { icon: '', title: '我的足迹', diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index 5eb51b0d..e8272c84 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -47,6 +47,8 @@ const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve); const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve); const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve); +const MsgList = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgList'], resolve); +const MsgDetail = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgDetail'], resolve); /* * 会员中心 @@ -316,6 +318,18 @@ export default new Router({ name: 'AddAddress', component: AddAddress }, + { + path: 'MsgList', + name: 'MsgList', + component: MsgList, + meta: {title: '我的消息'} + }, + { + path: 'MsgDetail', + name: 'MsgDetail', + component: MsgDetail, + meta: {title: '我的消息'} + }, { path: 'MyOrder', name: 'MyOrder', diff --git a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue index 2a5dcd3e..4291c1e3 100644 --- a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue +++ b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue @@ -1,30 +1,30 @@