Merge remote-tracking branch 'origin/dev4.6.2.4' into dev4.6.2.4

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

@@ -212,6 +212,10 @@
                 level_map.set(3, niche);
                 level_map.set(4, trial);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员")
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))

src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html

@@ -185,7 +185,7 @@
                   <span class="know">我知道了</span>
               </div>
           </div>
-      </div>
+        </div>
     </div>
     </div>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>

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

@@ -546,7 +546,7 @@
                         </li>
                     {{end}}
                 </ul>
-                <div class="mask-zz" style="position:absolute; top:0;width: 380px;padding:0;height: 100%;background-color:white;z-index: 1;">
+                <div class="mask-zz" style="position:absolute; top:0;width: 100%;padding:0;height: 100%;background-color:white;z-index: 1;">
                     <img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
                     <div class="mask-zz" style="position:absolute; left: 50%; top: 50%; margin-top: -110px;margin-left: -150px;width: 300px;height: 220px;background-color: white;z-index: 100;border-radius: 10px">
                         <div style="position: relative">
@@ -554,9 +554,10 @@
                             <div style="position: absolute;top: 50%;left: 50%; margin-left: -100px;width: 200px;height: 26px;color: antiquewhite;font-size: 16px;">想中标？提前介入很关键!</div>
                         </div>
                         <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 20px;">
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 5px">提前获取正在审批中的新项目,比招标信息更超前!</div>
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
-                            <button style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">拟建项目抢先获知,提前获取正在审批中的</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">新项目，比招标信息更超前!</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
+                            <button class="free-btn-reword" style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
                         </div>
                     </div>
                 </div>
@@ -1109,6 +1110,12 @@
         }
     }
 
