Browse Source

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

cuiyalong 1 năm trước cách đây
mục cha
commit
72b2a1abb4
30 tập tin đã thay đổi với 79 bổ sung104 xóa
  1. 5 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css
  2. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/chart_options.js
  3. 4 28
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  4. 3 3
      src/jfw/modules/app/src/web/templates/big-member/page_client_high_set.html
  5. 2 2
      src/jfw/modules/app/src/web/templates/big-member/page_free_high_set.html
  6. 3 3
      src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html
  7. 5 0
      src/web/staticres/big-member/css/unit_portrayal.css
  8. 1 1
      src/web/staticres/big-member/js/chart_options.js
  9. 2 2
      src/web/staticres/common-module/big-member/js/client_buyer-example.js
  10. 5 2
      src/web/staticres/common-module/big-member/js/client_high_set.js
  11. 5 2
      src/web/staticres/common-module/big-member/js/high_set.js
  12. BIN
      src/web/staticres/common-module/collection/image/bg/qy-zbtj.png
  13. BIN
      src/web/staticres/common-module/collection/image/bg/vip_ex_2.png
  14. BIN
      src/web/staticres/common-module/collection/image/bg/vip_ex_3.png
  15. BIN
      src/web/staticres/common-module/collection/image/bg/vip_ex_5.png
  16. BIN
      src/web/staticres/common-module/collection/image/buyer/02.png
  17. BIN
      src/web/staticres/common-module/collection/image/buyer/03.png
  18. BIN
      src/web/staticres/common-module/collection/image/buyer/06.png
  19. BIN
      src/web/staticres/common-module/collection/image/buyer/cg-tjxx.png
  20. 4 4
      src/web/staticres/common-module/collection/js/buyer-example.js
  21. 1 1
      src/web/staticres/common-module/collection/js/chart_options.js
  22. 2 26
      src/web/staticres/common-module/collection/js/ent_portrait.js
  23. 7 6
      src/web/staticres/common-module/collection/js/history-project-client.js
  24. 7 6
      src/web/staticres/common-module/collection/js/history-project.js
  25. 2 2
      src/web/staticres/common-module/collection/js/vip-dialog.js
  26. 1 1
      src/web/staticres/common-module/collection/js/years-picker-mobile.js
  27. 8 8
      src/web/staticres/common-module/perfect-info/js/perfect-info.js
  28. 3 3
      src/web/templates/big-member/wx/page_free_high_set.html
  29. 3 3
      src/web/templates/big-member/wx/page_unit_portrayal.html
  30. 5 0
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

+ 5 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css

@@ -690,3 +690,8 @@
     display: block;
     width: 100%;
 }
+
+.module-mask-list .vip_component,
+.zb-analysis-module {
+    margin-bottom: .08rem;
+}

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/chart_options.js

