Merge branch '蓝色' into 测试

packageA/saleClue/translate.js

@@ -567,7 +567,7 @@ Page({
         });
         if (query.total != 0) {
             wx.showToast({
-                title: `查询到${query.total}条疑似重复客户信息`,
+                title: `查询到${query.total}条疑似重复客户信息,不可转化客户`,
                 icon: "none"
             })
             this.setData({

packageA/setclient/addAndEditor.js

@@ -607,7 +607,7 @@ Page({
         });
         if (query.total != 0) {
             wx.showToast({
-                title: `查询到${query.total}条疑似重复客户信息,不允许保存`,
+                title: `查询到${query.total}条疑似重复客户信息,不可` + (this.data.content.sa_customersid == 0 ? '创建' : '编辑') + '客户',
                 icon: "none"
             })
             this.setData({