+    //留资弹窗页面
+    $('.free-btn-reword').on('click', function() {
+        //  留资判断
+        location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait_contacts'
+    })
+
     // 判断账户权限
     function getAccountInfo () {
         $.ajax({

src/jfw/modules/publicapply/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/publicapply.iml" filepath="$PROJECT_DIR$/.idea/publicapply.iml" />
+    </modules>
+  </component>
+</project>

src/jfw/modules/publicapply/.idea/publicapply.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/jfw/modules/publicapply/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

src/jfw/modules/publicapply/src/attachmentdow/service/service.go

@@ -5,7 +5,6 @@ import (
 	"config"
 	"db"
 	"fmt"
-	"github.com/go-xweb/xweb"
 	"jfw/public"
 	"log"
 	qu "qfw/util"
@@ -13,6 +12,8 @@ import (
 	"qfw/util/redis"
 	"time"
 	"util"
+
+	"github.com/go-xweb/xweb"
 )
 
 type Dow struct {
@@ -64,7 +65,7 @@ func (u *Dow) Subdow() {
 				}
 				//下载后自增一次
 				defer func() {
-					redis.Incr(jy.VipFileUploadNumKey, mon)
+					redis.Incr(jy.PowerCacheDb, mon)
 					data := make(map[string]interface{})
 					data["p_userid"] = userid
 					data["p_infoId"] = infoId

src/jfw/modules/publicapply/src/config.json

@@ -14,7 +14,7 @@
             "user": "public03@topnet.net.cn"
         }
     ],
-    "attachmentRPC":"192.168.3.128:10082",
+    "attachmentRPC":"192.168.3.206:10082",
     "followPushRpc": "127.0.0.1:8759",
     "industry": "分类综合测试",
     "defaultEntList": [

src/web/staticres/big-member/css/j-icons.css

@@ -87,6 +87,11 @@
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAGfSURBVHgB7ZhfSgMxEMYnoq8FvYV6Hek51F7AnsBnwQv45wT67g3EE+i7VWhBy3YGslDS7GaSmZQtnR8MS8nu5Ps2yXYSAMMwDMPYB5qmmWB8+JiCIphvVDM/dTDF+AziFhTw4l8i+Sec5x3nJnoreBlFmh6dc1dQCInHyzPGeaR5hrlPUzkOQMa4dCQS4tlwDdz3tGWbYIp/AAbcKcTpkDWdNHMRLANaHWuLJ9gGpAJqiCeyDJQKqSWeyDaQK6imeKLIAMEU9oRxBpXEE8UGiIQJyn2C8Ycx60ghEt92IqLDRCv+0P+ew6YJsXg1gnrmC2OB8R/Ej3YdpYo38dohft2EqnhpLRRCU6dJtA+PyBSaR97+b40pVHMRH2Mc+d8LjO/gUZVFXPszSiaWsCm+RWyieA0w/shoLdxhvPWkGUunU5GBjPLgEq8XGO8994lM7Fcxt9Pl9M5vaOg7DwPcUrIWsT9o0tnDOkdFHWdhb+VciChafIyR2Mq5UPlOijcSSSTnQvLNSL8J1rkQGxzym7XD12tQpnZ+wzAMwxgkK2NSw4furHAaAAAAAElFTkSuQmCC);
     background-size: contain;
 }
+/* 没有权限X号 */
+.iconClose {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAABAUlEQVRIia3WOw7CMAyA4Z+oO1NPweMCBSR6cJB4rB14XKKdegOGpFIV5eEUZ4wjf1IcR151XQdwBF7AiO5aA3vgboADcAOeQK2I1MDD5W4M8Aa+wAa4KmE1cAG2LvfHYK+rVcR85AyMxgV7JSyEDABmdqh3gaVYFPEhXGAJlkRC0BKsdmeiSAwqwSZkk0JSkAQTIzkohRUhAFUGmmNT4qvbFyNSKIRRgkD+6tSWFPJrUtzUEihU+OKmzkGx11X8g6Sg3BMuwmKQtE/EWAgqbUYR5kM+0mYQMTaHQkgvQETYBP2LZDGDHYk0kBS2NsBOEYlh2wo7e53QHyAHoMEOkM8fK0SJHBAwOxoAAAAASUVORK5CYII=) no-repeat;
+  background-size: contain;
+}
 /* 圆x型删除灰色 */
 .icon-delete-gray {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQzSURBVHgB7Zp/TtswFMefU9JJ+wtOsHACfiMhYCQn2G5AOUHHCQYnAE6wcoJ1J0g7YJW2AuUEy27Q/6Y1rb3nLNVQsZPYiftDykeqlNpJ7G/86/k9A5SUlJQsEAQM4nc6DoRV17JgjQFzMWkZGP4I/v4T8B8B0qNk9ASDUcvz9gIwROGCff9x2arSOmOshn8d0IN/gCYNB1dFiy9MsH/zwyWEfMRLFwqFNFg4OC9KeG7Bvt9xyJJ9gW96D0YpRnguwe1v3TobwdnEmDRJwAg99/Z3G6CJtuD27f0FTkQfYAbg+L48Otg6BQ2UBfNJidgjHy/XYbb0WFjxPG+jr/KQkuA5EjtGWbQFCsyZWM56XKfMZBbMxyzMl9gx63HdMpGpS/t39zXC2CeYY3ACPfUOdi7T7ksVHK2zts27jQPzTZ+F4UbaOp3apVEst54cmH+WSdVO7dqJLRy37k9YINCG97zDnZYsP7GF49ZVKAyuWCVc5eMJcoIW1Un0LnynynOxPS/Pl2XotK792nL2Nzd/Rc9//V4jlqU10XGxY/NRpx64Nq/I1mZ5Cy/Zymbj8A91x9fe290Go/QEFHkulmO9st+BKktDad2lggkB5YJwI9Fod7rH4/+qoifF8ncxCqlLzSTYs45leULBvBuB5sysK1ooFt8FOjDm3D08vBFliVu4WnUhB6qiCxUbM/g99ETpYsGU5TYhs4o2ITaCWkINQsE4ftegANJEGxMLkYYjUbps0nKgIGSiTYqNIETohRGuw63bLoOCIRWoHe1tX4vyChf7j757sL0ymai0H87DZEuPMSSWI2zhqQnmUEpf9CgaUqPBgElkgpX8RFmYHLNjdC0yXaYiWDRB5bHIMkFIIEo2Llg2G+c1Q9MLZoEo2RLfC20oosyUpcekaNTwJEq3JDXtQd4CM66zxkRbVKhBLHg0aEEOVI0KI6Ix7CpKli4JaHzwTbcDiuSxoCaNkxxOhACNjlVRhnQdRt/QNSgSuUpzmItFtTSO3y+yPLnhMVxS3nhXX1c+j691LagXFtlI3DUTGYbSuidaOdituT/ahYzwqB6tDK4ssI/ymouRI7AybFqjal0tSkka7sHWibyOCcRRfaXYzaxBZ/xqkjM+0ZaO/LsEmrAwkEbuyAMbhNzHXLhtbYCAH4lIuylVMP9iOIZSXzRroqMQGc5/ZNoe8qicagRgmvC6ZT33obQXxVn7EeYvRtxDI2Mj681KDgB+vIAXAPNDL65TZspDLVnxb7qX6AqtwwyIxuzhttaRKW2fFi+QEcItmgCmBcMoP7fXNcVyCjl6CJXKWVIAqxAYNNkwPJ3p0cPnGBTewp3beVJUXwUDx4dROMaW43CrA3oE0fYUd2yqk1IaZg+Ic/E8EonBuThe5cDzj4BjEmvABfUjPxp3LdmDlrdn7oB4SUlJyULxF7IOiI8q04KkAAAAAElFTkSuQmCC);

src/web/staticres/big-member/css/pc_buy_commit.css

@@ -125,13 +125,23 @@ input[type="radio"] {
   color: #1D1D1D;
 }
 
-.page--big--buycommit .w-box .w1200 .p-main .meal_content .meal_top .edition_price {
-  font-size: 16px;
+.page--big--buycommit .w-box .w1200 .p-main .meal_content .meal_top .delete_price {
+  font-size: 14px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
   font-weight: 400;
-  line-height: 24px;
   color: #686868;
+  line-height: 22px;
+  text-decoration: line-through;
 }
 
+.page--big--buycommit .w-box .w1200 .p-main .meal_content .meal_top .edition_price {
+  font-size: 28px;
+  font-weight: 400;
+  line-height: 36px;
+  color: #1D1D1D;
+}
+
+
 .page--big--buycommit .w-box .w1200 .p-main .meal_content .meal_top .cornermark {
   display: none;
   position: absolute;
@@ -209,11 +219,15 @@ input[type="radio"] {
 }
 
 .page--big--buycommit .w-box .w1200 .p-main .meal_content .active .meal_top .edition {
-  color: #FFFFFF;
+  color: #F6DCAE;
 }
 
 .page--big--buycommit .w-box .w1200 .p-main .meal_content .active .meal_top .edition_price {
-  color: #FFFFFF;
+  color: #F6DCAE;
+}
+
+.page--big--buycommit .w-box .w1200 .p-main .meal_content .active .meal_top .delete_price {
+  color: rgba(241, 208, 143, 0.6000000238418579);
 }
 
 .page--big--buycommit .w-box .w1200 .p-main .meal_content .active .meal_top .cornermark {

src/web/staticres/big-member/js/meauContact.js

@@ -50,8 +50,8 @@ var MeauData = [
       {
         two: '按区域/行业/信息类型订阅',
         three: '用户按照业务区域范围，订阅相关区域/行业发布/信息类型精准项目信息。',
-        four: 'icon-tick',
-        five: 'icon-tick'
+        four: '全国/省份/地市',
+        five: '全国/省份/地市'
       },
       {
         two: '按关键词订阅',
@@ -234,204 +234,212 @@ var MeauData = [
         three: '及时推送关注项目的最新招标信息，中标信息、中标单位、预算、联系电话等信息，及时推送，方便安排后续人员跟进。',
         four: '100个项目',
         five: '500个项目'
-      },
-      {
-        two: '类似项目联系方式',
-        three: '提供类似项目的联系人、联系方式等。',
-        four: 'icon-tick',
-        five: 'icon-tick'
       }
     ]
-  },
+  }
+]
+
+var QYQB = [
   {
-    '企业情报监控':[
+    'list':[
       {
         two: '企业中标动态',
         three: '监控招标大数据，一旦关注企业中标，及时推送企业的中标项目、时间等公告信息。',
-        four: '100个项目',
-        five: '500个项目'
       },
       {
         two: '董监高/股东及投资比例注册资本/企业地址/经营范围公司注销/吊销公司注销/吊销新公司设立变动',
         three: '监控企业公示数据库，一旦关注企业工商变动情况，及时推送，帮助企业及时了解竞争对手和合作伙伴的动向。',
-        four: 'icon-tick',
-        five: 'icon-tick'
       }
-    ]
-  },
+    ],
+    title: '企业情报监控',
+    four: '100个项目',
+    five: '500个项目'
+  }
+]
+
+var JGHSJ = [
   {
-    '结构化数据':[
+    'list':[
       {
         two: '在线数据导出',
-        three: '字段明细：省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯地址、项目名称、项目范围、预算金额、中标金额、开标日期、采购单位、采购单位信息(采购单位联系人、采购单位联系电话、招标代理机构)、中标单位信息(中标单位、中标单位联系人、中标单位联系电话)(来源:招标公告网站)、中标单位信息(中标单位联系人、中标单位联系电话、电子邮箱)(来源:国家企业公示网站)。',
-        four: '每日导出量100条',
-        five: '每日导出量200条'
+        three: '字段明细：省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯地址、项目名称、项目范围、预算金额、中标金额、开标日期、采购单位、采购单位信息(采购单位联系人、采购单位联系电话、招标代理机构)、中标单位信息(中标单位、中标单位联系人、中标单位联系电话)(来源:招标公告网站)、中标单位信息(中标单位联系人、中标单位联系电话、电子邮箱)(来源:国家企业公示网站)。'
       }
-    ]
-  },
+    ],
+    title: '结构化数据',
+    four: '每日导出量100条',
+    five: '每日导出量200条'
+  }
+]
+
+var ZBYC = [
   {
-    '中标企业预测':[
+    'list':[
       {
         two: '中标概率排名',
-        three: '提供企业中标概率、企业排名。',
-        four: 'icon-tick',
-        five: 'icon-tick'
+        three: '提供企业中标概率、企业排名。'
       },
       {
         two: '中标企业信息',
-        three: '提供企业的联系方式，一键可拨打联系人。',
-        four: 'icon-tick',
-        five: 'icon-tick'
+        three: '提供企业的联系方式，一键可拨打联系人。'
       },
       {
         two: '企业联系方式',
-        three: '提供企业的联系方式，一键可拨打联系人。',
-        four: 'icon-tick',
-        five: 'icon-tick'
+        three: '提供企业的联系方式，一键可拨打联系人。'
       }
-    ]
-  },
+    ],
+    title: '中标企业预测',
+    four: 'icon-close',
+    five: '200次'
+  }
+]
+
+var TBJC = [
   {
     '投标决策分析':[
       {
         two: '类似项目明细',
         three: '采购单位历史项目信息明细',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目评标专家分析',
         three: '通过大数据分析统计，提供类似项目评标专家的频次排名。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目热点中标企业',
         three: '根据类似项目的历史中标数量、中标金额等综合评定企业竞争力，提供排名前十的企业。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目区域分布',
         three: '提供类似项目的采购区域热度分布情况统计图表。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目采购单位类型分布',
         three: '提供类似采购项目的预算金额价格区间分布情况统计图表。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目标书编制周期',
         three: '提供类似项目采购单位的各行业分类占比情况统计图表。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '类似项目折扣率分析',
         three: '提供类似项目的标书编制周期统计图表',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
-      },
+      }
     ]
   },
   {
-    '投标决策分析':[
+    '业务拓展分析':[
       {
         two: '潜在客户名录',
         three: '结合历史招标采购信息、用户业务范围，生成潜在客户名录，获取销售机会。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       },
       {
         two: '潜在竞争对手/合作伙伴名录',
         three: '结合历史中标成交信息、用户业务范围，生成潜在竞争对手/合作伙伴名录，获取渠道合作机会。',
-        four: 'icon-tick',
+        four: 'icon-close',
         five: 'icon-tick'
       }
     ]
-  },
+  }
+]
+
+var SCFX = [
   {
-    '投标决策分析':[
+    '市场分析':[
       {
         two: '周报',
         three: [
           {
             threein: '本周新增招标项目数量/预算统计。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本周新增开标项目数量/规模统计。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
-          }
-          ,
+          },
           {
             threein: '项目金额排名前10的项目明细。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
-          }
-          ,
+          },
           {
             threein: '本周关注企业中标项目明细。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
-          }
-          ,
+          },
           {
             threein: '本周新开标项目提醒。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           }
-        ],
+        ]
       },
       {
         two: '月报',
         three: [
           {
             threein: '本月新增项目数量/规模统计图表、排行榜。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本月各业务领域新增项目数量/规模统计。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本月新增项目数量/规模区域分布图表。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本月新增项目数量/规模TOP10采购行业明细。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本月中标企业注册地区域/资本/中标项目数量分布图表。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           },
           {
             threein: '本月采购单位/中标企业排行榜。',
-            four: 'icon-tick',
+            four: 'icon-close',
             five: 'icon-tick'
           }
-        ],
-      },
+        ]
+      }
     ]
   },
   {
-    '项目进度监控':[
+    '售后服务':[
       {
         two: '专属客服服务',
-        three: '提供专业的售后客服服务，定期电话回访，及时解决服务中的任何问题',
-        four: 'icon-tick',
-        five: 'icon-tick'
+        three: [
+          {
+            threein: '提供专业的售后客服服务，定期电话回访，及时解决服务中的任何问题',
+            four: 'icon-tick',
+            five: 'icon-tick'
+          }
+        ]
+        
       }
     ]
   }

src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -200,6 +200,16 @@ var assetsConf = {
       5: {
         wx: '/order/image/dahuiyuan1.png',
         app: '/jyapp/big-member/image/dahuiyuan1.png'
+      },
+      // 商机版2.0
+      6: {
+        wx: '/order/image/dahuiyuan2.png',
+        app: '/jyapp/big-member/image/dahuiyuan2.png'
+      },
+      // 专家版2.0
+      7: {
+        wx: '/order/image/dahuiyuan1.png',
+        app: '/jyapp/big-member/image/dahuiyuan1.png'
       }
     }
   },