@@ -544,7 +544,7 @@ var chartOptions = {
     },
     // 折线图
     lineChart:{
-        color:['#05A6F3','#0BD991','#FF9F40'],
+        color:['#05A6F3','#0BD991','#8E6DF2','#5B6E96','#F1682D','#FB3AFF'],
         xAxis:{
             axisLabel:{
                 textStyle: {

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

@@ -310,24 +310,7 @@ var vNode = {
     },
     // 监听画像页面滚动
     onEntScroll: utils.debounce(function () {
-      if (!this.freeWinnerOpen) return // 没有开通超级订阅广告位banner return
-      var scrollTop = this.$refs.container.scrollTop // 画像页面父dom滚动距离
-      var offSetTop = this.$refs.setRef.offsetTop // 中标分析-高级分析设置距顶部距离
-      var bannerHeight = this.$refs.bannerRef.offsetHeight // 广告位banner高度
-      if (scrollTop >= offSetTop - bannerHeight) {
-        $('.banner-sticky').css({
-          "position": "fixed",
-          'top': '33.67vw',
-          "z-index": '9999'
-        })
-      } else {
-        $('.banner-sticky').css({
-          "position": "static"
-        })
-        $('.win-analyse').css({
-          "margin-top": '.24rem'
-        })
-      }
+      // do something
     }, 50),
     scrollHeight: function () {
       var storageClick = JSON.parse(sessionStorage.getItem('is-click-set'))
@@ -336,15 +319,7 @@ var vNode = {
         this.$nextTick(function () {
           // 有开通超级订阅banner时
           if (this.freeWinnerOpen) {
-            document.querySelector('.banner-sticky').scrollIntoView()
-            $('.banner-sticky').css({
-              "position": "fixed",
-              'top': '33.67vw',
-              "z-index": '9999'
-            })
-            $('.win-analyse').css({
-              "margin-top": '2rem'
-            })
+            // do something
           } else {
             // document.querySelector('.project-news.tab-card').scrollIntoView()
             this.$refs.scrollspyTabs.scrollTo('4')
@@ -1440,6 +1415,7 @@ var vNode = {
     },
     savePageState: function () {
       this.scrollTop = $('#ent-portrait').scrollTop()
+      var scrollTopOffset = 0 // 滚动误差
       var data = {
         conf: this.conf,
         tabActiveName: this.tabActiveName,
@@ -1448,7 +1424,7 @@ var vNode = {
         topProject: this.topProject,
         entPortraitInfo: this.entPortraitInfo,
         powerInfo: this.powerInfo,
-        scrollTop: this.scrollTop,
+        scrollTop: this.scrollTop + scrollTopOffset,
         gotTab2: this.gotTab2
       }
       sessionStorage.setItem(this.sessKey, JSON.stringify(data))

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_client_high_set.html

@@ -77,7 +77,7 @@
             <van-cell title="行业" is-link :value="conf.industry" @click="popClick('industry')"></van-cell>
           </div>
           <div class="years-container">
-            <span class="year-label">分析年份</span>
+            <span class="year-label">发布时间</span>
             <van-field class="year-input" :class="conf.start ? 'border-active' : ''" v-model="conf.start" readonly @click="popClick('start')"></van-field>
             <em style="color: #ccc;">—</em>
             <van-field class="year-input"  :class="conf.end ? 'border-active' : ''" v-model="conf.end" readonly @click="popClick('end')"></van-field>
@@ -109,10 +109,10 @@
               <industry-component class="j-main fix-ios-scroll" ref="industryCom" :selectindustrylist="selectIndustryList" onlyshowsome= "true" @cancel="onCancel" @confirm="onConfirm"></industry-component>
             </div>
             <div v-show="popInfo.type == 'start'">
-              <years-component ref="yearsItem" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-start" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
             <div v-show="popInfo.type == 'end'">
-              <years-component ref="yearsItem" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-end" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
           </div>
         </van-popup>

+ 2 - 2
src/jfw/modules/app/src/web/templates/big-member/page_free_high_set.html

@@ -113,10 +113,10 @@
               <buyerclass-component class="j-main fix-ios-scroll" ref="buyerclassCom" :selected-list="selectedBuyerclassList" @cancel="onCancel" @confirm="onConfirm"></industry-component>
             </div>
             <div v-show="popInfo.type == 'start'">
-              <years-component ref="yearsItem" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-start" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
             <div v-show="popInfo.type == 'end'">
-              <years-component ref="yearsItem" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-end" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
           </div>
         </van-popup>

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -230,7 +230,7 @@
                   </div>
                 </div>
                 <div class="module-notice-tip">注:1个项目如同时发布了预告、招标、中标等多条公告,则有多条数据</div>
-                <div v-if="getStatus" class="tab-card-content vip_component" style="height:7.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
+                <div v-if="getStatus" class="tab-card-content vip_component" style="height:8.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
                   <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_14" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/cg-zbdt.png?v={{Msg "seo" "version"}}'></buyer-example>
                 </div>
                 <div class="tab-card-content" v-else>
@@ -580,7 +580,7 @@
                 </div>
               </template>
               <!-- 遮罩部分 -->
-              <div v-if="getStatus">
+              <div class="module-mask-list" v-if="getStatus">
       <!--            统计信息-->
               <div class="vip_component" style="height:7.56rem;background:#fff url('/common-module/collection/image/buyer/cg-tjxx-bg.png?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%">
                   <p class="example-title">概况</p>
@@ -624,7 +624,7 @@
                 </div>
                 <!-- 采购规模分布 -->
                 <div class="vip_component"
-                  style="height:10.8rem;background:url('/common-module/collection/image/buyer/04-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+                  style="height:11.5rem;background:url('/common-module/collection/image/buyer/04-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
                   <p class="example-title">采购规模分布</p>
                   <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_4"
                     imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/04.png?v={{Msg "seo" "version"}}'>

+ 5 - 0
src/web/staticres/big-member/css/unit_portrayal.css

@@ -629,3 +629,8 @@
     display: block;
     width: 100%;
 }
+
+.module-mask-list .vip_component,
+.zb-analysis-module {
+    margin-bottom: .08rem;
+}

+ 1 - 1
src/web/staticres/big-member/js/chart_options.js

@@ -544,7 +544,7 @@ var chartOptions = {
     },
     // 折线图
     lineChart:{
-        color:['#05A6F3','#0BD991','#FF9F40'],
+        color:['#05A6F3','#0BD991','#8E6DF2','#5B6E96','#F1682D','#FB3AFF'],
         xAxis:{
             axisLabel:{
                 textStyle: {

+ 2 - 2
src/web/staticres/common-module/big-member/js/client_buyer-example.js

@@ -98,8 +98,8 @@ var buyerExample = {
         }
         // 月度采购规模统计
         case 'item_3': {
-          textMap.headText.top = '通过纵向对比近3年月度中标金额,'
-          textMap.headText.bot = '快速分析行业月度采购趋势!'
+          textMap.headText.top = '纵向对比采购单位各个年份月度采购规模,'
+          textMap.headText.bot = '不错过任何商机!'
           textMap.source = 'buyer_portrait_monthData_freeuser'
           break
         }

+ 5 - 2
src/web/staticres/common-module/big-member/js/client_high_set.js

@@ -419,8 +419,11 @@ var highSet = new Vue({
       } else if (data.name == 'industryItem') {
         this.$refs.industryCom.setState([])
         this.$refs.industryCom.canClick = false
-      } else if (data.name == 'dateItem') {
-        
+      } else if (data.name == 'year') {
+        if (data.type === 'start') {
+          this.$refs['yearsItem-start'].defaultIndex = this.$refs['yearsItem-start'].initDefaultIndex('2018年')
+          this.$refs['yearsItem-start'].selectedYear = '2018年'
+        }
       }
     },
     onConfirm: function (data) {

+ 5 - 2
src/web/staticres/common-module/big-member/js/high_set.js

@@ -433,8 +433,11 @@ var highSet = new Vue({
       } else if (data.name == 'industryItem') {
         this.$refs.industryCom.setState([])
         this.$refs.industryCom.canClick = false
-      } else if (data.name == 'dateItem') {
-
+      } else if (data.name == 'year') {
+        if (data.type === 'start') {
+          this.$refs['yearsItem-start'].defaultIndex = this.$refs['yearsItem-start'].initDefaultIndex('2018年')
+          this.$refs['yearsItem-start'].selectedYear = '2018年'
+        }
       }
     },
     onConfirm: function (data) {

BIN
src/web/staticres/common-module/collection/image/bg/qy-zbtj.png


BIN
src/web/staticres/common-module/collection/image/bg/vip_ex_2.png


BIN
src/web/staticres/common-module/collection/image/bg/vip_ex_3.png


BIN
src/web/staticres/common-module/collection/image/bg/vip_ex_5.png


BIN
src/web/staticres/common-module/collection/image/buyer/02.png


BIN
src/web/staticres/common-module/collection/image/buyer/03.png


BIN
src/web/staticres/common-module/collection/image/buyer/06.png


BIN
src/web/staticres/common-module/collection/image/buyer/cg-tjxx.png


+ 4 - 4
src/web/staticres/common-module/collection/js/buyer-example.js

@@ -85,8 +85,8 @@ var buyerExample = {
       switch (this.type) {
           // 历史项目联系方式
         case 'item_1': {
-          textMap.headText.top = '采购单位项目动态全面获取,帮助企业'
-          textMap.headText.bot = '洞察采购需求,开发新客户!',
+          textMap.headText.top = '获取采购单位联系人信息,一键拨打!'
+          textMap.headText.bot = '',
           textMap.source = 'buyer_portrait_contacts_freeuser'
           break
         }
@@ -99,8 +99,8 @@ var buyerExample = {
         }
           // 月度采购规模统计
         case 'item_3': {
-          textMap.headText.top = '通过纵向对比近3年月度中标金额,'
-          textMap.headText.bot = '快速分析行业月度采购趋势!'
+          textMap.headText.top = '纵向对比采购单位各个年份月度采购规模,'
+          textMap.headText.bot = '不错过任何商机!'
           textMap.source = 'buyer_portrait_monthData_freeuser'
           break
         }

+ 1 - 1
src/web/staticres/common-module/collection/js/chart_options.js

@@ -544,7 +544,7 @@ var chartOptions = {
     },
     // 折线图
     lineChart:{
-        color:['#05A6F3','#0BD991','#FF9F40'],
+        color:['#05A6F3','#0BD991','#8E6DF2','#5B6E96','#F1682D','#FB3AFF'],
         xAxis:{
             axisLabel:{
                 textStyle: {

+ 2 - 26
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -311,23 +311,7 @@ var vNode = {
     // 监听画像页面滚动
     onEntScroll: utils.debounce(function(){
       if (!this.freeWinnerOpen) return // 没有开通超级订阅广告位banner return
-      var scrollTop = this.$refs.container.scrollTop // 画像页面父dom滚动距离
-      var offSetTop = this.$refs.setRef.offsetTop // 中标分析-高级分析设置距顶部距离
-      var bannerHeight = this.$refs.bannerRef.offsetHeight // 广告位banner高度
-      if (scrollTop >= offSetTop - bannerHeight) {
-        $('.banner-sticky').css({
-          "position": "fixed",
-          'top': '46px',
-          "z-index": '9999'
-        })
-      } else {
-        $('.banner-sticky').css({
-          "position": "static"
-        })
-        $('.win-analyse').css({
-          "margin-top": '.24rem'
-        })
-      }
+      // do something
     }, 50),
     scrollHeight: function () {
       var storageClick = JSON.parse(sessionStorage.getItem('is-click-set'))
@@ -336,15 +320,7 @@ var vNode = {
         this.$nextTick(function(){
           // 有开通超级订阅banner时
           if (this.freeWinnerOpen) {
-            document.querySelector('.banner-sticky').scrollIntoView()
-            $('.banner-sticky').css({
-              "position": "fixed",
-              'top': '46px',
-              "z-index": '9999'
-            })
-            $('.win-analyse').css({
-              "margin-top": '2rem'
-            })
+            // do something
           } else {
             // document.querySelector('.project-news.tab-card').scrollIntoView()
             this.$refs.scrollspyTabs.scrollTo('4')

+ 7 - 6
src/web/staticres/common-module/collection/js/history-project-client.js

@@ -51,7 +51,7 @@ var historyProTemplate = `
             <div class="image">
                 <img src="/common-module/public/image/jy-back.png">
             </div>
-            <div class="empty-main tip-text2">{{ afterFiltering ? '对不起,没有匹配到相关数据' : '暂无数据' }}</div>
+            <div class="empty-main tip-text2">{{ hisData.afterFiltering ? '对不起,没有匹配到相关数据' : '暂无数据' }}</div>
         </div>
       </div>
   </div>
@@ -98,6 +98,8 @@ var hisproComponent = {
       // 原始数据源
       list:  [],
       hisData: {
+        // 当前list是否为concatVal的搜索结果
+        afterFiltering: false,
         end: 3,
         showMoreBtn: false
       },
@@ -106,11 +108,6 @@ var hisproComponent = {
       filterList: []
     }
   },
-  computed: {
-    afterFiltering: function () {
-        return !!this.contactVal
-    }
-  },
   watch: {
     'entName': function (val) {
       if (val) {
@@ -122,6 +119,9 @@ var hisproComponent = {
     this.getData()
   },
   methods: {
+    changeAfterFiltering: function (f) {
+      this.hisData.afterFiltering = f
+    },
     onClearFn: function () {
       this.contactVal = ''
       this.onSearchFn()
@@ -145,6 +145,7 @@ var hisproComponent = {
         }
         _this.filterList = _this.list
       }
+      _this.changeAfterFiltering(!!this.contactVal)
     },
     isClick: function (str) {
       return str.indexOf('企业年报') === -1

+ 7 - 6
src/web/staticres/common-module/collection/js/history-project.js

@@ -52,7 +52,7 @@ var historyProTemplate = `
             <div class="image">
                 <img src="/common-module/public/image/jy-back.png">
             </div>
-            <div class="empty-main tip-text2">{{ afterFiltering ? '对不起,没有匹配到相关数据' : '暂无数据' }}</div>
+            <div class="empty-main tip-text2">{{ hisData.afterFiltering ? '对不起,没有匹配到相关数据' : '暂无数据' }}</div>
         </div>
       </div>
     </div>
@@ -96,6 +96,8 @@ var hisproComponent = {
             // 原始数据源
             list: [],
             hisData: {
+                // 当前list是否为concatVal的搜索结果
+                afterFiltering: false,
                 end: 3,
                 showMoreBtn: false
             },
@@ -104,11 +106,6 @@ var hisproComponent = {
             filterList: []
         }
     },
-    computed: {
-        afterFiltering: function () {
-            return !!this.contactVal
-        }
-    },
     watch: {
       'entName': function (val) {
         if (val) {
@@ -120,6 +117,9 @@ var hisproComponent = {
         this.getData()
     },
     methods: {
+        changeAfterFiltering: function (f) {
+            this.hisData.afterFiltering = f
+        },
         onClearFn: function () {
           this.contactVal = ''
           this.onSearchFn()
@@ -143,6 +143,7 @@ var hisproComponent = {
             }
             _this.filterList = _this.list
           }
+          _this.changeAfterFiltering(!!this.contactVal)
         },
         isClick: function (str) {
           return str.indexOf('企业年报') === -1

+ 2 - 2
src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -165,7 +165,7 @@ var vipComponent = {
         case 'item_3': {
           textMap.titleText = '开通大会员'
           // textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
-          textMap.headText.top = '纵向对比采购单位近三年月度采购规模,'
+          textMap.headText.top = '纵向对比采购单位各个年份月度采购规模,'
           textMap.headText.bot = '不错过任何商机!'
           textMap.source = 'ent_portrait_monthData_freeuser'
           break
@@ -183,7 +183,7 @@ var vipComponent = {
         case 'item_5': {
           textMap.titleText = '开通大会员'
           // textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
-          textMap.headText.top = '通过近3年各类客户平均折扣率范围,'
+          textMap.headText.top = '通过各个年份各类客户平均折扣率范围,'
           textMap.headText.bot = '透视企业的行业盈利能力!'
           textMap.source = 'ent_portrait_discountRate_freeuser'
           break

+ 1 - 1
src/web/staticres/common-module/collection/js/years-picker-mobile.js

@@ -78,7 +78,7 @@ var yearsComponent = {
         this.defaultIndex = this.initDefaultIndex(this.years,new Date().getFullYear() + '年')
         this.selectedYear = new Date().getFullYear() + '年'
       }
-      this.$emit('cancel')
+      this.$emit('cancel', { name: 'year', type: this.type })
     },
     // 筛选条件确认按钮
     onConfirm: function(){

+ 8 - 8
src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -1,5 +1,5 @@
-var freeBuyerText = '请留下联系方式,我们会尽快联系您!体验采购单位画像分析,为你挖掘客户!'
-var freeEntText = '请留下联系方式,我们会尽快联系您!体验企业画像分析,帮你透视企业!'
+var freeBuyerText = '请留下联系方式,立即免费体验【采购单位全景分析】1次,帮你全面洞察采购单位,开发新客户!'
+var freeEntText = '请留下联系方式,立即免费体验【企业中标分析】1次,多维度可视化分析竞争对手!'
 var freeAttachText = '请留下联系方式,立即免费体验【附件下载】1次,招标文件/采购清单一键下载,商机更完整!'
 var analysisTipText = '请完善个人信息,辅助你做投标决策及报价参考!'
 
@@ -1076,12 +1076,12 @@ var vNode = {
                 // 免费用户体验
                 if (source.indexOf('_freeuser') > -1) {
                   var text = ''
-                  // if (source.indexOf('buyer_portrait') > -1) {
-                  //   text = '采购单位全景分析'
-                  // }
-                  // if (source.indexOf('ent_portrait') > -1) {
-                  //   text = '企业中标分析'
-                  // }
+                  if (source.indexOf('buyer_portrait') > -1) {
+                    text = '采购单位全景分析'
+                  }
+                  if (source.indexOf('ent_portrait') > -1) {
+                    text = '企业中标分析'
+                  }
                   if (source.indexOf('article_attach') > -1) {
                     text = '附件下载'
                   }

+ 3 - 3
src/web/templates/big-member/wx/page_free_high_set.html

@@ -78,7 +78,7 @@
             <van-cell title="采购单位类型" v-if="showBuyerClassCell" is-link :value="conf.buyerclass" @click="popClick('buyerclass')"></van-cell>
           </div>
           <div class="years-container">
-            <span class="year-label">分析年份</span>
+            <span class="year-label">发布时间</span>
             <van-field class="year-input" :class="conf.start ? 'border-active' : ''" v-model="conf.start" readonly @click="popClick('start')"></van-field>
             <em style="color: #ccc;">—</em>
             <van-field class="year-input"  :class="conf.end ? 'border-active' : ''" v-model="conf.end" readonly @click="popClick('end')"></van-field>
@@ -113,10 +113,10 @@
               <buyerclass-component class="j-main fix-ios-scroll" ref="buyerclassCom" :selected-list="selectedBuyerclassList" @cancel="onCancel" @confirm="onConfirm"></industry-component>
             </div>
             <div v-show="popInfo.type == 'start'">
-              <years-component ref="yearsItem" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-start" type="start" :cur-year="conf.start" :years="startRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
             <div v-show="popInfo.type == 'end'">
-              <years-component ref="yearsItem" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
+              <years-component ref="yearsItem-end" type="end" :cur-year="conf.end" :years="endRange" @cancel="onCancel" @confirm="onConfirm"></years-component>
             </div>
           </div>
         </van-popup>

+ 3 - 3
src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -384,7 +384,7 @@
                             </div>
                         </div>
                         <div class="module-notice-tip">注:1个项目如同时发布了预告、招标、中标等多条公告,则有多条数据</div>
-                        <div v-if="getStatus" class="vip_component tab-card-content" style="height:7.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
+                        <div v-if="getStatus" class="vip_component tab-card-content" style="height:8.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
                             <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_14" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/cg-zbdt.png?v={{Msg "seo" "version"}}'></buyer-example>
                         </div>
                         <div class="tab-card-content" v-else>
@@ -692,7 +692,7 @@
                     </template>
 
                     <!-- 遮罩部分 -->
-                    <div v-if="getStatus">
+                    <div class="module-mask-list" v-if="getStatus">
             <!--            统计信息-->
                         <div class="vip_component" style="height:7.56rem;background:#fff url('/common-module/collection/image/buyer/cg-tjxx-bg.png?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%">
                             <p class="example-title">概况</p>
@@ -729,7 +729,7 @@
                             <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_3" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/03.png?v={{Msg "seo" "version"}}'></buyer-example>
                         </div>
                         <!-- 采购规模分布 -->
-                        <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/04-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+                        <div class="vip_component" style="height:11.5rem;background:url('/common-module/collection/image/buyer/04-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
                             <p class="example-title">采购规模分布</p>
                             <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_4" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/04.png?v={{Msg "seo" "version"}}'></buyer-example>
                         </div>

+ 5 - 0
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -383,6 +383,11 @@
                     </div>
                     <!-- 数据部分 -->
                     <div v-else class="module-chart-list">
+                        <div class="vip-ent-portrait-balance" v-if="showPortraitBalance">
+                            <span class="bid_surplus highlight-text">当月企业画像余额:${entvisit.total - entvisit.usage}个</span>
+                            <!-- v-if="isShowUpTip" -->
+                            <span class="j-button-confirm bid_upgrade" @click="portraitBalanceActionRight(portraitBalance)">${portraitBalance}</span>
+                        </div>
                         <!-- 中标统计结果--登录 -->
                         <div class="bg-white tab-card" data-cl-event="c_wx_open_buttionclick">
                             <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">概况</div>