Merge branch 'dev4.6.2.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.4

src/jfw/front/swordfish.go

@@ -2109,20 +2109,13 @@ func (f *Front) HistorypushPaging() error {
 
 //电脑端招标订阅
 func (m *Front) Subscribe() error {
-	var shareid = m.GetString("id")
-	if len(shareid) == 0 {
-		shareid = "10" //fmt.Sprintf("%s%d", config.Seoconfig["jydyy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[7:14], rand.Intn(9))
+	isBuyed := false
+	if userId, _ := m.GetSession("userId").(string); userId != "" {
+		vStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+		isBuyed = vStatus.VipState > 0
 	}
+	m.T["isBuyed"] = isBuyed
 	m.T["logid"] = config.Seoconfig["jydyy"].(string)
-	m.T["noshareid"] = shareid
-	m.T["shareid"] = se.EncodeString(shareid)
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
-	m.T["openid"] = se.EncodeString(myopenid)
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
-	m.T["nickname"] = mynickname
-	m.T["avatar"] = myavatar
-	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
 	return m.Render("/pc/subscribe_new.html", &m.T)
 }
 

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/buy_commit.css

@@ -15,22 +15,30 @@
 
 .select-common .levelList {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   padding: 0 0.32rem;
   width: 100%;
-  height: 1.88rem;
+  height: 2.8rem;
   box-sizing: border-box;
 }
 
+.select-common .levelList.levelyear {
+  height: 1.88rem;
+}
+
+.select-common .levelList.levelyear .setmeal {
+  height: 1.48rem;
+}
+
 .select-common .levelList .setmeal {
   position: relative;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  margin-top: 0.16rem;
-  width: 2.12rem;
-  height: 1.48rem;
+  margin: 0.16rem 0.24rem 0 0;
+  width: 3.28rem;
+  height: 2.4rem;
   background: #F5F6F7;
   border-radius: 0.16rem;
 }
@@ -41,16 +49,26 @@
   color: #171826;
 }
 
+.select-common .levelList .setmeal .delete_price {
+  font-size: .26rem;
+  text-decoration: line-through;
+  line-height: .4rem;
+}
+
 .select-common .levelList .setmeal .edition_price {
+  margin-top: .32rem;
   line-height: 0.4rem;
-  font-size: 0.26rem;
+  font-size: 0.48rem;
   color: #5F5E64;
 }
+.icon_money{
+  font-size: .26rem;
+}
 
 .select-common .levelList .setmeal .cornermark {
   position: absolute;
-  right: -0.04rem;
-  bottom: -0.04rem;
+  right: 0;
+  bottom: 0;
   display: none;
   width: 0.48rem;
   height: 0.48rem;
@@ -63,6 +81,13 @@
   box-sizing: border-box;
   border-radius: 8px;
 }
+.selectLevel .setmeal.sjactive.active {
+  background: #2ABDD1;
+  /* VIP/金-深色 */
+  box-sizing: border-box;
+  border-radius: 8px;
+  border: none;
+}
 
 .selectLevel .setmeal.active .cornermark {
   display: flex;
@@ -72,6 +97,14 @@
   color: #FFFFFF;
 }
 
+.selectLevel .setmeal.active .delete_price {
+  color: #fff;
+}
+
+.selectLevel .setmeal .delete_price {
+  color: #5E5E64;
+}
+
 .selectLevel .setmeal.active .edition_price {
   color: #FFFFFF;
 }

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/j-icons.css

@@ -115,11 +115,19 @@
 .icon-corner-mark {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKUSURBVHgB7ZdPaxNBGIffmYS2aqBRKkWxur2lLWJy0HtbBY/6AfzTa3vQb6AeBA9CBbF4FLx4M54EQVZPCj3EeDF4MQepFkXXUqXYdqbzbrtlu53p7sxOsnvoc8lMZpY8eZN3frsA++yTXyovGw6BnIOStJe6uRYdfdWokiJ1OUCZQk6puM1rgSTOc1nREbd5g3B4EH4vdxUddZu3opJIriqKksDhtmwtN6Jj7sdZzvlN1Xrmos7zRvlguTALnF/fa1+mor5kP3XFsBq3NzPR4CAXQyfJ/kxEdSWRrouaSCJdFQ1HImjStQM/Gom6dKWiskjUpeMVVUWiLh2t6F6RqEvHROMiURfrokkjMUqldACW1tZhYeW/dL0AFglF4kWd62acQbg/dhKuDg3AspBtLv3btcdaM+FBLiQbkCC3ISI5PTy4PZ842i/dZ0XUNG2ikkj92y/p3tSiNiUftReh/v23dH+qZjKNRJXk3JdF5TXGzYSRSCl5hpLH+3rg4elTcHdkCIj46vPeX7ApaSyKkUg5PBbDPpxfOTEAl44d8dfOlktKWVNJgactuhWJ96LvB6Iq2RSSItzIey1RVSQurKz6r+cOl0Amm0Zyy/RF4mZKEonTQmgmIjTvLfvSxpICts7GY0V1I1Emm0ZSNGv708SZ4SLESWIkcp44bebamxIyWV1JX5SzO/iq/I/iQd5ziL7DIWgSNFH4P2skKarZmqxO4biokjRJmzBYWbwTwtPg9Y8/8PTrT9DE44SNBxPSCUkbrDF2+fP5Wj2Y78h6jMRCr38H5EB2eIyzqbAksi2a9inRBuKzPzDCaq3J2pPomv/T23hKTAM2DXa3TDCA2HwA08ATekKOv+UM6q0LtTdxF2wAr7U5snLQCTUAAAAASUVORK5CYII=);
 }