@@ -256,6 +266,16 @@ var assetsConf = {
       5: {
         wx: '/order/image/zizhanghao1.png',
         app: '/jyapp/big-member/image/dahuiyuan1.png'
+      },
+      // 商机2.0
+      6: {
+        wx: '/order/image/zizhanghao2.png',
+        app: '/jyapp/big-member/image/zizhanghao2.png'
+      },
+      // 专家2.0
+      7: {
+        wx: '/order/image/zizhanghao1.png',
+        app: '/jyapp/big-member/image/zizhanghao1.png'
       }
     }
   },

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1851,7 +1851,9 @@ var vm = new Vue({
         2: '智慧版',
         3: '商机版',
         4: '试用版',
-        5: '自定义'
+        5: '自定义',
+        6: '商机版2.0',
+        7: '专家版2.0'
       }
 
       var levelInfo = {

src/web/templates/big-member/pc/page_buy_commit.html

@@ -114,6 +114,15 @@
       flex-direction: column;
       justify-content: flex-start;
     }
+    .ent_his_ul .ent_his_list .pro_content.bid_content{
+      flex: none;
+    }
+    .bid_content_num{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 150px;
+    }
     .ent_his_ul .ent_his_list .pro_content .pro_con_item {
       display: flex;
     }
@@ -147,6 +156,11 @@
       background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMpSURBVHgB7ZpNTttAFMffTKBV6YIcgU2lEKkivgEmUqWuWk5AOEHFCQg3oCcATpDuKrVF7g2cUClB6iZHyIqqbeLpvHxQPjzOjDMzAfN+mxiPLZGfPDPv/xwAgiAIgiAIgiAIgiAIgiAIXRg8ATZacflluXQIQjTwbyHYpys+OuiHwWDevSvwBHixXmoJIbavTzDRWEtKeLQ/714OBacaXZwwuCFnBhPvNW4vtqBq1LmeVncRAHOnF1JYQRM50FSNMwFnoEEhF+l5cuTYUbe+1QQNCidoM+p8kE/HsfICAzlIoQRVos4eF3CqGpfrzllvZ6sBBhRGUPVLXGMrPJISymnj8nxbygnAkEIs0pXP8cY8Ob9YEkIOHr0glMOfZ8rpC5bs6lTNaWhPscrXeJvx0js8Ho5GZz/fBG1YMjM58nAjbXwqJ7wMgz7kREtQ9TxuAOMnt+/kzW74+giWhA85iN4UY/zw3jmRNKvRj0NYAhg+pZwWKORIBjbkILprUOr8XpYkDJ/yo6a8wJIcREuQDHvq9cazJGX4nJKIZL8b2lsftQStMrErP7IlnV+cgGOywuf43xDJwWU9OAWLaAlqyy3y2aSOUEuSPRaXknTyVa8eHINljCvpzW+dU8ZhL+OS9pWUmbfuSMNm+DQlV9TwKcl2+DQldxaTtVEzdfv/Tz/5LXeTt/l3Exfh05SFwqpLSRg+YYXHqnEB4ntvp5YrX5mwUBbr1oOm3MGyqulxtYtVLxgwC5+q8Un4HO+szlk4rNqW5Dp8mmKtH2RjuvnKVyZYbZhVZKjld0PtbQZ/h0mY1gl4iHIQq/0grGKx1M+4pLwq15ZXuADfwGf4NMV6w2xc6g8TbG2q1giUFOMWPjuxtj5+clThcwBLkoM460lPt2n84mXVNQmDBge2nZWv8Im0na9McNq0r0RyuxY8YuqpkwmGTxf5ygSnPWmcFrh24AILpjgKn6Z4ee1j/CQ5zlcmeHsvpi3pAclBvL44nCfJR/g0xfub1VoUl/+I+9u6r/BpivcXh7PupIAEf36CtdJACPjoK3wSBEEQBEEQBEEQBEEQBEG44x/qVZ39mGkA4AAAAABJRU5ErkJggg==) no-repeat;
       background-size: contain;
     }
