1.5.6.1

Component/selectRule/selectRule.js

@@ -100,7 +100,7 @@ Component({
         var id=e.target.dataset.item.id;
         this.setData({
           activeItemIndex:id,
-          item_child_list:[]
+          item_child_list:e.target.dataset.item.child
         });
         this.getItem(id);
     },
@@ -112,7 +112,6 @@ Component({
         })
     },
     radioChange: function (e) {
-      console.log(e)
       this.props.onConfirm(e.detail.value);
       this.plusOne();
     },

app.js

@@ -1,8 +1,8 @@
 import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 
-// const baseUrl = "https://test-ding.g107.com/";//测试
-const baseUrl = "https://ding.insys.g107.com/";//正式
+const baseUrl = "https://test-ding.g107.com/";//测试
+// const baseUrl = "https://ding.insys.g107.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;

pages/begin/begin.js

@@ -34,7 +34,7 @@ Page({
         }else{
              that.setData({
               num:0,
-              str:'企业授权已过期'
+              str:data.msg
             })
         }
       })

pages/statistics/allTask/allTask.js

@@ -52,6 +52,19 @@ Page({
       },function(){})
     }
   },
+  //过滤List,通常用于删除了某条数据，刷新列表
+  filtrationList(index, id) {
+    if (index == 1) {
+    } else if (index == 2 && this.data.page != 1) {
+      var list = this.data.list;
+      for (let i in list) {
+        if (list[i].id == id) {
+          list.splice(i, 1)
+        }
+      }
+      this.setData({ list: list })
+    }
+  },
   openDetail2(e){
     var id = e.target.dataset.item.review_id;
     dd.navigateTo({

pages/statistics/assaign/assaign.js

@@ -89,7 +89,6 @@ Page({
   },
   //选择规则
   onSelectItem(item) {
-    console.log(item)
     var strMin;
     if (item.min_point < 0) {
       var min = item.min_point.toString();

pages/statistics/workDetail/workDetail.js

@@ -148,8 +148,6 @@ Page({
     })
   },
   deleteItem(e) {
-    console.log(e)
-    console.log(this.data.process)
     dd.confirm({
       title: '提示',
       content: '确定永久删除此项?',
@@ -168,7 +166,6 @@ Page({
           } else {
             data.process = JSON.stringify(data.process);
           }
-          console.log(data.process)
           app.$post("api/integral/work", data).then((res) => {
             app.globalData.showToast(res.data.msg);
             this.getDetail(this.data.id);
@@ -197,7 +194,6 @@ Page({
         }
       })
       this.employee_me(data)
-      console.log(process)
       this.setData({
         dataDetail: data,
         total: res.data.data.process.total,

pages/workbench/my_approve/my_approve.js

@@ -148,6 +148,9 @@ Page({
     })
   },
   getData(type) {
+    this.setData({
+      dataList:[]
+    })
     app.$get("api/integral/review/list", {source_type:that.data.arrIndex,type: that.data.httpType, page: that.data.page, pt_id: 0, page_size: 20, keyword: that.data.keyword }).then((res) => {
       var list = res.data.data.list || [];
       list.forEach(element => {
@@ -157,6 +160,11 @@ Page({
       });
       var data = list;
       var dataList = that.data.dataList || [];
+      
+      // var dataList = [];
+      // if(that.data.page != 1){
+      //   dataList = that.data.dataList || [];
+      // }
       if (type == '2') {
         if (data.length < 20) {
           this.setData({