+.iconcornermark {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAALVSURBVHgB7Zg/TBNRGMC/16stdkBMGFiMNUJEXTDGxQ0TEyZD2ZjUUROjIxu66VSIEZyMDiYyKCoOTBJdGFyIC2HRSwyTmjTFiLVcH++79EE57sH7d727pL8Obe/eJb/vvvfe990BdOjQIbX0zy5MEkgp/TPvy+zrXhZSRrE83+PkHJS/gf9TlQGUz+azSwB0iB9LTQBMvujknSUmXGw9nooARPJI4gM4SB5J9CIeKM8P0ZzD5jz0iMZkIKGcnvlw3ZcnYnkkkVNo4MnCXUrolMzYxGUAq6usPJKoDKA8UHpf5ZrEBMBbA1Ak9l0o2BqoEmsGwloDVWIL4LACJUssAdiSR9oegE15pK2LWKY1UKVthUy2NVClLVNIpTVQJfIMqLYGqjgQITqtAWds8AS8vHYZxs+fhOr/LVj9VQ0dF9kU0m0NEJR/NLxb26q1Olx8thg61vouZNoaBOWRDZYBEVYDMG0NwuSRx1/WhNdYm0KmBUokP/FxBV6v/RBeZyWAuOQR410oKC+7e3BM5BGjALA1yOScZUKgjx+bHbkEvYUu6M4fgaun+mD9z6YwCFN5RkW7kIlag+5cbs84FETRIBbkGdTVygC2BkDoUybfFTz382/Nv/OtBDNhR54tYEIWlQPwqyvQh6Lzq7+rsL6xKQzibO8xK/IIpTCttAuptAZjZ9hdviJXDnTkka2ad1w6A83WYEJ2vCgTQXTl2cbx/Nud0blDK7FJa/CmKSbKhK48UgfvAX4fmAHeGrBoR0ATUSZM5Cml099vj77C38IAmgVqmS2SQTCEB3GOLWDCPpOfv+rLA7heoTFeeTf3D/+HLmLbD9628OWJN+zeKrn82L5ClmT5DPVKrfLIngzsvDWw/OBtStid5+xkIKq3BqbggvWOehfC5BE/A1G+NdCCQoVm6AsPGlMicQ4xefC2BhNmvZXLepsVaHif6gV4694sVWQu3QaN+GdhSSzy1QAAAABJRU5ErkJggg==);
+    background-size: contain;
+}
 /* 对号角标--金色 */
 .icon-gold-mark {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAK2SURBVHgB7ZhPaxNBGMbfSbKaGtSkIoigFqtCBaH9AoIHe1YQPNpvoN68WW/ektw8+hF6FDyIXrwINRdvwoLgQUubNqXp352+b7pTtslOdv5tsgv5wZLdzQw8z7w7M88uwIQJE3JLp9V8yyCndFqNesDhVe4MbKzWq0XG6hxgia5zZYDEFxj7gqfz4l5uDKD4mVD8TPR+LgzIxBOZNzBMPJFpAyh+PhRflbUpQEbZbjVfJIknMlkBFP/yiPOGStvMVYB2V1XxRKYqQOIDzpd1+mTGgIgGoMnYDfRHA13GaiAuGugyNgNJG5QqYzHgSjwxcgMuxRMjNaASDXQZ2UamGg10GUkFdKKBLqlXQDca6FKEFDGJBgKvNgeVO8/g3JUHEBx0INjbiG2XmoEwGrwBA0j81M1FYIUSsOJ5KF28Bfv/fsS2LYFjRDRA8UtggBAfhR/tSds7NSCiATeMBnHiid2/36R9nE3icINaBcfiu38+w+Hmb2k/J8uo7e46TPzB+q+hfa0ncb/40qVZqNx9nrh6CGzEE1YGwmjwHU+viXsXbj+BglfprR5e9R6a2IKguxbb31Y80jaeA7JoQMKjTN1YBG96bqC/A/GEb1SBMBp8wNNy/3/8cAe8y7Nn7tF1tBKOxNME/qRtINxd38v+D7r/e8++zESxfNWJeIIx1tBahXSigTd9Hx+fxypNjcQTqKWmvJGdRAOu/NVACEoyYSoeR/5jbeF1O9GATTRIMmEqnsA5+I5+hxqwjQaEzISNeHwSmjj6Pp1LDbh8dyWhFMjK1x/2llnKNqbiER+PZXERO4ldv3g7xMfRfyRGnxjYyDIu/mlUPHGmAml8NXDEwMgLTiuQ1lcDW2jC4rEQJ57oVSDNrwaGtFHYCi2VMuECZvPi7ZA2Hj6K/omiv+L5Cm1SKh2PAfYfhuYsH+/JAAAAAElFTkSuQmCC);
     background-size: contain;
 }
