Merge remote-tracking branch 'origin/lvtz' into wxl-develop

business/pages/activityconsumers/index.js

@@ -197,12 +197,13 @@ Page({
     },()=>{this.memberListGet('down');})
   },
   cancelDetail(e){
+    let that = this;
     let cancelId = e.currentTarget.dataset.id;
     let cancelStatus = e.currentTarget.dataset.status;
     if(cancelStatus !=1){
       return false
     }
-    let memberList = this.data.memberList;
+    let memberList = that.data.memberList;
     
     wx.showModal({
       content: "确认核销该客户的领奖记录吗",
@@ -215,10 +216,15 @@ Page({
           activityconsumersconfirm({
             id: cancelId,
           }).then((res) => {
-            let staticDeal = memberList.find(ele => ele.status == res.status);
-            this.setData({
+            let staticDeal = memberList.filter(ele => ele.id != cancelId);
+            that.setData({
               memberList: staticDeal
             })
+            if(that.data.memberList.length==0){
+              that.setData({
+                hasData: false
+              })
+            }
           })
         }else{
         }