diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue index 09861ddf..8ab54435 100644 --- a/buyer/src/components/header/hoverSearch.vue +++ b/buyer/src/components/header/hoverSearch.vue @@ -53,8 +53,10 @@ export default { .content{ width: 1200px; height: 100%; - margin: auto; - position: relative; + position: fixed; + top:0; + left:50%; + margin-left:-600px; } .hr{ width: 100%; diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue index eb5ea3c2..891e7832 100644 --- a/manager/src/views/member/advance/withdrawApply.vue +++ b/manager/src/views/member/advance/withdrawApply.vue @@ -7,7 +7,7 @@ - diff --git a/manager/src/views/promotions/coupon/coupon.vue b/manager/src/views/promotions/coupon/coupon.vue index 1c5843ed..bb281854 100644 --- a/manager/src/views/promotions/coupon/coupon.vue +++ b/manager/src/views/promotions/coupon/coupon.vue @@ -5,14 +5,14 @@ ref="searchForm" :model="searchForm" inline - :label-width="70" + :label-width="75" class="search-form mb_10" > - + @@ -349,6 +349,7 @@ export default { getPlatformCouponList(this.searchForm).then((res) => { this.loading = false; if (res.success) { + console.log(res) this.data = res.result.records; this.total = res.result.total; } diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue index 0c141967..2384c213 100644 --- a/manager/src/views/promotions/full-discount/full-discount.vue +++ b/manager/src/views/promotions/full-discount/full-discount.vue @@ -219,6 +219,7 @@ export default { getFullDiscountList(this.searchForm).then((res) => { this.loading = false; if (res.success) { + console.log(res) this.data = res.result.records; this.total = res.result.total; } diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js index a5486f7c..442fc167 100644 --- a/seller/src/api/goods.js +++ b/seller/src/api/goods.js @@ -256,8 +256,8 @@ export const lowGoods = params => { }; // 获取商品单位列表 -export const getGoodsUnitList = () => { - return getRequest(`/goods/goodsUnit`); +export const getGoodsUnitList = params => { + return getRequest(`/goods/goodsUnit`,params); }; //根据分类id获取关联品牌 export const getCategoryBrandListDataSeller = (category_id, params) => { diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index eec96023..074f2c31 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -67,12 +67,14 @@ prop="goodsUnit" > { + if (this.params.pageNumber * this.params.pageSize <= this.total) { + this.params.pageNumber++; + this.GET_GoodsUnit(); + } + }, 1000); }, // 获取商品单位 GET_GoodsUnit() { - API_GOODS.getGoodsUnitList().then((res) => { + API_GOODS.getGoodsUnitList(this.params).then((res) => { if (res.success) { - this.goodsUnitList = res.result.records.map((i) => i.name); + console.log(res) + this.goodsUnitList.push(...res.result.records.map((i) => i.name)); + this.total = res.result.total; } }); }, @@ -1688,3 +1706,9 @@ export default { width: 100%; } + + \ No newline at end of file