Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge branch 'dev/4.8.59_cyl' of qmx/jy into feature/v4.8.59

cuiyalong 1 жил өмнө
parent
ff18b89be4 925cce4eba
commit
383ff26aec
11 өөрчлөгдсөн 12 нэмэгдсэн , 17 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 2 2
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  2. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
  3. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  4. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_free_ent_project_news.html
  5. 1 1
      src/web/staticres/big-member/js/unit_portrayal.js
  6. 1 1
      src/web/staticres/common-module/big-member/js/client_portrayal.js
  7. 2 2
      src/web/staticres/common-module/collection/js/ent_portrait.js
  8. 1 1
      src/web/staticres/common-module/collection/js/vip-dialog.js
  9. 1 1
      src/web/templates/big-member/wx/page_free_buyer_project_news.html
  10. 1 1
      src/web/templates/big-member/wx/page_free_ent_project_news.html
  11. 0 5
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html

+ 2 - 2
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
Файл харах 

@@ -18,7 +18,7 @@ var vNode = {
 
     ), '#FF9F40']
 
 
     return {
 
-      sessKey: '$data-ent_portrait',
 
+      sessKey: '$data-ent_portrait-login-clear',
 
       conf: {
 
         isFree: true,
 
         // 权限查询是否完成
 
@@ -837,7 +837,7 @@ var vNode = {
 
             }
 
           }
 
           // 免费用户/商机管理无权限体验 看过当前企业画像数据
 
-          if (res.data.isFree || _this.powerInfo.entniche) {
 
+          if (res.data.isFree) {
 
             _this.getEntPortrait(function (res) {
 
               if (res && res.data && res.data.onTrial) {
 
                 _this.canFreeTrial = true

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
Файл харах 

@@ -19,7 +19,7 @@ var vNode = {
 
       ], false
 
     ), '#FF9F40']
 
     return {
 
-      sessKey: '$data-unit_portrait',
 
+      sessKey: '$data-unit_portrait-login-clear',
 
       tabActiveName: '1',
 
       chartLoading: true,
 
       showAll: false,

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
Файл харах 

@@ -544,7 +544,7 @@
 
         </template>
 
         <div class="module-mask-list" v-if="getStatus">
 
           <!-- 中标信息统计结果 -->
 
-          <div class="vip_component" v-if="getStatus && hideDt"
 
+          <div class="vip_component"
 
                 style="height:7.8rem;background:url('/common-module/collection/image/bg/qy-zbtj-bg.png?v={{Msg "seo" "version"}}') 40% 0 no-repeat;background-size:110% 100%;"
 
             key="dt">
 
             <vip-component @tabactive="tabActive" :power="conf" type="item_10" :can-free-exp="canFreeExp"

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_free_ent_project_news.html
Файл харах 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
 
-    <title>项目动态</title>
 
+    <title>中标动态</title>
 
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/meta.html"}}

+ 1 - 1
src/web/staticres/big-member/js/unit_portrayal.js
Файл харах 

@@ -17,7 +17,7 @@ var vNode = {
 
             ], false
 
         ), '#FF9F40']
 
         return {
 
-            sessKey: '$data-unit_portrait',
 
+            sessKey: '$data-unit_portrait-login-clear',
 
             tabActiveName: '1',
 
             chartLoading: true,
 
             showAll:false,

+ 1 - 1
src/web/staticres/common-module/big-member/js/client_portrayal.js
Файл харах 

@@ -19,7 +19,7 @@ var vNode = {
 
           ], false
 
       ), '#FF9F40']
 
       return {
 
-          sessKey: '$data-client_portrait',
 
+          sessKey: '$data-client_portrait-login-clear',
 
           tabActiveName: '1',
 
           chartLoading: true,
 
           showAll:false,

+ 2 - 2
src/web/staticres/common-module/collection/js/ent_portrait.js
Файл харах 

@@ -18,7 +18,7 @@ var vNode = {
 
     ), '#FF9F40']
 
 
     return {
 
-      sessKey: '$data-ent_portrait',
 
+      sessKey: '$data-ent_portrait-login-clear',
 
       conf: {
 
         isFree: true,
 
         // 权限查询是否完成
 
@@ -806,7 +806,7 @@ var vNode = {
 
                 }
 
 	            }
 
               // 免费用户/商机管理无权限体验 看过当前企业画像数据
 
-              if (res.data.isFree || _this.powerInfo.entniche) {
 
+              if (res.data.isFree) {
 
                 _this.getEntPortrait(function (res) {
 
                   if (res && res.data && res.data.onTrial) {
 
                     _this.canFreeTrial = true

+ 1 - 1
src/web/staticres/common-module/collection/js/vip-dialog.js
Файл харах 

@@ -235,7 +235,7 @@ var vipComponent = {
 
         // 统计信息-概况
 
         case 'item_10': {
 
           textMap.titleText = ''
 
-          textMap.btnText = this.power.isMember > 0 && this.power.arr.indexOf(4) == -1 ? '联系客服' : '免费体验'
 
+          // textMap.btnText = this.power.isMember > 0 && this.power.arr.indexOf(4) == -1 ? '联系客服' : '免费体验'
 
           textMap.headText.top = '全面透视企业历史中标项目、中标'
 
           textMap.headText.bot = '金额、客户数量'
 
           textMap.source = 'ent_portrait_bidInfoDesc'

+ 1 - 1
src/web/templates/big-member/wx/page_free_buyer_project_news.html
Файл харах 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
 
-    <title>项目动态</title>
 
+    <title>招标动态</title>
 
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/wx/meta.html"}}

+ 1 - 1
src/web/templates/big-member/wx/page_free_ent_project_news.html
Файл харах 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
 
-    <title>项目动态</title>
 
+    <title>中标动态</title>
 
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/wx/meta.html"}}

+ 0 - 5
src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html
Файл харах 

@@ -59,13 +59,8 @@
 
                 <p class="empty-text">暂无工商变动</p>
 
             </div>
 
         </div>
 
-<<<<<<< HEAD
 
-        <div class="vip_component bigVip_com" v-if="!hasPower" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
 
-            <vip-component data-cl-event="c_wx_free_buttonclick" islogin type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
 
-=======
 
         <div class="vip_component bigVip_com" v-show="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
 
             <vip-component data-cl-event="c_wx_free_buttonclick" type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png' :isLogin="true"></vip-component>
 
->>>>>>> master
 
         </div>
 
         <ul class="ent-change-list" v-else key="changeList">
 
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">