Merge branch 'dev' of http://124.70.211.186:3000/sjw/YOS_wechat into dev

packageA/saleClue/change.js

@@ -56,7 +56,14 @@ Page({
             })
             if (res.msg != '成功') return;
             setTimeout(() => {
-                wx.redirectTo({
+                wx.navigateBack()
+                getCurrentPages().forEach(item => {
+                    console.log(item);
+                    if(item.__route__=='packageA/saleClue/detail') {
+                        item.getDetail()
+                    }
+                })
+                wx.navigateTo({
                     url: `/packageA/project/detail?sa_projectid=${res.data.sa_projectid}`,
                 })
             }, 300)

packageA/saleClue/detail.js

@@ -175,7 +175,28 @@ Page({
                     [`list[${index}].status`]: res.data.status
                 })
             }
-            if (res.data.status != '待跟进' && res.data.status != '跟进中') this.setData({
+
+            if (res.data.status == '已转化') {
+                tabbarList = tabbarList.filter(item => {
+                    return item.label == '编辑' || item.label == '跟进' || item.label == '转化客户' || item.label == '转化项目'
+                })
+                if (res.data.isproject == 1) {
+                    let i = tabbarList.findIndex(item => item.label == '转化项目')
+                    tabbarList.splice(i,1)
+                    console.log('触发项目');
+                }
+                if (res.data.iscustomer == 1) {
+                    let i = tabbarList.findIndex(item => item.label == '转化客户')
+                    tabbarList.splice(i,1)
+                    console.log('触发客户');
+                }
+                console.log(tabbarList);
+                this.setData({
+                    tabbarList
+                })
+            }
+
+            if (res.data.status != '待跟进' && res.data.status != '跟进中' && res.data.status != '已转化') this.setData({
                 tabbarList: []
             })
             this.getTags();

packageA/saleClue/translate.js

@@ -346,7 +346,13 @@ Page({
                 let pages = getCurrentPages();
                 if (pages[pages.length - 2].__route__ == 'packageA/saleClue/detail') {
                     wx.navigateBack();
-                    wx.redirectTo({
+                    getCurrentPages().forEach(item => {
+                        console.log(item);
+                        if(item.__route__=='packageA/saleClue/detail') {
+                            item.getDetail()
+                        }
+                    })
+                    wx.navigateTo({
                         url: '/packageA/setclient/detail?id=' + res.data.sa_customersid,
                     })
                 }