+    /* 没有权限X号 */
+    .iconClose {
+      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAABAUlEQVRIia3WOw7CMAyA4Z+oO1NPweMCBSR6cJB4rB14XKKdegOGpFIV5eEUZ4wjf1IcR151XQdwBF7AiO5aA3vgboADcAOeQK2I1MDD5W4M8Aa+wAa4KmE1cAG2LvfHYK+rVcR85AyMxgV7JSyEDABmdqh3gaVYFPEhXGAJlkRC0BKsdmeiSAwqwSZkk0JSkAQTIzkohRUhAFUGmmNT4qvbFyNSKIRRgkD+6tSWFPJrUtzUEihU+OKmzkGx11X8g6Sg3BMuwmKQtE/EWAgqbUYR5kM+0mYQMTaHQkgvQETYBP2LZDGDHYk0kBS2NsBOEYlh2wo7e53QHyAHoMEOkM8fK0SJHBAwOxoAAAAASUVORK5CYII=) no-repeat;
+      background-size: contain;
+    }
     /* -E- 表格样式 -E- */
   </style>
   <!--E-手机号输入样式-->
@@ -166,11 +180,11 @@
           <div class="main_meal">
             <div class="meal_content">
               <div class="meal_title">选择会员套餐</div>
-              <div class="setmeal meal_sj" mealdata="3">
+              <div class="setmeal meal_sj active" mealdata="6">
                 <div class="meal_top">
                   <div class="edition">商机版2.0</div>
