From c1a741466ca1c21fcd4c7bd64390a73c519973c1 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 11 Aug 2021 22:29:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/promotion/seckill/seckill.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue index 30ec1e06..373b0dd8 100644 --- a/seller/src/views/promotion/seckill/seckill.vue +++ b/seller/src/views/promotion/seckill/seckill.vue @@ -54,7 +54,7 @@ - @@ -71,7 +71,7 @@ export default { loading: true, // 表单加载状态 searchForm: { // 搜索框初始化对象 - pageNumber: 0, // 当前页数 + pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 sort: "startTime", order: "desc", // 默认排序方式 @@ -145,7 +145,7 @@ export default { }, // 分页 改变页码 changePage(v) { - this.searchForm.pageNumber = v - 1; + this.searchForm.pageNumber = v; this.getDataList(); }, // 分页 改变页数 @@ -155,7 +155,7 @@ export default { }, // 搜索 handleSearch() { - this.searchForm.pageNumber = 0; + this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, @@ -163,7 +163,7 @@ export default { handleReset() { this.searchForm = {}; this.selectDate = ""; - this.searchForm.pageNumber = 0; + this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, From e52ac06fb3560c370a8320a3938b39465b6dca9f Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 11 Aug 2021 22:53:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?pc=E6=94=AF=E6=8C=81=E5=88=86=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/member.js | 12 +++++++++ buyer/src/pages/GoodsDetail.vue | 48 +++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js index e963eaa2..815eb753 100644 --- a/buyer/src/api/member.js +++ b/buyer/src/api/member.js @@ -478,3 +478,15 @@ export function delMemberMsg (id) { needToken: true }); } + +/** + * 绑定分销 + * @param distributionId 商品分销ID + */ +export function getGoodsDistribution (distributionId) { + return request({ + url: `/buyer/distribution/bindingDistribution/${distributionId}`, + method: Method.GET, + needToken: true + }); +} diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index f4e664b7..80028cc0 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -8,12 +8,19 @@
首页 - {{item.name}} + + {{ item.name }} +
- {{goodsMsg.data.storeName}} - {{storeCollected?'已收藏店铺':'收藏店铺'}} - 联系客服 + {{ goodsMsg.data.storeName }} + {{ + storeCollected ? '已收藏店铺' : '收藏店铺' + }} + 联系客服
@@ -32,9 +39,10 @@ import Search from '@/components/Search'; import ShopHeader from '@/components/header/ShopHeader'; import ShowGoods from '@/components/goodsDetail/ShowGoods'; import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail'; -import { goodsSkuDetail } from '@/api/goods'; -import { cancelCollect, collectGoods, isCollection } from '@/api/member'; +import {goodsSkuDetail} from '@/api/goods'; +import {cancelCollect, collectGoods, isCollection, getGoodsDistribution} from '@/api/member'; import {getDetailById} from '@/api/shopentry' + export default { name: 'GoodsDetail', beforeRouteEnter (to, from, next) { @@ -57,7 +65,24 @@ export default { // 获取商品详情 getGoodsDetail () { this.isLoading = true; - const params = this.$route.query + const params = this.$route.query; + // 分销员id + let distributionId = (params && params.distributionId) ? params.distributionId : this.Cookies.getItem('distributionId'); + // 如果有分销信息 + if (distributionId) { + console.log(distributionId) + // 先存储 + this.Cookies.setItem('distributionId', params.distributionId) + let _this = this; + // 绑定关系 + getGoodsDistribution(params.distributionId).then(res => { + // 绑定成功，则清除关系 + if (res.success) { + _this.Cookies.removeItem('distributionId'); + } + }) + } + goodsSkuDetail(params).then((res) => { this.isLoading = false; if (res.success) { @@ -125,8 +150,7 @@ export default { location.reload(); } }, - computed: { - }, + computed: {}, components: { Search, ShopHeader, @@ -147,13 +171,15 @@ export default { width: 1200px; margin: 0 auto; position: relative; + .store-collect { position: absolute; right: 20px; top: 0; color: #999; - span{ - &:hover{ + + span { + &:hover { cursor: pointer; color: $theme_color; } From 02bf570f08fb11688a4c3cbe9a650de8f28f1715 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 12 Aug 2021 00:09:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/order/after-order/returnGoodsOrder.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index b14af29a..becd959d 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -142,7 +142,6 @@ title: "申请退款金额", key: "applyRefundPrice", width: 130, - sortType: "desc", render: (h, params) => { return h( "div",