非会员企业画像问题

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

@@ -228,12 +228,6 @@
                     <div class="j-img img-empty empty-img"></div>
                     <p class="empty-text">暂无项目动态</p>
                 </div>
-                <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
-                </div>
-                <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
-                </div>
                 <div class="bg-white tab-card cell-list" v-show="conf._13 && topProject.list.length !== 0 && !getStatus">
                     <div class="tab-card-title">项目动态</div>
                     <div class="tab-card-content">
@@ -263,6 +257,12 @@
                 <div class="vip_component" v-if="getStatus" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
                     <vip-component type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
+                <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
+                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                </div>
+                <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
                     <!-- e-charts和sticky同时使用时候，需要手动降低css层级(z-index: 1)，确保tooltip不遮挡固定定位头部 -->

src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html

@@ -48,7 +48,7 @@
               <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :lid="lid" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
-              <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
+              <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :rootopen="screenShow" :selectdate="selectDate"></date-component>
             </van-dropdown-item>
             <van-dropdown-item ref="cateItem">
               <template #title>

src/web/staticres/common-module/collection/css/index.css

@@ -817,6 +817,40 @@
     color: #fb483d;
 }
 
+.customTime{
+    display: flex;
+    align-items: center;
+    margin-bottom: .16rem;
+    width: 100%;
+}
+.customTime-title{
+    display: flex;
+    align-items: center;
+    margin-right: .14rem;
+    font-size: .28rem;
+    font-weight: 500;
+    text-align: LEFT;
+    color: #5f5e64;
+    line-height: .4rem;
+}
+.customTime-title::before{
+    display: flex;
+    margin-right: .16rem;
+    content: '';
+    width: .04rem;
+    height: .24rem;
+    background: #2abed1;
+    border-radius: .08rem;
+}
+.customTime .root_open{
+    padding: .04rem .12rem;
+    border: 1px solid #fb483d;
+    border-radius: 9px;
+    font-size: .2rem;
+    color: #fb483d;
+}
+
+
 /* 企业画像历史项目联系人 */
 
 .history-list .project-info-item .his-pro-title{

src/web/staticres/common-module/collection/js/date-mobile.js

@@ -4,6 +4,10 @@ var dateComponentTemplate = `
       <div class="timeTag">
           <div class="area-card-item" :class="{active:item.selected==true}" v-for="(item, index) in timeSelectList" :key="index" @click="selectFixedDate(item)">{{item.name}}</div>
       </div>
+      <div class="customTime">
+        <span class="customTime-title">自定义时间</span>
+        <span class="root_open" v-if="!rootopen">开通</span>
+      </div>
       <div class="timePicker" @click="dateShowEvent" :class="{clickactive:dateStyle==true}">
         <van-field @focus="getStratFocus" v-model="dateTimePickerState.startPlaceHolder" placeholder="开始时间"></van-field>
         <div class="line"></div>
@@ -116,6 +120,10 @@ var dateComponent = {
     'type': {
       type: String,
       default: 'more-picker'
+    },
+    "rootopen": {
+      type: Boolean,
+      default: true
     }
   },
   template: dateComponentTemplate,
@@ -123,15 +131,10 @@ var dateComponent = {
     return {
       colDate: 0,
       timeSelectList:[
-        {
-          name: '不限',
-          value: 'all',
-          selected: true
-        },
         {
           name: '最近7天',
           value: 'lately7',
-          selected: false
+          selected: true
         },
         {
           name: '最近30天',
@@ -139,7 +142,7 @@ var dateComponent = {
           selected: false
         },
         {
-          name: '去年',
+          name: '最近一年',
           value: 'lastYear',
           selected: false
         }
@@ -322,9 +325,14 @@ var dateComponent = {
     },
     // 显示选择时间弹窗
     dateShowEvent: function() {
-      this.timeSelectList.forEach(v => (v.selected = false))
-      this.dateStyle = true
-      this.datePicker.startshow = true
+      console.log(this.rootopen)
+      if(this.rootopen) {
+        this.timeSelectList.forEach(v => (v.selected = false))
+        this.dateStyle = true
+        this.datePicker.startshow = true
+      } else {
+        this.getWeixin()
+      }
     },
     formatter: function(type, val) {
       if (type === 'year') {
@@ -338,13 +346,29 @@ var dateComponent = {
       }
       return val;
     },
+    // 判断微信、app
+    getWeixin: function() {
+      if(utils.isWeiXinBrowser) {
+        location.href = '/front/vipsubscribe/vipsubscribe_new'
+      } else {
+        location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+      }
+    },
     // 结束时间获取焦点
     getEndFocus: function(){
-      this.datePicker.endshow = true
-      document.activeElement.blur()
+      if(this.rootopen) {
+        this.datePicker.endshow = true
+        document.activeElement.blur()
+      } else {
+        this.getWeixin()
+      }
     },
     getStratFocus: function() {
-      document.activeElement.blur()
+      if(this.rootopen) {
+        document.activeElement.blur()
+      } else {
+        this.getWeixin()
+      }
     },
     // 重置
     resetAll:function() {

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

@@ -95,16 +95,6 @@ var hisproComponent = {
           if(res.error_code == 0) {
             loading.clear()
             if(res.data && res.data.list && res.data.list.length !== 0) {
-              res.data.list = [
-                {
-                  "contacts": {
-                      "0351-5685774": "段晓娟"
-                  },
-                  "date": 1508413417,
-                  "id": "ABCY2FdcC4eIyA6RGRlc1wOCjMvDSB3V3h%2FPw4oPyEgWXxzdR1UCcU%3D",
-                  "projectname": "山西省教育数据中心运维服务及深度防护升级项目"
-                }
-              ]
               let phoneArr = []
               res.data.list.forEach(function(item, i) {
                 if(item.date) {

src/web/staticres/common-module/collection/js/index-wx.js

@@ -331,7 +331,7 @@ var vNode = {
             break
           }
           case 'lastYear': {
-            this.tagText.timeText = '去年'
+            this.tagText.timeText = '最近一年'
             break
           }
           case 'exact': {
@@ -415,7 +415,7 @@ var vNode = {
         success: function(res){
           console.log(res)
           if(res.error_code == 0 && res.data) {
-            res.data.forEach(function(item, index){
+            res.data.reverse().forEach(function(item, index){
               item.type = false
               if(!lid) return
               if(item.lid == lid){

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

@@ -326,7 +326,7 @@ var vNode = {
             break
           }
           case 'lastYear': {
-            this.tagText.timeText = '去年'
+            this.tagText.timeText = '最近一年'
             break
           }
           case 'exact': {
@@ -410,7 +410,7 @@ var vNode = {
         type: "POST",
         success: function(res){
           if(res.error_code == 0 && res.data) {
-            res.data.forEach(function(item, index){
+            res.data.reverse().forEach(function(item, index){
               item.type = false
               if(!lid) return
               if(item.lid == lid){

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

@@ -120,6 +120,7 @@ var vipComponent = {
         }
         // 企业情报历史记录
         case 'item_8': {
+          this.titleText = '开通大会员'
           this.headText.top = '快速查询全国企业工商信息、法人信息、'
           this.headText.bot = '联系方式，全面掌控企业动态！'
           break
@@ -142,7 +143,7 @@ var vipComponent = {
       let isWeixin = utils.isWeiXinBrowser
       if(!isWeixin) {
         if (this.btnText == '去开通') {
-          if(this.type == 'item_9') {
+          if(this.type == 'item_9' || item.type == 'item_8') {
             // 跳转到大会员
             location.href = '/jyapp/big/page/landingPage'
           } else {

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -233,12 +233,6 @@
                     <div class="j-img img-empty empty-img"></div>
                     <p class="empty-text">暂无项目动态</p>
                 </div>
-                <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
-                </div>
-                <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
-                </div>
                 <div class="bg-white tab-card cell-list" v-show="conf._13 && topProject.list.length !== 0  && !getStatus">
                     <div class="tab-card-title">项目动态</div>
                     <div class="tab-card-content">
@@ -268,6 +262,12 @@
                 <div class="vip_component" v-if="getStatus" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
                     <vip-component type="item_1" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
+                <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
+                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                </div>
+                <div class="vip_component" v-if="getStatus" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
                     <!-- e-charts和sticky同时使用时候，需要手动降低css层级(z-index: 1)，确保tooltip不遮挡固定定位头部 -->

src/web/templates/frontRouter/wx/collection/sess/index.html

@@ -54,7 +54,7 @@
               <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
-              <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
+              <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :rootopen="screenShow" :selectdate="selectDate"></date-component>
             </van-dropdown-item>
             <van-dropdown-item ref="cateItem">
               <template #title>

src/web/templates/weixin/my.html

@@ -137,7 +137,7 @@
                     <div class="menu-list-item clickable" id="ent-follow" data-href="/jylab/followent/entList">
                         <div class="m-l-i-left">
                             <span class="j-icon base-icon icon-company"></span>
-                            <span class="m-l-i-label">企业情报</span>
+                            <span class="m-l-i-label">企业关注</span>
                         </div>
                         <div class="m-l-i-right">
                             <i class="dot-red"></i>