-                  <div class="edition_price">￥7,999/年</div>
-                  <div class="delete_price">￥9,999</div>
+                  <div class="edition_price"><span style="font-size: 16px;">￥</span>7,999/年</div>
+                  <div class="delete_price">￥9,999/年</div>
                   <span class="cornermark j-icon  icon-gold-mark"></span>
                 </div>
                 <div class="meal_bottom">
@@ -221,10 +235,11 @@
                   </div>
                 </div>
               </div>
-              <div class="setmeal meal_zj" mealdata="2">
+              <div class="setmeal meal_zj" mealdata="7">
                 <div class="meal_top">
                   <div class="edition">专家版2.0</div>
-                  <div class="edition_price">￥19,999/年</div>
+                  <div class="edition_price"><span style="font-size: 16px;">￥</span>19,999/年</div>
+                  <div class="delete_price">￥25,999/年</div>
                   <span class="cornermark j-icon  icon-gold-mark"></span>
                 </div>
                 <div class="meal_bottom">
@@ -385,16 +400,122 @@
                       <div class="ent_his_time">@@datas.two@@</div>
                       <div class="exe_list three">@@datas.three@@</div>
                       <div class="exe_list four">
-                        <span v-if="datas.four=='icon-tick'" :class="{iconTick:datas.four=='icon-tick', iconClose:datas.four=='icon-tick'}"></span>
+                        <span class="j-icon" v-if="datas.four=='icon-tick' || datas.four=='icon-close'" :class="{iconTick:datas.four=='icon-tick', iconClose:datas.four=='icon-close'}"></span>
+                        <span v-else>@@datas.four@@</span>
+                      </div>
+                      <div class="exe_list five">
+                        <span v-if="datas.five=='icon-tick'" :class="{iconTick:datas.five=='icon-tick'}"></span>
+                        <span v-else>@@datas.five@@</span>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+                <!-- 企业情报 -->
+                <tr class="ent_his_list">
+                  <td class="ent_his_index inset_list" >@@QYQB[0].title@@</td>
+                  <td class="pro_content bid_content">
+                    <div class="pro_con_item" v-for="(datas, i) in QYQB[0].list" :key="i">
+                      <div class="ent_his_time">@@datas.two@@</div>
+                      <div class="exe_list three">@@datas.three@@</div>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list four">
+                      <span v-if="QYQB[0].four=='icon-tick'" :class="{iconTick:QYQB[0].four=='icon-tick', iconClose:QYQB[0].four=='icon-close'}"></span>
+                      <span v-else>@@QYQB[0].four@@</span>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list five">
+                      <span v-if="QYQB[0].five=='icon-tick'" :class="{iconTick:QYQB[0].five=='icon-tick'}"></span>
+                      <span v-else>@@QYQB[0].five@@</span>
+                    </div>
+                  </td>
+                </tr>
+                <!-- 结构化数据 -->
+                <tr class="ent_his_list">
+                  <td class="ent_his_index inset_list" >@@JGHSJ[0].title@@</td>
+                  <td class="pro_content bid_content">
+                    <div class="pro_con_item" v-for="(datas, i) in JGHSJ[0].list" :key="i">
+                      <div class="ent_his_time">@@datas.two@@</div>
+                      <div class="exe_list three">@@datas.three@@</div>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list four">
+                      <span v-if="JGHSJ[0].four=='icon-tick' || JGHSJ[0].four=='icon-close'" :class="{iconTick:JGHSJ[0].four=='icon-tick', iconClose:JGHSJ[0].four=='icon-close'}"></span>
+                      <span v-else>@@JGHSJ[0].four@@</span>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list five">
+                      <span v-if="JGHSJ[0].five=='icon-tick'" :class="{iconTick:JGHSJ[0].five=='icon-tick'}"></span>
+                      <span v-else>@@JGHSJ[0].five@@</span>
+                    </div>
+                  </td>
+                </tr>
+                <!-- 中标企业预测 -->
+                <tr class="ent_his_list">
+                  <td class="ent_his_index inset_list" >@@bidlist[0].title@@</td>
+                  <td class="pro_content bid_content">
+                    <div class="pro_con_item" v-for="(datas, i) in bidlist[0].list" :key="i">
+                      <div  class="ent_his_time">@@datas.two@@</div>
+                      <div class="exe_list three">@@datas.three@@</div>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list four">
+                      <span class="j-icon" v-if="bidlist[0].four=='icon-tick' || bidlist[0].four=='icon-close'" :class="{iconTick:bidlist[0].four=='icon-tick', iconClose:bidlist[0].four=='icon-close'}"></span>
+                      <span v-else>@@bidlist[0].four@@</span>
+                    </div>
+                  </td>
+                  <td class="bid_content_num">
+                    <div class="exe_list five">
+                      <span v-if="bidlist[0].five=='icon-tick'" :class="{iconTick:bidlist[0].five=='icon-tick'}"></span>
+                      <span v-else>@@bidlist[0].five@@</span>
+                    </div>
+                  </td>
+                </tr>
+                <!-- 投标决策分析 -->
+                <tr class="ent_his_list" v-for="(item, index) in TBJC" :key="index">
+                  <td class="ent_his_index inset_list" >@@item.times[0]@@</td>
+                  <td class="pro_content">
+                    <div class="pro_con_item" v-for="(datas, i) in item.timeData" :key="i">
+                      <div class="ent_his_time">@@datas.two@@</div>
+                      <div class="exe_list three">@@datas.three@@</div>
+                      <div class="exe_list four">
+                        <span class="j-icon" v-if="datas.four=='icon-tick' || datas.four=='icon-close'" :class="{iconTick:datas.four=='icon-tick', iconClose:datas.four=='icon-close'}"></span>
                         <span v-else>@@datas.four@@</span>
                       </div>
                       <div class="exe_list five">
