From c4037a346da75414957121375c9788d9003896f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Wed, 16 Feb 2022 09:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=20=20?=
 =?UTF-8?q?=E5=92=8C=20=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/header/hoverSearch.vue   |  6 ++--
 .../views/member/advance/withdrawApply.vue    |  2 +-
 .../src/views/promotions/coupon/coupon.vue    |  7 ++--
 .../full-discount/full-discount.vue           |  1 +
 seller/src/api/goods.js                       |  4 +--
 .../goods/goods-seller/goodsOperationSec.vue  | 36 +++++++++++++++----
 6 files changed, 42 insertions(+), 14 deletions(-)

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 @@
             <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="审核状态" prop="applyStatus">
-            <Select v-model="searchForm.memberName" clearable style="width: 200px">
+            <Select v-model="searchForm.applyStatus" clearable style="width: 200px">
               <Option value="APPLY">申请中</Option>
               <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
               <Option value="FAIL_AUDITING">审核拒绝</Option>
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"
       >
-        <Form-item label="活动名称" prop="couponName">
+        <Form-item label="优惠券名称" prop="couponName">
           <Input
             type="text"
             v-model="searchForm.couponName"
-            placeholder="请输入活动名称"
+            placeholder="请输入优惠券名称"
             clearable
             style="width: 200px"
           />
@@ -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"
             >
               <Select v-model="baseInfoForm.goodsUnit" style="width: 100px">
+              <Scroll :on-reach-bottom="handleReachBottom" >
                 <Option
-                  v-for="(unit, i) in goodsUnitList"
-                  :key="i"
-                  :value="unit"
-                  >{{ unit }}
+                  v-for="(item, index) in goodsUnitList"
+                  :key="index"
+                  :value="item"
+                  >{{ item }}
                 </Option>
+              </Scroll>    
               </Select>
             </FormItem>
             <FormItem
@@ -694,6 +696,7 @@ export default {
     };
     return {
       regular,
+      total:0,
       accessToken: "", //令牌token
       goodsParams: "",
       categoryId: "", // 商品分类第三级id
@@ -778,6 +781,10 @@ export default {
         value: [regular.REQUIRED, regular.VARCHAR60],
         templateId: [regular.REQUIRED],
       },
+      params:{
+        pageNumber:1,
+        pageSize:10
+      },
       skuInfoRules: {},
       /** 品牌列表 */
       brandList: [],
@@ -956,12 +963,23 @@ export default {
           this.brandList = response;
         }
       );
+    },
+     // 页面触底
+    handleReachBottom(){
+      setTimeout(() => {
+        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%;
 }
 </style>
+
+<style>
+.ivu-select .ivu-select-dropdown{
+  overflow: hidden !important;
+}
+</style>
\ No newline at end of file