+.icongoldmark {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAK2SURBVHgB7ZhPaxNBGMbfSbKaGtSkIoigFqtCBaH9AoIHe1YQPNpvoN68WW/ektw8+hF6FDyIXrwINRdvwoLgQUubNqXp352+b7pTtslOdv5tsgv5wZLdzQw8z7w7M88uwIQJE3JLp9V8yyCndFqNesDhVe4MbKzWq0XG6hxgia5zZYDEFxj7gqfz4l5uDKD4mVD8TPR+LgzIxBOZNzBMPJFpAyh+PhRflbUpQEbZbjVfJIknMlkBFP/yiPOGStvMVYB2V1XxRKYqQOIDzpd1+mTGgIgGoMnYDfRHA13GaiAuGugyNgNJG5QqYzHgSjwxcgMuxRMjNaASDXQZ2UamGg10GUkFdKKBLqlXQDca6FKEFDGJBgKvNgeVO8/g3JUHEBx0INjbiG2XmoEwGrwBA0j81M1FYIUSsOJ5KF28Bfv/fsS2LYFjRDRA8UtggBAfhR/tSds7NSCiATeMBnHiid2/36R9nE3icINaBcfiu38+w+Hmb2k/J8uo7e46TPzB+q+hfa0ncb/40qVZqNx9nrh6CGzEE1YGwmjwHU+viXsXbj+BglfprR5e9R6a2IKguxbb31Y80jaeA7JoQMKjTN1YBG96bqC/A/GEb1SBMBp8wNNy/3/8cAe8y7Nn7tF1tBKOxNME/qRtINxd38v+D7r/e8++zESxfNWJeIIx1tBahXSigTd9Hx+fxypNjcQTqKWmvJGdRAOu/NVACEoyYSoeR/5jbeF1O9GATTRIMmEqnsA5+I5+hxqwjQaEzISNeHwSmjj6Pp1LDbh8dyWhFMjK1x/2llnKNqbiER+PZXERO4ldv3g7xMfRfyRGnxjYyDIu/mlUPHGmAml8NXDEwMgLTiuQ1lcDW2jC4rEQJ57oVSDNrwaGtFHYCi2VMuECZvPi7ZA2Hj6K/omiv+L5Cm1SKh2PAfYfhuYsH+/JAAAAAElFTkSuQmCC);
+    background-size: contain;
+}
 /* 设置--金色 */
 .icon-gold-setting {
     width: 0.32rem;

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

@@ -87,18 +87,19 @@
             <div class="j-container">
                 <div class="j-main">
                     <div class="selectLevel select-common">
-                        <div class="selectTitle">选择会员等级</div>
+                        <div class="selectTitle">选择会员套餐</div>
                         <div class="levelList">
-                            <div class="setmeal" v-for="(item,index) in edition" :class="{active:index==grades}" @click="grade(index)">
+                            <div class="setmeal" v-for="(item,index) in edition" :class="{active:index==grades,sjactive:index==0}" @click="grade(index)">
                                 <div class="edition">${item.setmeal}</div>
-                                <div class="edition_price">${item.setmealprice}</div>
-                                <span class="cornermark j-icon  icon-gold-mark"></span>
+                                <div class="delete_price">${item.bs_price}</div>
+                                <div class="edition_price"><spanc class="icon_money">￥</spanc>${item.setmealprice}</div>
+                                <span class="cornermark j-icon" :class="{iconcornermark:index==0,icongoldmark:index==1}"></span>
                             </div>
                         </div>
                     </div>
                     <div class="selectyearnum select-common">
                         <div class="selectTitle">选择购买年数</div>
-                        <div class="levelList">
+                        <div class="levelList levelyear">
                             <div class="setmeal" v-for="(item,index) in columns" :class="{activeyear:index==gradeyear}" @click="gradeYear(index)">
                                 <div class="edition">${item}年</div>
                                 <span class="cornermark j-icon  icon-gold-mark"></span>
@@ -106,9 +107,9 @@
                         </div>
                     </div>
                     <!--S-手机号输入-->
-                    <div class='order-phone-group'>
-                        <label for='order_phone'>手机号码</label>
-                        <input id='order_phone' autocomplete='off' placeholder='请输入手机号码' maxlength='11' type='tel' />
+                    <div class="order-phone-group">
+                        <label for="order_phone">手机号码</label>
+                        <input id="order_phone" autocomplete="off" placeholder="请输入手机号码" maxlength="11" type="tel" />
                         <p>手机号码输入错误</p>
                     </div>
                     <!--E-手机号输入-->
@@ -304,8 +305,8 @@
             gradeyear:0,
             beforeall:0,
             afterall:0,
-            beforeprice:27999,
-            afterprice:21999,
+            beforeprice:9999,
+            afterprice:7999,
             numberStatus:999,
             hasAccountsOrder:true,
             // 价格参数
@@ -322,46 +323,54 @@
                 {listname:'企业全景分析'}
             ],
             edition: [
+                // {
+                //     setmeal:"商机版",
+                //     setmealprice:"￥7,999/年"
+                // },
+                // {
+                //     setmeal:"智慧版",
+                //     setmealprice:"￥19,999/年"
+                // },
+                // {
+                //     setmeal:"专家版",
+                //     setmealprice:"￥27,999/年"
+                // },
                 {
-                    setmeal:"商机版",
-                    setmealprice:"￥7,999/年"
+                  setmeal:"商机版2.0",
+                  bs_price:"￥9,999",
+                  setmealprice:"7,999"
                 },
                 {
-                    setmeal:"智慧版",
-                    setmealprice:"￥19,999/年"
-                },
-                {
-                    setmeal:"专家版",
-                    setmealprice:"￥27,999/年"
+                  setmeal:"专家版2.0",
+                  bs_price:"￥25,999",
+                  setmealprice:"19,999"
                 }
             ],
             // 产品服务清单
             serverList_sj: [
                 {listname:'招标大数据搜索'},
                 {listname:'招标订阅推送'},
-                {listname:'项目进度监控'},
                 {listname:'招标附件下载'},
-                {listname:'企业情报监控'},
-            ],
-            serverList_zh:[
-                {
-                    listname:'包含【商机版】全部服务',
-                    addclass:'gold'
-                },
-                {listname:'潜在项目预测推送'},
-                {listname:'中标企业预测'},
-                {listname:'投标决策分析'},
                 {listname:'采购单位全景分析'},
-                {listname:'企业全景分析'}
+                {listname:'企业全景分析'},
+                {listname:'潜在项目预测'},
+                {listname:'项目进度监控（100个）'},
+                {listname:'企业情报监控（100个）'},
+                {listname:'在线数据导出（每日100条）'},
+                {listname:'专属客服服务'},
             ],
             serverList_zj:[
                 {
-                    listname:'包含【智慧版】全部服务',
+                    listname:'包含【商机版2.0】全部服务',
                     addclass:'gold'
                 },
+                {listname:'项目进度监控（500个）'},
+                {listname:'企业情报监控（500个）'},
+                {listname:'在线数据导出（每日200条）'},
+                {listname:'中标企业预测'},
+                {listname:'投标决策分析'},
                 {listname:'业务拓展分析'},
-                {listname:'市场分析'},
-                {listname:'企业情报监控'}
+                {listname:'市场分析'}
             ],
             OrderPhoneCheck: {}
         },
@@ -379,11 +388,8 @@
                 if(meal == 'sj'){
                     this.grades = 0
                     this.severList = this.serverList_sj
-                }else if(meal == 'zh') {
-                    this.grades = 1
-                    this.severList = this.serverList_zh
                 }else if(meal == 'zj') {
-                    this.grades = 2
+                    this.grades = 1
                     this.severList = this.serverList_zj
                 }else{
                     this.grades = 0
@@ -456,13 +462,11 @@
                 return false
               }
                 var _this = this
-                var level = 1
+                var level = 6
                 if(_this.grades == 0){
-                    level = 3
+                    level = 6
                 }else if(_this.grades == 1){
-                    level = 2
-                }else if(_this.grades == 2){
-                    level = 1
+                    level = 7
                 }
                 var paramsMid = utils.getParam('mid') //引流语文案id
                 var buyerId = utils.getParam('bid') //采购单位画像跳转携带的参数
