合并修改

packageA/activity/modules/clue/clue.js

@@ -14,7 +14,7 @@ Component({
             pageTotal: 1,
             total: null,
             where: {
-                cluetype:'业务员'
+                cluetype: '业务员'
             }
         },
         filter: {
@@ -44,13 +44,13 @@ Component({
                     this.setData({
                         'filter.show': false
                     });
-                    this.getList(this.data.sat_campaignid,true, data);
+                    this.getList(this.data.sat_campaignid, true, data);
                     break;
                 case 'reset':
                     this.setData({
                         'filter.typeActive': "",
                     });
-                    this.getList(true, this.data.filter)
+                    this.getList(this.data.sat_campaignid, true, this.data.filter)
                     break;
                 case 'close':
                     this.setData({
@@ -59,13 +59,13 @@ Component({
                     break;
             }
         },
-        selectBtn () {
+        selectBtn() {
             this.setData({
-                'filter.show':true
+                'filter.show': true
             })
         },
         /* 获取产品列表 */
-        getList(id, init=false,data) {
+        getList(id, init = false, data) {
             let content = this.data.content;
             content.sat_campaignid = id;
             if (init) content.pageNumber = 1

packageA/publicClue/modules/list/list.wxml

@@ -8,7 +8,7 @@
     <view class="exp line-1">手机号:<text>{{item.phonenumber || '--'}}</text></view>
     <view class="exp line-1">来源:<text>{{item.cluesource ? item.cluesource : '--'}}</text></view>
     <view class="exp line-1">线索类型:<text>{{item.cluetype ? item.cluetype : '--'}}</text></view>
-    <van-button wx:if="{{item.status=='待分配'}}" custom-class='action' catchtap="distribution" data-item="{{item}}">分配</van-button>
+    <van-button wx:if="{{item.allocationstatus=='待分配'}}" custom-class='action' catchtap="distribution" data-item="{{item}}">分配</van-button>
 </navigator>
 
 <My_empty wx:if="{{list.length == 0}}" />