Merge branch 'bugfix/微盟卡券' into master

src/views/card/form.js

@@ -153,7 +153,6 @@ export default {
       uuid: '',
       currentPage: 1,
       pageSize: 50,
-      search: '',
       wmPid: '',
       idx: '',
       totalPage: 0,
@@ -1352,26 +1351,26 @@ export default {
       this.weimobDemoCodeList[idx].cardList = [];
       this.weimobDemoCodeList[idx].card = '';
       this.currentPage=1;
-      this.search='';
       this.wmPid=wmPid;
       this.idx=idx;
       this.weimobDemoCodeList[this.idx].loading = true;
       this.listEntepriseWeimobCoupon();
 
     },
-    listEntepriseWeimobCoupon(){
+    listEntepriseWeimobCoupon(val){
      let params={
       wmPid:this.wmPid,pageSize:this.pageSize, currentPage:this.currentPage
      }
-     if(this.search!=''){
-      params.search=this.search;
+     if(val){
+      params.search=val;
      }
+     console.log(params)
       listEntepriseWeimobCoupon(params)
       .then(res => {
-        console.log(res.result)
         const {result,totalPage,currentPage} =  res.result;
         this.totalPage=totalPage;
         this.currentPage=currentPage;
+        if(val){this.currentPage=totalPage}
         this.weimobDemoCodeList[this.idx].cardList =this.weimobDemoCodeList[this.idx].cardList.concat(result || []) ;
         this.weimobDemoCodeList[this.idx].loading = false;
         if (this.weimobDemoCodeList[this.idx].cardList.length === 0) {
@@ -1383,31 +1382,25 @@ export default {
       });
     },
     remoteMethod(val){
-      this.search=val;
+      console.log(val)
       this.currentPage=1;
       this.weimobDemoCodeList[this.idx].cardList =  [];
       this.weimobDemoCodeList[this.idx].loading = true;
-      this.listEntepriseWeimobCoupon();
+      this.listEntepriseWeimobCoupon(val);
     },
     handleClear(){
       this.currentPage=1;
-      this.search='';
       this.weimobDemoCodeList[this.idx].cardList =  [];
       this.weimobDemoCodeList[this.idx].loading = true;
       this.listEntepriseWeimobCoupon();
     },
     getMore(){
-      if(this.currentPage<this.totalPage){
+      if(this.currentPage<this.totalPage ){
         this.currentPage++
         this.listEntepriseWeimobCoupon();
       }
     },
-    handleBlur(){
-      this.search='';
-      this.currentPage=1;
-      this.weimobDemoCodeList[this.idx].cardList =  [];
-      this.listEntepriseWeimobCoupon();
-    },
+ 
     // ---------微盟店铺结束--------
     // ------微盟适用商品开始-------
     // 获取第一层数据

src/views/card/form.vue

@@ -55,7 +55,7 @@
             <el-select class="w200" :disabled="saveItem.save || isEdit || isInfo" v-model="saveItem.pid" filterable placeholder="请选择店铺" clearable @change="handleShopChange($event, idx)">
               <el-option :disabled="wmShopIds.includes(item.wmPid)" v-for="item in weimobShopList" :key="item.wmPid" :label="item.wmPidName" :value="item.wmPid"></el-option>
             </el-select>
-            <el-select v-loadmore="getMore" @blur="handleBlur" :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" remote filterable placeholder="请选择微盟卡券" :remote-method="remoteMethod" @clear="handleClear" clearable>
+            <el-select v-loadmore="getMore" :disabled="!saveItem.pid || saveItem.save || isEdit || isInfo" :loading="saveItem.loading" class="w200" v-model="saveItem.card" remote filterable placeholder="请选择微盟卡券" :remote-method="remoteMethod" @clear="handleClear" clearable>
               <el-option v-for="item in saveItem.cardList" :key="item.cardTemplateId" :label="item.name" :value="item.cardTemplateId"></el-option>
             </el-select>
             <template v-if="isAdd || isCopy">