@@ -562,11 +566,9 @@
                 console.log(this.grades)
                 console.log(this.gradeyear)
                 if(this.grades==0){
-                    this.beforeprice = 7999
+                    this.beforeprice = 9999
                 }else if(this.grades== 1){
-                    this.beforeprice = 19999
-                }else if(this.grades==2){
-                    this.beforeprice = 27999
+                    this.beforeprice = 25999
                 }
                 if(this.gradeyear==0){
                     yearnum = 1
@@ -581,11 +583,9 @@
             getDisPrice:function(){
                 var yearnum= 1
                 if(this.grades==0){
-                    this.afterprice = 5999
+                    this.afterprice = 7999
                 }else if(this.grades== 1){
-                    this.afterprice = 15999
-                }else if(this.grades==2){
-                    this.afterprice = 21999
+                    this.afterprice = 19999
                 }
                 if(this.gradeyear==0){
                     yearnum = 1
@@ -607,8 +607,6 @@
                 if(index==0){
                     this.severList = this.serverList_sj
                 }else if(index==1){
-                    this.severList = this.serverList_zh
-                }else if(index==2){
                     this.severList = this.serverList_zj
                 }
                 this.getPayPrice()

src/jfw/modules/bigmember/src/service/use/use.go

@@ -434,7 +434,7 @@ func (u *Use) Attachment() {
 			//判断免费用户是否有留资下载权限
 			if BaseMsg.FreeFile == 1 {
 				//免费用户下载后取消下载权限
-				redis.PutKV(fmt.Sprintf("free_power_fileupload_%s", userid), -1)
+				redis.PutKV(fmt.Sprintf("article_attach_%s", userid), -1)
 				jy.ClearBigVipUserPower(userid)
 			} else {
 				for _, v := range m {

src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -50,9 +50,9 @@ const (
 	PowerCacheDb  = "other"
 	PowerCacheKey = "bigmember_power_3_%s"
 	OneDay        = 60 * 60 * 24
-	PowerCacheEntPortKey   = "free_power_entport_%s"
-	PowerCacheBuyerPortKey = "free_power_buyerport_%s"
-	PowerCacheFileKey      = "free_power_File_%s"
+	PowerCacheEntPortKey   = "ent_portrait_%s"
+	PowerCacheBuyerPortKey = "buyer_portrait_%s"
+	PowerCacheFileKey      = "article_attach_%s"
 	UserUpdateAreaKey      = "free_area_num_%s_%s"
 	BaseAreaNum            = 1
 )

src/web/staticres/big-member/weixin/css/buy_commit.css

@@ -15,22 +15,30 @@
 
 .select-common .levelList {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   padding: 0 0.32rem;
   width: 100%;
-  height: 1.88rem;
+  height: 2.8rem;
   box-sizing: border-box;
 }
 
+.select-common .levelList.levelyear {
+  height: 1.88rem;
+}
+
+.select-common .levelList.levelyear .setmeal {
+  height: 1.48rem;
+}
+
 .select-common .levelList .setmeal {
   position: relative;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  margin-top: 0.16rem;
-  width: 2.12rem;
-  height: 1.48rem;
+  margin: 0.16rem 0.24rem 0 0;
+  width: 3.28rem;
+  height: 2.4rem;
   background: #F5F6F7;
   border-radius: 0.16rem;
 }
@@ -41,16 +49,27 @@
   color: #171826;
 }
 
+.select-common .levelList .setmeal .delete_price {
+  font-size: .26rem;
+  text-decoration: line-through;
+  line-height: .4rem;
+}
+
 .select-common .levelList .setmeal .edition_price {
+  margin-top: .32rem;
   line-height: 0.4rem;
-  font-size: 0.26rem;
+  font-size: 0.48rem;
   color: #5F5E64;
 }
 
+.icon_money{
+  font-size: .26rem;
+}
+
 .select-common .levelList .setmeal .cornermark {
   position: absolute;
-  right: -0.04rem;
-  bottom: -0.04rem;
+  right: 0;
+  bottom: 0;
   display: none;
   width: 0.48rem;
   height: 0.48rem;
@@ -63,6 +82,13 @@
   box-sizing: border-box;
   border-radius: 8px;
 }
+.selectLevel .setmeal.sjactive.active {
+  background: #2ABDD1;
+  /* VIP/金-深色 */
+  box-sizing: border-box;
+  border-radius: 8px;
+  border: none;
+}
 
 .selectLevel .setmeal.active .cornermark {
   display: flex;
@@ -72,6 +98,14 @@
   color: #FFFFFF;
 }
 
+.selectLevel .setmeal.active .delete_price {
+  color: #fff;
+}
+
+.selectLevel .setmeal .delete_price {
+  color: #5E5E64;
+}
+
 .selectLevel .setmeal.active .edition_price {
   color: #FFFFFF;
 }

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

@@ -110,11 +110,19 @@
 .icon-corner-mark {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKUSURBVHgB7ZdPaxNBGIffmYS2aqBRKkWxur2lLWJy0HtbBY/6AfzTa3vQb6AeBA9CBbF4FLx4M54EQVZPCj3EeDF4MQepFkXXUqXYdqbzbrtlu53p7sxOsnvoc8lMZpY8eZN3frsA++yTXyovGw6BnIOStJe6uRYdfdWokiJ1OUCZQk6puM1rgSTOc1nREbd5g3B4EH4vdxUddZu3opJIriqKksDhtmwtN6Jj7sdZzvlN1Xrmos7zRvlguTALnF/fa1+mor5kP3XFsBq3NzPR4CAXQyfJ/kxEdSWRrouaSCJdFQ1HImjStQM/Gom6dKWiskjUpeMVVUWiLh2t6F6RqEvHROMiURfrokkjMUqldACW1tZhYeW/dL0AFglF4kWd62acQbg/dhKuDg3AspBtLv3btcdaM+FBLiQbkCC3ISI5PTy4PZ842i/dZ0XUNG2ikkj92y/p3tSiNiUftReh/v23dH+qZjKNRJXk3JdF5TXGzYSRSCl5hpLH+3rg4elTcHdkCIj46vPeX7ApaSyKkUg5PBbDPpxfOTEAl44d8dfOlktKWVNJgactuhWJ96LvB6Iq2RSSItzIey1RVSQurKz6r+cOl0Amm0Zyy/RF4mZKEonTQmgmIjTvLfvSxpICts7GY0V1I1Emm0ZSNGv708SZ4SLESWIkcp44bebamxIyWV1JX5SzO/iq/I/iQd5ziL7DIWgSNFH4P2skKarZmqxO4biokjRJmzBYWbwTwtPg9Y8/8PTrT9DE44SNBxPSCUkbrDF2+fP5Wj2Y78h6jMRCr38H5EB2eIyzqbAksi2a9inRBuKzPzDCaq3J2pPomv/T23hKTAM2DXa3TDCA2HwA08ATekKOv+UM6q0LtTdxF2wAr7U5snLQCTUAAAAASUVORK5CYII=);
 }
+.iconcornermark {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAALVSURBVHgB7Zg/TBNRGMC/16stdkBMGFiMNUJEXTDGxQ0TEyZD2ZjUUROjIxu66VSIEZyMDiYyKCoOTBJdGFyIC2HRSwyTmjTFiLVcH++79EE57sH7d727pL8Obe/eJb/vvvfe990BdOjQIbX0zy5MEkgp/TPvy+zrXhZSRrE83+PkHJS/gf9TlQGUz+azSwB0iB9LTQBMvujknSUmXGw9nooARPJI4gM4SB5J9CIeKM8P0ZzD5jz0iMZkIKGcnvlw3ZcnYnkkkVNo4MnCXUrolMzYxGUAq6usPJKoDKA8UHpf5ZrEBMBbA1Ak9l0o2BqoEmsGwloDVWIL4LACJUssAdiSR9oegE15pK2LWKY1UKVthUy2NVClLVNIpTVQJfIMqLYGqjgQITqtAWds8AS8vHYZxs+fhOr/LVj9VQ0dF9kU0m0NEJR/NLxb26q1Olx8thg61vouZNoaBOWRDZYBEVYDMG0NwuSRx1/WhNdYm0KmBUokP/FxBV6v/RBeZyWAuOQR410oKC+7e3BM5BGjALA1yOScZUKgjx+bHbkEvYUu6M4fgaun+mD9z6YwCFN5RkW7kIlag+5cbs84FETRIBbkGdTVygC2BkDoUybfFTz382/Nv/OtBDNhR54tYEIWlQPwqyvQh6Lzq7+rsL6xKQzibO8xK/IIpTCttAuptAZjZ9hdviJXDnTkka2ad1w6A83WYEJ2vCgTQXTl2cbx/Nud0blDK7FJa/CmKSbKhK48UgfvAX4fmAHeGrBoR0ATUSZM5Cml099vj77C38IAmgVqmS2SQTCEB3GOLWDCPpOfv+rLA7heoTFeeTf3D/+HLmLbD9628OWJN+zeKrn82L5ClmT5DPVKrfLIngzsvDWw/OBtStid5+xkIKq3BqbggvWOehfC5BE/A1G+NdCCQoVm6AsPGlMicQ4xefC2BhNmvZXLepsVaHif6gV4694sVWQu3QaN+GdhSSzy1QAAAABJRU5ErkJggg==);
+    background-size: contain;
+}
 /* 对号角标--金色 */
 .icon-gold-mark {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAK2SURBVHgB7ZhPaxNBGMbfSbKaGtSkIoigFqtCBaH9AoIHe1YQPNpvoN68WW/ektw8+hF6FDyIXrwINRdvwoLgQUubNqXp352+b7pTtslOdv5tsgv5wZLdzQw8z7w7M88uwIQJE3JLp9V8yyCndFqNesDhVe4MbKzWq0XG6hxgia5zZYDEFxj7gqfz4l5uDKD4mVD8TPR+LgzIxBOZNzBMPJFpAyh+PhRflbUpQEbZbjVfJIknMlkBFP/yiPOGStvMVYB2V1XxRKYqQOIDzpd1+mTGgIgGoMnYDfRHA13GaiAuGugyNgNJG5QqYzHgSjwxcgMuxRMjNaASDXQZ2UamGg10GUkFdKKBLqlXQDca6FKEFDGJBgKvNgeVO8/g3JUHEBx0INjbiG2XmoEwGrwBA0j81M1FYIUSsOJ5KF28Bfv/fsS2LYFjRDRA8UtggBAfhR/tSds7NSCiATeMBnHiid2/36R9nE3icINaBcfiu38+w+Hmb2k/J8uo7e46TPzB+q+hfa0ncb/40qVZqNx9nrh6CGzEE1YGwmjwHU+viXsXbj+BglfprR5e9R6a2IKguxbb31Y80jaeA7JoQMKjTN1YBG96bqC/A/GEb1SBMBp8wNNy/3/8cAe8y7Nn7tF1tBKOxNME/qRtINxd38v+D7r/e8++zESxfNWJeIIx1tBahXSigTd9Hx+fxypNjcQTqKWmvJGdRAOu/NVACEoyYSoeR/5jbeF1O9GATTRIMmEqnsA5+I5+hxqwjQaEzISNeHwSmjj6Pp1LDbh8dyWhFMjK1x/2llnKNqbiER+PZXERO4ldv3g7xMfRfyRGnxjYyDIu/mlUPHGmAml8NXDEwMgLTiuQ1lcDW2jC4rEQJ57oVSDNrwaGtFHYCi2VMuECZvPi7ZA2Hj6K/omiv+L5Cm1SKh2PAfYfhuYsH+/JAAAAAElFTkSuQmCC);
     background-size: contain;
 }
+.icongoldmark {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAK2SURBVHgB7ZhPaxNBGMbfSbKaGtSkIoigFqtCBaH9AoIHe1YQPNpvoN68WW/ektw8+hF6FDyIXrwINRdvwoLgQUubNqXp352+b7pTtslOdv5tsgv5wZLdzQw8z7w7M88uwIQJE3JLp9V8yyCndFqNesDhVe4MbKzWq0XG6hxgia5zZYDEFxj7gqfz4l5uDKD4mVD8TPR+LgzIxBOZNzBMPJFpAyh+PhRflbUpQEbZbjVfJIknMlkBFP/yiPOGStvMVYB2V1XxRKYqQOIDzpd1+mTGgIgGoMnYDfRHA13GaiAuGugyNgNJG5QqYzHgSjwxcgMuxRMjNaASDXQZ2UamGg10GUkFdKKBLqlXQDca6FKEFDGJBgKvNgeVO8/g3JUHEBx0INjbiG2XmoEwGrwBA0j81M1FYIUSsOJ5KF28Bfv/fsS2LYFjRDRA8UtggBAfhR/tSds7NSCiATeMBnHiid2/36R9nE3icINaBcfiu38+w+Hmb2k/J8uo7e46TPzB+q+hfa0ncb/40qVZqNx9nrh6CGzEE1YGwmjwHU+viXsXbj+BglfprR5e9R6a2IKguxbb31Y80jaeA7JoQMKjTN1YBG96bqC/A/GEb1SBMBp8wNNy/3/8cAe8y7Nn7tF1tBKOxNME/qRtINxd38v+D7r/e8++zESxfNWJeIIx1tBahXSigTd9Hx+fxypNjcQTqKWmvJGdRAOu/NVACEoyYSoeR/5jbeF1O9GATTRIMmEqnsA5+I5+hxqwjQaEzISNeHwSmjj6Pp1LDbh8dyWhFMjK1x/2llnKNqbiER+PZXERO4ldv3g7xMfRfyRGnxjYyDIu/mlUPHGmAml8NXDEwMgLTiuQ1lcDW2jC4rEQJ57oVSDNrwaGtFHYCi2VMuECZvPi7ZA2Hj6K/omiv+L5Cm1SKh2PAfYfhuYsH+/JAAAAAElFTkSuQmCC);
+    background-size: contain;
+}
 /* 对号-金色 */
 .icon-gold-duihao{
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAACE4AAAhOAFFljFgAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAOMSURBVHgB7ZffThNBFMbPmW1LqiY+An0D4BGq1yo8AeXSq0p8gJZLQYPihV5oVo1GQzTorUAKCUZDMOwbyBtIKNoI7YznnJltMbFL/xGaMB8Ju0t2Z35nznfODABeXl5eXl5eXhdXCEMos7tSMqiKdIukFzh2c7bdu0MXQGP3QwigCgRumJ8RDeJcMHaj/L/3FQyR6t/fh8ZAgagNSRYXmR9Msd03QxNAY3c5JFCCN/zjnEFh0FOSUVIwBKrvLIemYdg2/EjM7B5ASgLKPeiX7b499xqo77wjz2OBMRUqQUKljCZ6eUaM1PjkRLvvz9VC9e235HlTYKs0PeP8j7K2JqI05JPGCOCcdLT9hlae4UXo7CMXaT9oIspAHiem9pPGSayB6upCifJYoMXYR4MfL1+/OweDgP/2OgReefzHwUaK19BfFRB86lR4VtsaqK4vlEDrMvvR9WNO8yel1Gw2P7sHPcO/opWHQux1sDcWRoyjIhWkO4Jnta8Bbe7E+QT5TfyIt7SBSq2ymIMe9OdrSJ7XBVk223B4TANuFnroCj4xgLiltXqymxBgVANWDiqLk9AN/JdQVl52WONaZfOqOcMEn+kKPjkAMBv2ylFoBOO2FZnMjAagVmqbj0vQEfzz0KAtWLs1mbjho91xMUqlRrqGTwzgKEjP0FybYGeSiOLIuNAkLKPLh5WlRUiEfxbS29OSS9mUDNq9yjqHEh2l0tme4C3OKaqu3itT2kvsVW7PUmioZGYJxD5Tv05NZfO3905+W9t66g5mthGILeV9GkueVZTOXOkZvqMAWL/X5ovk+4eSCIFodQ1OIsqOCT9Qp67FQdS2npyAt2/btkl9RsmOG6VHNMHP9AzfcQCsw8/z48S6QvA5hrK9tRWMy8RPCmeOTDIOGEyjA3ZRQ/OZ4DNZ6Bu+qwBY3D4bulEhkFHrAUUHFuXGsT2de7v1i3LDO9vEV/J8JhsMBJ7V1VmIN7BjFUxobZbird+d2wlaC507x9j2yBVr+5eNAwYLLwDQo36tPyiRmUtuiNaKO5tIv7f36HwfZS6lBgovE0MfOli7P6lUEBLsVRsANAu1FYjiY3KUOaYdNj9YeDthn+K64J2Zgsi54fa40OOi5VY5Uh85E3hW3/8PcF0ooDO7wQ27OUEOrfe5Hs4UntV3Bk6qWnlUphUpkuEpALWZbVyaOUt4Ly8vLy8vL6+Lrr/CIHcDBg9ELwAAAABJRU5ErkJggg==) no-repeat center center;

src/web/staticres/css/subscribe_new.css

@@ -798,6 +798,36 @@
     text-align: center;
     margin: 0 30px;
     cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    transition: 0.7s;
+}
+
+.subpage-button::after {
+    position: absolute;
+    left: 0;
+    top: 0;
+    content: '';
+    display: block;
+    width: 180px;
+    height: 46px;
+    background-image: linear-gradient(
+            0deg,
+            rgba(0, 0, 0, 0),
+            rgba(255, 255, 255, 0.3),
+            rgba(0, 0, 0, 0)
+    );
+    transform: rotate(-45deg) translate(0, -360px);
+}
+.subpage-button:hover::after {
+    /* 过渡效果只能再鼠标放上去生效 不然鼠标离开也会有效果 */
+    transition: 1s ease-in-out;
+    transform: rotate(-45deg) translate(0, 80px);
+}
+
+.subpage-button:hover {
+    transform: scale(1.2);
+    box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.5);
 }
 
 .subpage-button.gold {

src/web/staticres/js/login.js

@@ -210,9 +210,6 @@ var getNewShareId = function(num,isFirst){
 					$(".wxlinkdiv").attr("src","/front/share/"+pageshareid);
 					break;
 				case "11"://订阅页面
-					$("#dyym-1 img").attr("src","/front/share/"+kopshareid);
-					$("#dyym-2").attr("src","/front/share/"+pageshareid);
-					$(".secondleft img").attr("src","/front/share/"+pageshareid);
 					$("#vipCode").attr("src","/front/share/"+kopshareid);
 					break;
 				case "12"://搜索列表页

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

@@ -84,18 +84,19 @@
             <div class="j-container">
                 <div class="j-main">
                     <div class="selectLevel select-common">
-                        <div class="selectTitle">选择会员等级</div>
+                        <div class="selectTitle">选择会员套餐</div>
                         <div class="levelList">
-                            <div class="setmeal" v-for="(item,index) in edition" :class="{active:index==grades}" @click="grade(index)">
+                            <div class="setmeal" v-for="(item,index) in edition" :class="{active:index==grades,sjactive:index==0}" @click="grade(index)">
                                 <div class="edition">${item.setmeal}</div>
-                                <div class="edition_price">${item.setmealprice}</div>
-                                <span class="cornermark j-icon  icon-gold-mark"></span>
+                                <div class="delete_price">${item.bs_price}</div>
+                                <div class="edition_price"><spanc class="icon_money">￥</spanc>${item.setmealprice}</div>
+                                <span class="cornermark j-icon" :class="{iconcornermark:index==0,icongoldmark:index==1}"></span>
                             </div>
                         </div>
                     </div>
                     <div class="selectyearnum select-common">
                         <div class="selectTitle">选择购买年数</div>
-                        <div class="levelList">
+                        <div class="levelList levelyear">
                             <div class="setmeal" v-for="(item,index) in columns" :class="{activeyear:index==gradeyear}" @click="gradeYear(index)">
                                 <div class="edition">${item}年</div>
                                 <span class="cornermark j-icon  icon-gold-mark"></span>
@@ -103,9 +104,9 @@
                         </div>
                     </div>
                     <!--S-手机号输入-->
-                    <div class='order-phone-group'>
-                        <label for='order_phone'>手机号码</label>
-                        <input id='order_phone' autocomplete='off' placeholder='请输入手机号码' maxlength='11' type='tel' />
+                    <div class="order-phone-group">
+                        <label for="order_phone">手机号码</label>
+                        <input id="order_phone" autocomplete="off" placeholder="请输入手机号码" maxlength="11" type="tel" />
                         <p>手机号码输入错误</p>
                     </div>
                     <!--E-手机号输入-->
@@ -289,8 +290,8 @@
             gradeyear:0,
             beforeall:0,
             afterall:0,
-            beforeprice:27999,
-            afterprice:21999,
+            beforeprice:9999,
+            afterprice:7999,
             numberStatus:999,
             hasAccountsOrder:true,
             // 价格参数
@@ -307,46 +308,54 @@
                 {listname:'企业全景分析'}
             ],
             edition: [
+            //     {
+            //         setmeal:"商机版",
+            //         setmealprice:"￥7,999/年"
+            //     },
+            //     {
+            //         setmeal:"智慧版",
+            //         setmealprice:"￥19,999/年"
+            //     },
+            //     {
+            //         setmeal:"专家版",
+            //         setmealprice:"￥27,999/年"
+            //     }
                 {
-                    setmeal:"商机版",
-                    setmealprice:"￥7,999/年"
+                  setmeal:"商机版2.0",
+                  bs_price:"￥9,999",
+                  setmealprice:"7,999"
                 },
                 {
-                    setmeal:"智慧版",
-                    setmealprice:"￥19,999/年"
-                },
-                {
-                    setmeal:"专家版",
-                    setmealprice:"￥27,999/年"
+                  setmeal:"专家版2.0",
+                  bs_price:"￥25,999",
+                  setmealprice:"19,999"
                 }
             ],
             // 产品服务清单
             serverList_sj: [
                 {listname:'招标大数据搜索'},
                 {listname:'招标订阅推送'},
-                {listname:'项目进度监控'},
                 {listname:'招标附件下载'},
-                {listname:'企业情报监控'},
-            ],
-            serverList_zh:[
-                {
-                    listname:'包含【商机版】全部服务',
-                    addclass:'gold'
-                },
-                {listname:'潜在项目预测推送'},
-                {listname:'中标企业预测'},
-                {listname:'投标决策分析'},
                 {listname:'采购单位全景分析'},
-                {listname:'企业全景分析'}
+                {listname:'企业全景分析'},
+                {listname:'潜在项目预测'},
+                {listname:'项目进度监控（100个）'},
+                {listname:'企业情报监控（100个）'},
+                {listname:'在线数据导出（每日100条）'},
+                {listname:'专属客服服务'},
             ],
             serverList_zj:[
                 {
-                    listname:'包含【智慧版】全部服务',
+                    listname:'包含【商机版2.0】全部服务',
                     addclass:'gold'
                 },
+                {listname:'项目进度监控（500个）'},
+                {listname:'企业情报监控（500个）'},
+                {listname:'在线数据导出（每日200条）'},
+                {listname:'中标企业预测'},
+                {listname:'投标决策分析'},
                 {listname:'业务拓展分析'},
-                {listname:'市场分析'},
-                {listname:'企业情报监控'}
+                {listname:'市场分析'}
             ],
             OrderPhoneCheck: {}
         },
