Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_portrayal.js

@@ -497,6 +497,8 @@ var vNode = {
                   } else {
                     _this.claim = !_this.claim
                   }
+                } else {
+                  _this.$toast(res.error_msg)
                 }
                 // this.getActionState(utils.getParam('entName'), 'g')
                 // this.getActionState(utils.getParam('entName'), 'r')

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1070,6 +1070,7 @@
                   $('.commonUser').hide()
                   $('.entnicheUser').show()
                   getActionState ({{.T.obj.buyer}}, 'g')
+                  getActionState ({{.T.obj.buyer}}, 'r')
                 }
                 if (window.isFree){
                   checkShowDialog()
@@ -1251,11 +1252,11 @@
             console.log(res)
             if(res.data.iscoll) {
               claimData = true
-              $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
+              // $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
               $('.icon-claim-text').text('已认领')
             } else {
               claimData = false
-              $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
+              // $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
               $('.icon-claim-text').text('认领客户')
             }
           }
@@ -1286,8 +1287,6 @@
       }
     }
 
-    getActionState ({{.T.obj.buyer}}, 'r')
-
     // 商机管理---认领
     function setClientClaim (e) {
       e.preventDefault()
@@ -1314,9 +1313,10 @@
             if(res.error_code == 0) {
               if(res.data) {
                 if(claimData) {
-                  $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
+                  // $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
                 } else {
-                  $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
+                  $('.icon-claim-text').text('已认领')
+                  // $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
                 }
               }
             }
@@ -1327,7 +1327,7 @@
 
     function setportain (e) {
       e.preventDefault()
-      location.href = '/jyapp/big/page/client_portrayal?entName=' + encodeURIComponent({{.T.obj.buyer}})
+      location.href = '/jyapp/big/page/client_portrayal?entName=' + encodeURIComponent({{.T.obj.buyer}}) + '&from=client'
     }
     function downFileOfVIP (fileName, callback) {
         // 有下载次数
@@ -1882,7 +1882,7 @@
           buyertel_show = "hide"
       }
       outhtml +='<li class="caigouunit commonUser"><p class="name">采购单位</p><div class="unitcenter"><p  class="textcontent">'+rerbuyer+'</p><div class="unitbtn '+rerbuyer_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></div></li>'
-      outhtml +='<li class="entnicheUser"><p class="name">采购单位</p><div class="unitcenter sum_caigou client_caigou"><p  class="textcontent">'+rerbuyer+'</p><div class="sum_right"><div class="claim" onClick="setportain(event)"><span class="j-icon icon-porait"></span><span class="getproit">查看画像</span></div><span class="columnLine"></span><div class="claim clientClaim" onClick="setClientClaim(event)"><span class="j-icon icon_state icon-add-claim"></span><span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span></div></div></div></li>'
+      outhtml +='<li class="entnicheUser"><p class="name">采购单位</p><div class="unitcenter sum_caigou client_caigou"><p  class="textcontent">'+rerbuyer+'</p><div class="sum_right"><div class="claim" onClick="setportain(event)"><span class="j-icon icon-porait"></span><span class="getproit" style="color:#2ABED1">查看画像</span></div><span class="columnLine"></span><div class="claim clientClaim" onClick="setClientClaim(event)"><span class="j-icon icon_state icon-add-claim"></span><span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span></div></div></div></li>'
       outhtml +='<li><p class="name">采购联系人</p><p class="textcontent">'+rerbuyerperson+'</p></li>'+
           '<li class="bbm0"><p class="name">采购电话</p><p class="textcontent">'+rerbuyertel+'</p><a class="border-tel_ '+buyertel_show+'" style="position: static;display:block" datalink="/jyapp/vipsubscribe/introducePage"><div class="tel"></div></a></li>'
       if(packageCon==""){

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -1061,11 +1061,10 @@ window.vBuyerSearchComponent = new Vue({
       keytimer: '',
       keyWordList: [], // 关键词列表
       keyContent: '请选择业务范围',
-      selectEntList: ''
+      selectEntList: '请选择企业历史客户'
     }
   },
-  created () {
-    this.selectEntList ='请选择企业历史客户'
+  mounted () {
     this.keytimer = new Date().getTime()
   },
   computed: {
@@ -1297,7 +1296,7 @@ window.vBuyerSearchComponent = new Vue({
                 })
               })
               _this.conditionStrMap.business_scope = getArr
-              _this.keyContent = '已选' + this.formatterContent(getArr)
+              _this.keyContent = '已选' + _this.formatterContent(getArr)
             } else {
               _this.keyContent = '请选择业务范围'
             }