Merge branch 'lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v2

business/pages/activityconsumers/index.js

@@ -31,7 +31,7 @@ Page({
     detailShow: false,
     circleInfo: {},
     sid: 0,
-    tabs1:['未核销','已核销'],
+    tabs1:['待核销','已核销'],
     tabIndex:0,
   },
   onLoad: function(options) { // Do some initialize when page load.
@@ -105,6 +105,10 @@ Page({
           this.setData({
             memberTotal: data.total
           })
+        }else{
+          this.setData({
+            memberTotal: 0
+          })
         }
         switch(type) {
           case 'init': //页面进来第一次加载
@@ -193,6 +197,34 @@ Page({
     },()=>{this.memberListGet('down');})
   },
   cancelDetail(e){
+    let cancelId = e.currentTarget.dataset.id;
+    let cancelStatus = e.currentTarget.dataset.status;
+    if(cancelStatus !=1){
+      return false
+    }
+    let memberList = this.data.memberList;
+    
+    wx.showModal({
+      content: "确认核销该客户的领奖记录吗",
+      showCancel: true,
+      cancelText: '取消',
+      confirmText: '确认',
+      confirmColor: '#65B8F4',
+      success(res){
+        if(res.confirm){
+          activityconsumersconfirm({
+            id: cancelId,
+          }).then((res) => {
+            let staticDeal = memberList.find(ele => ele.status == res.status);
+            this.setData({
+              memberList: staticDeal
+            })
+          })
+        }else{
+        }
+      }
+
+    })
     
   }
 })
\ No newline at end of file

business/pages/activityconsumers/index.json

@@ -6,6 +6,7 @@
     "list-loading": "../../../components/listloading",
     "w-tabs": "/dist/w-tabs/index",
     "w-button": "/dist/w-button/index",
-    "w-pane": "/dist/w-pane/index"
+    "w-pane": "/dist/w-pane/index",
+    "empty-content": "../../../components/emptycontent"
   }
 }
\ No newline at end of file

business/pages/activityconsumers/index.wxml

@@ -16,7 +16,7 @@
                 <view class="customer-item-right" hover-class="none" hover-stop-propagation="false">
                     <!-- <view class="create-time" hover-class="none" hover-stop-propagation="false">{{filter.formatDate(item.created_at)}}</view> -->
                     <view class="create-time" hover-class="none" hover-stop-propagation="false">{{item.created_at}}</view>
-                    <view class="seedetail"  hover-class="none" hover-stop-propagation="false" data-info="{{item}}" bindtap="cancelDetail" >{{item.status==1?'核销':'已核销'}}</view>
+                    <view class="seedetail {{item.status==1? '': 'disabled'}}"  hover-class="none" hover-stop-propagation="false" data-id="{{item.id}}" data-status="{{item.status}}" bindtap="cancelDetail">{{item.status==1?'核销':'已核销'}}</view>
                 </view>
             </view>
             <list-loading loading="{{listLoading}}"></list-loading>
@@ -28,6 +28,9 @@
                 <view class="short-line short-line-right" hover-class="none" hover-stop-propagation="false"></view>
             </view>
         </view>
+        <view wx:else>
+            <empty-content></empty-content>
+        </view>
         <go-top wx:if="{{backTopValue}}"></go-top>
     </view>
 </view>
\ No newline at end of file

business/pages/activityconsumers/index.wxss

@@ -117,6 +117,9 @@
     width: 100%;
     text-align: right;
 }
+.content .customer-item .customer-item-right .seedetail.disabled {
+    color: #7A7A7A;
+}
 .content .customer-item .customer-avator {
     width:75rpx;
     height:75rpx;