@@ -363,11 +372,8 @@
               if (meal == 'sj') {
                 this.grades = 0
                 this.severList = this.serverList_sj
-              } else if (meal == 'zh') {
-                this.grades = 1
-                this.severList = this.serverList_zh
               } else if (meal == 'zj') {
-                this.grades = 2
+                this.grades = 1
                 this.severList = this.serverList_zj
               } else {
                 this.grades = 0
@@ -441,13 +447,11 @@
               }
                 var _this = this
                 console.log(_this.grades)
-                var level = 3
+                var level = 6
                 if(_this.grades == 0){
-                    level = 3
+                    level = 6
                 }else if(_this.grades == 1){
-                    level = 2
-                }else if(_this.grades == 2){
-                    level = 1
+                    level = 7
                 }
                 var paramsMid = utils.getParam('mid') //引流语文案id
                 var buyerId = utils.getParam('bid') // 从采购单位画像页面携带的加密id
@@ -546,11 +550,9 @@
                 console.log(this.grades)
                 console.log(this.gradeyear)
                 if(this.grades==0){
-                    this.beforeprice = 7999
+                    this.beforeprice = 9999
                 }else if(this.grades== 1){
-                    this.beforeprice = 19999
-                }else if(this.grades==2){
-                    this.beforeprice = 27999
+                    this.beforeprice = 25999
                 }
                 if(this.gradeyear==0){
                     yearnum = 1
@@ -565,11 +567,9 @@
             getDisPrice:function(){
                 var yearnum= 1
                 if(this.grades==0){
-                    this.afterprice = 5999
+                    this.afterprice = 7999
                 }else if(this.grades== 1){
-                    this.afterprice = 15999
-                }else if(this.grades==2){
-                    this.afterprice = 21999
+                    this.afterprice = 19999
                 }
                 if(this.gradeyear==0){
                     yearnum = 1
@@ -591,8 +591,6 @@
                 if(index==0){
                     this.severList = this.serverList_sj
                 }else if(index==1){
-                    this.severList = this.serverList_zh
-                }else if(index==2){
                     this.severList = this.serverList_zj
                 }
                 this.getPayPrice()

src/web/templates/pc/dataExport_sieve.html

@@ -829,6 +829,7 @@
                     <div class="info-select-box all">
                         <span class="info-select-now all">全部</span>
                         <span class="info-select-now split">拟建项目</span>
+                        <span class="info-select-now split">采购意向</span>
                         <span class="info-select-now split">招标预告</span>
                         <span data-value="招标预告_预告">预告</span>
                         <span data-value="招标预告_预审">预审</span>

src/web/templates/pc/subscribe_new.html

@@ -56,7 +56,7 @@
 <!--购买按钮-->
 <div class="line-flex CfadeInUp">
     <div class="subpage-button gold  open-customer" id="go-info-subscribe-0">了解详情</div>
-    <div class="subpage-button darkblue" data-go-buy-subscribe id="go-buy-subscribe-0">立即购买</div>
+    <div class="subpage-button darkblue" id="go-buy-subscribe-0"  data-go-buy-subscribe>立即购买</div>
 </div>
 
 <div class="space_60px"></div>
@@ -83,13 +83,13 @@
                 <div class="content">搜索全国超七千万企业工商、项目情报信息。</div>
             </div>
             <div class="content-right">
-                <img src="/images/subscribe/scenario_1.png" alt="" style="width: 706px;height: 432px">
+                <img src="{{Msg "seo" "cdn"}}/images/subscribe/scenario_1.png?v={{Msg "seo" "version"}}" alt="" style="width: 706px;height: 432px">
             </div>
         </div>
         <div class="space_30px"></div>
         <div class="line-flex">
             <div class="subpage-button gold  open-customer" id="go-info-subscribe-1">了解详情</div>
-            <div class="subpage-button darkblue" data-go-buy-subscribe id="go-buy-subscribe-1">立即购买</div>
+            <div class="subpage-button darkblue" id="go-buy-subscribe-1"  data-go-buy-subscribe>立即购买</div>
         </div>
     </div>
     <!--线索获取更精准-->
@@ -111,13 +111,13 @@
                 <div class="content">企业联系方式全公开，一键直达项目负责人。</div>
             </div>
             <div class="content-right">
-                <img src="/images/subscribe/scenario_2.png" alt="" style="width: 532px;height: 432px">
+                <img src="{{Msg "seo" "cdn"}}/images/subscribe/scenario_2.png?v={{Msg "seo" "version"}}" alt="" style="width: 532px;height: 432px">
             </div>
         </div>
         <div class="space_30px"></div>
         <div class="line-flex">
             <div class="subpage-button gold  open-customer" id="go-info-subscribe-2">了解详情</div>
-            <div class="subpage-button darkblue" data-go-buy-subscribe id="go-buy-subscribe-2">立即购买</div>
+            <div class="subpage-button darkblue" id="go-buy-subscribe-2"  data-go-buy-subscribe>立即购买</div>
         </div>
     </div>
     <!--分析决策更科学-->
@@ -139,13 +139,13 @@
                 <div class="content">订阅招标项目信息提供周报/月报多维分析，帮助销售管理者快速做出预判与决策。</div>
             </div>
             <div class="content-right">
-                <img src="/images/subscribe/scenario_3.png" alt="" style="width: 630px;height: 432px">
+                <img src="{{Msg "seo" "cdn"}}/images/subscribe/scenario_3.png?v={{Msg "seo" "version"}}" alt="" style="width: 630px;height: 432px">
             </div>
         </div>
         <div class="space_30px"></div>
         <div class="line-flex">
             <div class="subpage-button gold  open-customer" id="go-info-subscribe-3">了解详情</div>
-            <div class="subpage-button darkblue" data-go-buy-subscribe id="go-buy-subscribe-3">立即购买</div>
+            <div class="subpage-button darkblue" id="go-buy-subscribe-3"  data-go-buy-subscribe>立即购买</div>
         </div>
     </div>
 </div>
@@ -155,7 +155,7 @@
         <div class="line-flex">
             <span class="split-box--before"></span>
             <div class="second-desc">免费订阅</div>
-            <img src="/images/subscribe/sub-compare.png" alt="对比" style="width: 39px;height: 18px;margin: 0 10px;">
+            <img src="{{Msg "seo" "cdn"}}/images/subscribe/sub-compare.png?v={{Msg "seo" "version"}}" alt="对比" style="width: 39px;height: 18px;margin: 0 10px;">
             <div class="second-desc">超级订阅</div>
             <span class="split-box--after"></span>
         </div>
@@ -245,11 +245,26 @@
     </div>
 </div>
 <div class="app-bottom-box">
-    <img class="app-bottom-tobuy" src="/images/subscribe/sub-bottom-bg.png" usemap="#image_map">
+    <img class="app-bottom-tobuy" src="{{Msg "seo" "cdn"}}/images/subscribe/sub-bottom-bg.png?v={{Msg "seo" "version"}}" usemap="#image_map">
     <map name="image_map">
         <area data-go-buy-subscribe coords="1553,95,1853,174" shape="rect">
     </map>
 </div>
+
+<!-- 超级订阅弹窗 -->
+<div class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel">
+    <div class="modal-dialog modal-dialog-subvip modal-sm" role="document">
+        <div class="modal-content">
+            <img src="{{Msg "seo" "cdn"}}/images/subscribe/vip_toUse.png?v={{Msg "seo" "version"}}" alt="" style="width: 335px;height: 447px">
+            <button type="button" class="close vip" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <div class="vip-code">
+                <img id="vipCode" alt="" style="width: 139px;height: 139px">
+                <p class="vip-text">扫描二维码购买超级订阅</p>
+            </div>
+        </div>
+    </div>
+</div>
+
 <button class="btn hidden" id="cb-01" data-toggle="modal" data-target="#myModal-01"></button>
 <!--百度统计start-->
 {{include "/common/pcbottom.html"}}
@@ -257,21 +272,30 @@
 <!--百度统计end-->
 <script src="https://cdn.jsdelivr.net/npm/countup.js@1.9.3/dist/countUp.js"></script>
 <script>
+    haslogin({{.T.logid}});
+    toggleShowBuy({{.T.isBuyed}})
     window.onbeforeunload = function(){
         document.documentElement.scrollTop = 0;  //ie下
         document.body.scrollTop = 0;  //非ie
     }
     function toggleShowBuy (type) {
         if (type) {
+            //已购买扫码使用
             $("div*[data-go-buy-subscribe]").siblings().hide()
-            $("div*[data-go-buy-subscribe]").text('立即使用')
+            $("div*[data-go-buy-subscribe]").text('立即使用').attr("data-toggle","modal").attr("data-target",".bs-example-modal-sm")
             $(".app-bottom-box").hide()
         } else {
+            //为购买点击跳转购买链接
             $("div*[data-go-buy-subscribe]").siblings().show()
-            $("div*[data-go-buy-subscribe]").text('立即购买')
+            $("div*[data-go-buy-subscribe]").text('立即购买').on("click",function (){
+                window.location.href="/"
+            })
             $(".app-bottom-box").show()
         }
     }
+    $("#myModal-01").on("hidden.bs.modal", function () {
+        $(".public-nav").css({"padding-right":""});
+    })
     $(function () {
         ;(function animateUp(){
             var obj = $('.CfadeInUp');
@@ -288,7 +312,6 @@
             // 循环数组，判断obj的位置是否在可视区中
             function judgeTop(){
                 for(var j=0; j<num.length;j++){
-                    console.log(j,wScrollTop,num[j],wScrollTop+wH-50,num[j] >= wScrollTop && num[j] < (wScrollTop+wH-50))
                     if (num[j] >= wScrollTop && num[j] < (wScrollTop+wH-50)) {
                         if(j == 0){
                             obj.eq(j).css({
@@ -357,6 +380,7 @@
         }
         $(window).scroll(windowScrollFn)
     })
+
 </script>
 </body>
 </html>

src/web/templates/pc/supsearch.html

@@ -1207,6 +1207,10 @@ var IframeOnClick = {
 					<font class="parent-node infoFist">拟建项目</font>
 					<font data-value="拟建" class="hidden">拟建</font>
 					<a id="whole"><img class="q-mark" id="q-mark"  src="{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png" alt="" /></a>
+          <i class="diver"></i>
+          <font class="parent-node infoFist">采购意向</font>
+					<font data-value="采购意向" class="hidden">采购意向</font>
+					<a id="whole"><img class="q-mark" id="q-mark"  src="{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png" alt="" /></a>
 					<i class="diver"></i>
 					<font class="parent-node">招标预告</font>
 					<font data-value="预告">预告</font>