-                        <span v-if="datas.five=='icon-tick'" :class="{iconTick:datas.five=='icon-tick', iconClose:datas.five=='icon-tick'}"></span>
+                        <span v-if="datas.five=='icon-tick'" :class="{iconTick:datas.five=='icon-tick'}"></span>
                         <span v-else>@@datas.five@@</span>
                       </div>
                     </div>
                   </td>
                 </tr>
+                <!-- 市场分析 -->
+                <tr class="ent_his_list" v-for="(item, index) in SCFX" :key="index">
+                  <td class="ent_his_index inset_list" >@@item.times[0]@@</td>
+                  <td class="pro_content">
+                    <div class="pro_con_item" v-for="(datas, i) in item.timeData" :key="i">
+                      <div class="ent_his_time">@@datas.two@@</div>
+                      <div>
+                        <div style="display: flex;" v-for="(sum, ii) in datas.three" :key="ii">
+                          <div class="exe_list three">@@sum.threein@@</div>
+                          <div class="exe_list four">
+                            <span class="j-icon" v-if="sum.four=='icon-tick' || sum.four=='icon-close'" :class="{iconTick:sum.four=='icon-tick', iconClose:sum.four=='icon-close'}"></span>
+                            <span v-else>@@sum.four@@</span>
+                          </div>
+                          <div class="exe_list five">
+                            <span v-if="sum.five=='icon-tick'" :class="{iconTick:sum.five=='icon-tick'}"></span>
+                            <span v-else>@@sum.five@@</span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -402,7 +523,7 @@
       </div>
     </div>
   </div>
-  <script src='{{Msg "seo" "cdn"}}/big-member/js/meauContact.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/big-member/js/meauContact.js?v={{Msg "seo" "version"}}11'></script>
   <script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
   <script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
@@ -412,17 +533,48 @@
         delimiters: ['@@', '@@'],
         el: '#pcBuyCommit',
         data: {
-          content: []
+          content: [],
+          bidlist: [],
+          QYQB: [],
+          JGHSJ: [],
+          TBJC: [],
+          SCFX: []
         },
         created () {
           MeauData.forEach(function (item, index) {
             let dataArr = {}
             dataArr = {
               times: Object.keys(item),
-              timeData: item[Object.keys(item)]
+              timeData: item[Object.keys(item)],
+              four: item.four || '',
+              five: item.five || ''
             }
             vNode.data.content.push(dataArr)
           })
+          this.bidlist = ZBYC
+          this.QYQB = QYQB
+          this.JGHSJ = JGHSJ
+          TBJC.forEach(function (item, index) {
+            let dataArr = {}
+            dataArr = {
+              times: Object.keys(item),
+              timeData: item[Object.keys(item)],
+              four: item.four || '',
+              five: item.five || ''
+            }
+            vNode.data.TBJC.push(dataArr)
+          })
+          SCFX.forEach(function (item, index) {
+            let dataArr = {}
+            dataArr = {
+              times: Object.keys(item),
+              timeData: item[Object.keys(item)],
+              four: item.four || '',
+              five: item.five || ''
+            }
+            vNode.data.SCFX.push(dataArr)
+          })
+          console.log(this.SCFX)
         }
       }
     new Vue(vNode)
@@ -593,7 +745,7 @@
 
       // 参数
       var getParams = {
-        level: 3,
+        level: 6,
         cycle: 1
       }
       // 选择会员等级
@@ -602,17 +754,15 @@
         $(this).siblings('.setmeal').removeClass('active')
         var numbers = parseInt($(this).attr('mealdata'))
         getParams.level = numbers
