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

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

@@ -102,7 +102,6 @@ var vNode = {
             },
             gotTab2: false, // 是否已经获取到tab2的数据了
             svip: false, // 判断是否是超级订阅的企业画像
-            digshow: false, // 判断是否是超级订阅会员
             overlayShow: true, // 弹窗遮罩是否显示
             isVip: false, // 只是超级订阅
             bidcollPowerInfo: {

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

@@ -676,6 +676,22 @@
             selectCate = sessionStorage.getItem(userId + "_selectCate");
             selectKeyword = sessionStorage.getItem(userId + "_selectKeyword");
             selectNotice = sessionStorage.getItem(userId + "_selectNotice");
+
+            // 判断是否需要修改某个收藏的状态
+            var listCollSessionId = sessionStorage.getItem('listCollSessionId')
+            if (listCollSessionId){
+                var listCollSessionBool = sessionStorage.getItem('listCollSessionBool')
+                if (dataCache && $.isArray(dataCache)) {
+                    dataCache.forEach(function (item) {
+                        if (item._id == listCollSessionId) {
+                            item.collection = listCollSessionBool
+                        }
+                    })
+                    sessionStorage.removeItem('listCollSessionId')
+                    sessionStorage.removeItem('listCollSessionBool')
+                }
+            }
+
             $("#list>*").remove();
             firstPage = dataCache;
             if (dataCache.length == 0) {
@@ -1161,12 +1177,6 @@ function hasNoData() {
                   continue
               }
           }
-          //收藏处理
-          if (sessionStorage.getItem('listCollSessionId')&&sessionStorage.getItem('listCollSessionId')==obj["_id"]){
-            obj["collection"] = sessionStorage.getItem('listCollSessionBool');
-    				sessionStorage.removeItem('listCollSessionId')
-    				sessionStorage.removeItem('listCollSessionBool')
-          }
           listhtml += '<div class="tslist ' + visited + '" words="' + mWords + '">'
               + '<div class="resnumb">'
               + '<div class="one">'

src/jfw/modules/weixin/src/config.json

@@ -132,6 +132,6 @@
 		"digitalExpoH5":"digitalExpo"
 	},
     "menuClickReplyText": {
-        "BusinessCoop": "剑鱼标讯-智创未来 让数据赋能决策\n\n商务合作、媒体合作、投稿\n\n联系人：剑鱼标讯商务\n微信号：jyzbsw\n"
+        "BusinessCoop": "剑鱼标讯-智创未来 让数据赋能决策\n\n商务合作、媒体合作、投稿\n\n联系人：剑鱼标讯商务\n微信号：jybxsw\n"
     }
 }

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -100,7 +100,6 @@ var vNode = {
             },
             gotTab2: false, // 是否已经获取到tab2的数据了
             svip: false, // 判断是否是超级订阅的企业画像
-            digshow: false, // 判断是否是超级订阅会员
             overlayShow: true, // 弹窗遮罩是否显示
             isVip: false, // 只是超级订阅
             bidcollPowerInfo: {

src/web/staticres/common-module/vipsubscribe/css/vip-size-template.css

@@ -20,6 +20,7 @@
 .goods-size-template .goods-list.goods-active{
   background: url(../image/goods-checked.png) no-repeat center center #fff;
   background-size: 100% 100%;
+  border-radius: 0;
 }
 .goods-size-template .goods-period{
   font-size: .26rem;

src/web/staticres/js/ent-search-index-pc.js

@@ -405,6 +405,7 @@ var vm = new Vue({
                 if (res.data.list) {
                     res.data.list.forEach(function (d) {
                         d.company_shortname = _this.getShortName(d.company_name)
+                        d.randomBgc = _this.randomBgc()
                     })
                     if (this.power) {
                         this.listState.list = res.data.list || []

src/web/templates/pc/entsearchindex.html

@@ -187,7 +187,7 @@
                             @click="toDetail(item.id)"
                             :key="item.id">
                             <div class="ei-i-left">
-                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_shortname ? item.company_shortname.slice(0,4) : item.company_name.slice(0,4) }</div>
+                                <div class="ei-i-l-container" :class="item.randomBgc">${ item.company_shortname ? item.company_shortname.slice(0,4) : item.company_name.slice(0,4) }</div>
                             </div>
                             <div class="ei-i-right">
                                 <div class="ei-r-title-container flex">

src/web/templates/weixin/historypush.html

@@ -999,6 +999,20 @@
               if (sessionStorage.closeAdvert == "true") {
                   closeAdvert = true
               }
+              // 判断是否需要修改某个收藏的状态
+              var listCollSessionId = sessionStorage.getItem('listCollSessionId')
+              if (listCollSessionId){
+                  var listCollSessionBool = sessionStorage.getItem('listCollSessionBool')
+                  if (dataCache && $.isArray(dataCache)) {
+                      dataCache.forEach(function (item) {
+                          if (item._id == listCollSessionId) {
+                              item.collection = listCollSessionBool
+                          }
+                      })
+                      sessionStorage.removeItem('listCollSessionId')
+                      sessionStorage.removeItem('listCollSessionBool')
+                  }
+              }
               $("#list>*").remove();
               count = 0;
               firstPage = dataCache;
@@ -1355,12 +1369,6 @@
               if (countLength > 1) {
                   paddingLeft = (countLength + 1) * 9;
               }
-              //收藏处理
-              if (sessionStorage.getItem('listCollSessionId')&&sessionStorage.getItem('listCollSessionId')==obj["_id"]){
-                obj["collection"] = sessionStorage.getItem('listCollSessionBool');
-        				sessionStorage.removeItem('listCollSessionId')
-        				sessionStorage.removeItem('listCollSessionBool')
-              }
               //是否浏览过
               var visited = "";
               if (obj.ca_isvisit == 1) {