Merge branch 'release4.7.10' of http://192.168.3.207:8080/qmx/jy into release4.7.10

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -408,14 +408,14 @@ Vue.component('keep-component', {
       }
       if (type) {
         $.post('/salesLeads/retainedCapital' + '?source=article_collection', { source: 'article_collection' }).done(function (r) {
-          var checkKeys = ['name', 'phone', 'company', 'mail', 'branch', 'position']
+          var checkKeys = ['name', 'phone', 'company', 'mail', 'branch', 'position', 'companyType']
           var result = checkRequiredKeys(checkKeys, r.info)
           // 判断当前信息否在其他页面留资  如果全部留资 直接弹窗提交成功
-          if (result) {
+          if (result || !window.isFree) {
             return tempFn()
           }
           if (r && r.data) {
-            if (r.data.retainedCapital) {
+            if (r.data.retainedCapital || !result) {
               _this.$dialog.close()
               _this.$dialog.confirm({
                 message: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',

src/web/templates/weixin/search/mainSearch.html

@@ -1104,6 +1104,7 @@
     url:'/bigmember/use/isAdd?t' + new Date().getTime(),
     success: function (r) {
       if (r && r.data) {
+        window.isFree = res.data.isFree
         if ($.isArray(r.data.power)) {
           if (r.data.power.length>0&&(r.data.power.indexOf(4) !== -1||r.data.power.indexOf(13) !== -1||r.data.power.indexOf(12) !== -1)){
             isMember = true;