-        if (numbers == 1) {
-          sessionStorage.setItem('pc_big_buy_type', '2')
-        } else if (numbers == 2) {
-          sessionStorage.setItem('pc_big_buy_type', '1')
-        } else if (numbers == 3) {
-          sessionStorage.setItem('pc_big_buy_type', '0')
+        if (numbers == 6) {
+          sessionStorage.setItem('pc_big_buy_type', '6')
+        } else if (numbers == 7) {
+          sessionStorage.setItem('pc_big_buy_type', '7')
         }
         $('.should_num').html('¥' + numFormat(getDisPrice(getParams.level, getParams.cycle)))
         $('.original_price').html('原价：¥' + numFormat(getPayPrice(getParams.level, getParams.cycle)))
       })
-      var buyType = sessionStorage.getItem('pc_big_buy_type') || '1'
+      var buyType = sessionStorage.getItem('pc_big_buy_type') || '6'
       sessionStorage.removeItem('pc_big_buy_type')
       $(".setmeal").eq(buyType).trigger('click')
       // 选择购买年数
@@ -640,12 +790,10 @@
         var beforeprice = 0
         var beforeall = 0
         console.log(n, m)
-        if (n == 3) {
-          beforeprice = 7999
-        } else if (n == 2) {
-          beforeprice = 19999
-        } else if (n == 1) {
-          beforeprice = 27999
+        if (n == 6) {
+          beforeprice = 9999
+        } else if (n == 7) {
+          beforeprice = 25999
         }
         return beforeall = beforeprice * m
       }
@@ -654,12 +802,10 @@
       function getDisPrice(n, m) {
         var afterprice = 0
         var afterall = 0
-        if (n == 3) {
-          afterprice = 5999
-        } else if (n == 2) {
-          afterprice = 15999
-        } else if (n == 1) {
-          afterprice = 21999
+        if (n == 6) {
+          afterprice = 7999
+        } else if (n == 7) {
+          afterprice = 19999
         }
         return afterall = afterprice * m
       }

src/web/templates/pc/member_orderDetail.html

@@ -157,6 +157,8 @@
                     level_map.set(3, "商机版");
                     level_map.set(4, "试用版");
                     level_map.set(5, "自定义");
+                    level_map.set(6, "商机版2.0");
+                    level_map.set(7, "专家版2.0");
                     if (filterObj.free_sub_num){
                       $(".free_num").text(filterObj.free_sub_num+"个");
                     }else{

src/web/templates/pc/myOrder.html

@@ -611,6 +611,12 @@
                 },
                 '自定义': {
                   icon: '/order/image/dahuiyuan1.png'
+                },
+                '商机版2.0': {
+                  icon: '/order/image/dahuiyuan2.png'
+                },
+                '专家版2.0': {
+                  icon: '/order/image/dahuiyuan1.png'
                 }
               }
             },
@@ -657,7 +663,9 @@
             2: '智慧版',
             3: '商机版',
             4: '试用版',
-            5: '自定义'
+            5: '自定义',
+            6: '商机版2.0',
+            7: '专家版2.0'
           },
           list: [],
           ind: 0,

src/web/templates/weixin/dataExport/dataExport_subType.html

@@ -108,6 +108,11 @@
                                 <dt class="question" data-value="拟建">拟建项目</dt><i class="iconfont icon-wenhao q-mark"></i>
                             </dl>
                         </li>
+                        <li>
+                          <dl class="nijian">
+                              <dt class="question" data-value="采购意向">采购意向</dt><i class="iconfont icon-wenhao q-mark-buyer"></i>
+                          </dl>
+                      </li>
                     <li>
                         <dl>
                           <dt data-value="预告">招标预告</dt>
@@ -160,14 +165,24 @@
             <button class="save-btn j-button-confirm">确认</button>
         </div>
         <div class="easypopup" id="nijianTip">
-        <div class="easypopup-alert">
-        <div class="easypopup-content">
-                    “拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
-        </div>
-        <div class="easypopup-footer">
-        <span class="know">我知道了</span>
-        </div>
+          <div class="easypopup-alert">
+            <div class="easypopup-content">
+              “拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
+            </div>
+            <div class="easypopup-footer">
+              <span class="know">我知道了</span>
+            </div>
+          </div>
         </div>
+        <div class="easypopup" id="caigouTip">
+          <div class="easypopup-alert">
+              <div class="easypopup-content">
+                采购意向”是指未发布招标公告前1-3个月，政府单位的采购意向信息，包含采购内容、预算金额、预计采购时间、采购联系人及联系方式等相关信息。
+              </div>
+              <div class="easypopup-footer">
+                  <span class="know">我知道了</span>
+              </div>
+          </div>
         </div>
     </div>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"></script>
@@ -335,6 +350,13 @@
         $(".know").on('click', function () {
             $("#nijianTip").hide();
         });
+        // 采购意向
+        $("i.q-mark-buyer").on('click', function () {
+            $("#caigouTip").show();
+        });
+        $(".know").on('click', function () {
+            $("#caigouTip").hide();
+        });
     </script>
 	{{include "/common/baiducc.html"}}
 </body>

src/web/templates/weixin/member/memberdetail.html

@@ -200,6 +200,10 @@
                 level_map.set(3, niche);
                 level_map.set(4, trial);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 $(".o-name").text("大会员")
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))
                 var member_endtime = "-";

src/web/templates/weixin/vipsubscribe/messageType.html

@@ -45,6 +45,16 @@
         </div>
     </div>
 </div>
+<div class="easypopup" id="caigouTip">
+  <div class="easypopup-alert">
+      <div class="easypopup-content">
+        “采购意向”是指未发布招标公告前1-3个月，政府单位的采购意向信息，包含采购内容、预算金额、预计采购时间、采购联系人及联系方式等相关信息。
+      </div>
+      <div class="easypopup-footer">
+          <span onclick="caigouEasyPopup.hide();">我知道了</span>
+      </div>
+  </div>
+</div>
 <div class="industry">
     <div class="all"><span>全部</span></div>
     <div class="list">
