合并内容

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>

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;
         }

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;
         }

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) => {

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
@@ -602,6 +604,7 @@ export default {
     };
     return {
       regular,
+      total:0,
       accessToken: "", //令牌token
       goodsParams: "",
       categoryId: "", // 商品分类第三级id
@@ -686,6 +689,10 @@ export default {
         value: [regular.REQUIRED, regular.VARCHAR60],
         templateId: [regular.REQUIRED],
       },
+      params:{
+        pageNumber:1,
+        pageSize:10
+      },
       skuInfoRules: {},
       /** 品牌列表 */
       brandList: [],
@@ -863,12 +870,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;
         }
       });
     },
@@ -1476,3 +1494,9 @@ export default {
 <style lang="scss" scoped>
 @import "./addGoods.scss";
 </style>
+
+<style>
+.ivu-select .ivu-select-dropdown{
+  overflow: hidden !important;
+}
+</style>