采购单位搜索修改

src/entnichePc.json

@@ -1,4 +1,4 @@
 {
-	"entnichePcUser": [14595,442,1686,1685,1711],
+	"entnichePcUser": [14595,442,1686,1685,1711,14594],
 	"hideEntnicheMenu": [1711,442]
 }

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

@@ -229,8 +229,8 @@ var vNode = {
     created () {
       this.getPowerInfo()
       this.getNewEntNiche()
-      this.getActionState(utils.getParam('entName'), 'g')
-      this.getActionState(utils.getParam('entName'), 'r')
+      this.getActionState(decodeURIComponent(utils.getParam('entName')), 'g')
+      this.getActionState(decodeURIComponent(utils.getParam('entName')), 'r')
     },
     mounted: function () {
         this.buyer.name = decodeURIComponent(utils.getParam('entName'))
@@ -482,7 +482,7 @@ var vNode = {
           let _this = this
           let params = {
             "userId": 123,
-            "name": utils.getParam('entName'), //采购单位名称
+            "name": decodeURIComponent(utils.getParam('entName')), //采购单位名称
             "province": this.detailObj.province, //省份
             "city": this.detailObj.city, //区域
             "mold": 0, //1 认领；默认 0关注
@@ -491,7 +491,7 @@ var vNode = {
           if(str == 'r') {
             params = {
               "userId": 123,
-              "name": utils.getParam('entName'), //采购单位名称
+              "name": decodeURIComponent(utils.getParam('entName')), //采购单位名称
               "province": this.detailObj.province, //省份
               "city": this.detailObj.city, //区域
               "mold": 1, //1 认领；默认 0关注

src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -1671,6 +1671,10 @@ html, body {
   font-size: 12px;
   align-self: center;
 }
+.icon_ent{
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAA4xJREFUWEfVl0+IHEUUxr9X1dXr7kz3jrtBNBCCwchqFD0pSFDIwUMOMZFkwvYEQkAJRPQSELwkIScvQYgYiIQIcacjS9SQoCDxYIIIycUorob456AIIcnqbM/s6vafejKts8zM9kwXY2SxT03Ve9/71VdVXdWEFX5ohevjfwTgBxMK2AiQ7O8aJxHwOTz3mom7Zg74wYQFHBG5xVslOQmB/SYQRgDKD14g0HaTES0hgM9EnnsiL8cQoLGHwDvzxNr7mcmPKsVTeTlGALI6v1mSfiVPrL0/YXE0qRQ+zssxAlDVuSeIxOE8sU4H9IGoMnolL8cIANXaOpvksTyx9v6Qk32olH7KyzEDmJp1bWFP54l1AOiwjF3jQV6OGQAAyw/OCZCdJ9js1+A/Ys/dZhJrDjBVe00I+YyJqAZ/Fnvu6yaxxgA4zko587sYvCYVZi6REGN/v2IW4LnmO4F+iRYLp7GH/ryzAF1qqtp4HIKfTps1XYoqxasmBbtjzB1YEYBpthEtPCoF7l02Oh2XhBDjqQFaz0JYtY4Ygk6A2xAjX6FMYS93ejvw1s2iHBvZLsDuINa2cjQoSOTCGZTvaWTp9ASw3ms8S8wT/6Z4K5cFfRvvLH5qDjDNUiULLwLaThixXqQPMFaYbxdQC8HDgHgybSN5JRoenuko8Nutghoafh4EK2Es6sni2yBis0X47vx9ytI70vll8XPiFc52J5rsAlkNnhOC1jZzIynfR3nk1/4Ah1io+2uPwRaPMCi1n1l8l3D8ESql39PkUzcKSg5vIIEHNGhDs0mAZ1jjhyh0v17a/1OzrhRDW4j0Q6lJjOuE+Mvw+t3f4BDpFkjHGpD+3KSE2N1NycCPkee81Gy3/PoBATyVNZ8a+nLsjR5s9im/fpSABzPiToaes3SudAAov76XgIxvOCdh3dmKvRT1B8Dl2HMO4h2+yx5qLJu21FHgw8hzjmc60BsACBHuhzc+o6aC3SRoMssBbl3DqnPrbRJvZscMCKCZ3ogrxU8sv7ZJQL6aPQXJkdgrXeh3gxrYAQbORZ5zrN/lJGT9Miqj3yu/vo+ALQM40PvyqYEvYs853DwVbad+tvv/QIPDeNEpN3dBv3WyNE3/0HV+Cf1glQK2Zv18RJxcaF2xLL++iYD17SNk4FrsORfTttO3Vise2rxch8II+jw893bmIsyy7L9uG/g4vlNgKw7wF7v/aDBG3bhnAAAAAElFTkSuQmCC) no-repeat;
+  background-size: contain;
+}
 /* .app-layout-header .switch-vip:before,.app-layout-header .only-vip:before{
   content: "";
   width: 15px;
@@ -1959,7 +1963,7 @@ html, body {
   color: #171826;
   line-height: 22px;
 }
-.product-switch .vipproduct,.entniche{
+.product-switch .vipproduct,.bigmember{
   box-shadow: 0px 1px 0px 0px rgba(0,0,0,0.05) inset, 16px 0px 0px 0px #ffffff inset;
 }
 .product-switch .icon-blue-duihao{

src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -209,6 +209,8 @@ var vm = new Vue({
         $(".switch").addClass('only-vip')
         $(".switch .user_pro").text("商机管理")
         $(".switch_right").addClass('right_zj')
+        $('.user_pro').css('color', '#171826')
+        $(".switch .switch_icon").addClass('icon_ent')
         this.selectPro = 3
         // this.ajaxUrl = '/publicapply/subscribe/historyPush?t=' + new Date().getTime()
       }
@@ -449,6 +451,17 @@ var vm = new Vue({
               $.post("/subscribepay/report/tip?t=" + new Date().getTime(), {type:"vip"}, function (r) {
               	reportHtml(r);
            	  });
+            } else if (res.data.vt == 's') {
+              productType = 3
+              historyVt = 's'
+              sessionStorage.setItem('switch-product', 'entniche')
+              _this.RemoveClass('vip')
+              $(".switch").addClass('only-vip')
+              $(".switch .user_pro").text("商机管理")
+              $(".switch_right").addClass('right_zj')
+              $('.user_pro').css('color', '#171826')
+              $(".switch .switch_icon").addClass('icon_ent')
+              _this.selectPro = 3
             }
             if(switchProduct == 'bigmember' && _this.rootInfo.isSubCount) {
             	$('#sub_manager').hide();

src/jfw/modules/app/src/web/templates/big-member/page_client_list.html

@@ -511,7 +511,7 @@
                 //         sid:sid
                 //     }
                 // sessionStorage.setItem('bigvip-fid',JSON.stringify(objId))
-                window.location.href = './client_portrayal?entName=' + item.name
+                window.location.href = './client_portrayal?entName=' + item.name + '&from=client'
             },
             //计算时差
             timeDiff:function (date) {

src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -71,7 +71,7 @@
                         onclick="window.location.href = '/jyapp/front/myorder/toEntnicheDetail?order_code={{.T.orderCode}}'">
                     查看订单
                 </button>
-                <button class="right_btn" onclick="window.location.href = '/page_entniche/home'">
+                <button class="right_btn" onclick="window.location.href = '/page_entniche/ent/enterprise'">
                     去使用
                 </button>
             </div>

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

@@ -244,7 +244,7 @@
           <span class="icon-blue-duihao" v-if="selectPro == 3"></span>
       </div>
     </div>
-    <div class="typeswitch" @click="proClick('big')">
+    <div class="typeswitch bigmember" @click="proClick('big')">
         <div class="type-left">
             <img :src="iconbm" class="icon-bm" alt="">
             <span class="bm-text">大会员</span>
@@ -814,6 +814,10 @@
         $("#sub_manager").click(function() {
             setSessionStorage();
             sessionStorage.setItem(vm.sessStorageKey, JSON.stringify(vm.$data))
+            if(historyVt == 's') {
+              location.href = '/page_entniche/page/sub_management/sub_management_system.html'
+              return
+            }
             let thisType = sessionStorage.getItem('userIsNew')
             if (window.userNewType || thisType) {
                 location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
@@ -1727,6 +1731,10 @@ function hasNoData() {
           async: false,
           dataType: 'json',
           success: function (data) {
+            if(!data.data) {
+              hasNoData
+              return
+            }
               pageIndex = 2;
               lasttime = data.thistime;
               firstPage = data.data;

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -2191,7 +2191,11 @@
             landname: $(this).text()
         }))
         SuperSearch.setSessionStorage()
-        location.href = "/jyapp/big/page/unit_portrayal?entName="+encodeURIComponent($(this).text())
+        if(SuperSearch.isEntNicheNew) {
+          location.href = "/jyapp/big/page/client_portrayal?entName="+encodeURIComponent($(this).text()) + '&from=client'
+        } else {
+          location.href = "/jyapp/big/page/unit_portrayal?entName="+encodeURIComponent($(this).text())
+        }
     }
 
     function setOnlyCookie () {