@@ -52,9 +62,15 @@
             <li>
                 <dl>
                     <dt class="question" dataValue="拟建">拟建项目</dt>
-                    <i class="iconfont icon-wenhao "></i>
+                    <i class="iconfont icon-wenhao qs-mask"></i>
                 </dl>
             </li>
+            <li>
+              <dl>
+                  <dt class="question" dataValue="采购意向">采购意向</dt>
+                  <i class="iconfont icon-wenhao qs-mask-buyer"></i>
+              </dl>
+          </li>
             <li>
                 <dl>
                     <dt>招标预告</dt>
@@ -163,6 +179,17 @@
                 }
             }
         })
+        $(".list ul li dl dt").each(function (index) {
+            if ($(this).hasClass('active') && $(this).text() == "采购意向") {
+                arr = arr + "," + $(this).attr("dataValue")
+                if ($(this).text() == "采购意向") {
+                    if (hasStr != "") {
+                        hasStr += "、"
+                    }
+                    hasStr += $(this).text();
+                }
+            }
+        })
         return arr.substr(1)
     }
 
@@ -306,9 +333,13 @@
         })
         //
         njTipEasyPopup = new EasyPopup("nijianTip");
-        $(".icon-wenhao").on("click", function () {
+        $(".qs-mask").on("click", function () {
             njTipEasyPopup.show();
         })
+        caigouEasyPopup = new EasyPopup("caigouTip");
+        $(".qs-mask-buyer").on("click",function(){
+          caigouEasyPopup.show();
+        })
         $('.all span').on('click', function (e) {
             if (!$(this).hasClass('active')) {
                 isLockButton(true);

src/web/templates/weixin/wxinfocontent_rec.html

@@ -633,6 +633,46 @@ pre {
   background-size: contain;
   margin-right: .04rem;
 }
+.free-down-text,.file-count-tip{
+  display: none;
+  margin-left: .24rem;
+  padding: 0 .16rem;
+  background: rgba(42, 189, 209, 0.1);
+  border-radius: 10px;
+  line-height: .4rem;
+  font-size: .22rem;
+  color: #2ABDD1;
+}
+.concat-kf {
+  display: none;
+  padding: 0.06rem .16rem;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjNGMjBGMzQ2NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjNGMjBGMzQ3NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6M0YyMEYzNDQ0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6M0YyMEYzNDU0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5KLSJ9AAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAABISURBVHjazNIxDgAgCEPR9v6XdsBEUL6udiPPEBVkiC6gCIL+AtN1GUyt2rdH1UgBpa7zlLasb0cwQqU6QYRE58wR3lsyBBgA3KsBiK25dREAAAAASUVORK5CYII=) no-repeat 6px center #2ABDD1;
+  background-size: .28rem .28rem;
+  padding-left: .48rem;
+  border-radius: 8px;
+  color:#fff;
+  font-size: .22rem;
+  line-height: normal;
+}
+.icon-help{
+  display: none;
+  width: .32rem;
+  height: .32rem;
+  margin: 0 .38rem 0 .2rem;
+  background: url(/images/help-b.png) no-repeat center center;
+  background-size: contain;
+}
+.download-list ul .downs {
+  margin-bottom: 0.32rem;
+  font-size: .3rem;
+  line-height: .44rem;
+  color: #2ABED1;
+  text-decoration: underline;
+}
+.join {
+    display: flex;
+    align-items: center;
+}
 </style>
 </head>
 <body>
@@ -977,6 +1017,10 @@ pre {
                     <a class="adv_center" style="display: flex;flex-direction: column;flex: 1;">
                         <div class="join">
                             附件下载
+                            <span class="free-down-text">免费用户享有1次附件下载权益</span>
+                            <span class="file-count-tip">本月剩余：<em class="file-count"></em>次</span>
+                            <span class="icon-help"></span>
+                            <span class="concat-kf">联系客服</span>
                         </div>
                     </a>
                 </div>
@@ -1511,6 +1555,16 @@ function isOpening() {
           }
           if (res.data.power && res.data.power.indexOf(6) > -1) {
             $('#analysis-in').hide()
+          }
+          // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
+          if (res.data && res.data.isFree && res.data.freeFile == 0) {
+            $('.free-down-text').css('display', 'inline-block')
+          }
+          if (res.data && res.data.vipStatus > 0 && res.data.viper) {
+            $('.file-count-tip').css('display', 'inline-block')
+            $('.concat-kf').css('display', 'inline-block')
+            $('.icon-help').css('display', 'inline-block')
+            $('.file-count').html(res.data.fileNum)
           }
 			},
 			error:function(err) {
@@ -2467,7 +2521,21 @@ $(function(){
     {{end}}
     $(".original_name").attr("adv_name",original_name);
     $(".original").attr("dataHref",original);
-
+    
+    // 下载帮助
+    $('.icon-help').click(function(){
+      vant.Dialog.alert({
+        message: '点击附件即为下载，系统会扣除当月附件下载次数；每月下载次数有限，次月清零，请合理使用。',
+        className: 'custom-dialog',
+        confirmButtonText: '我知道了',
+        confirmButtonColor: '#2ABDD1',
+        width: 303,
+      }).then(() => {})
+    })
+    // 联系客服
+    $('.concat-kf').click(function(){
+      location.href = '/big/wx/page/customer'
+    })
 })
 function reward(){
 	window.location.href = "/jypay/weixin/reward/redirect?id={{.T.obj._id}}&source=m";