Merge branch 'dev4.4' of http://192.168.3.207:10080/qmx/jy into dev4.4

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -66,7 +66,6 @@ var mine = {
                     // 超级订阅状态(0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期)
                     if (r.data.subscribeVip > 0) {
                         $('.user .u_left').addClass('vip')
-                        $('.ent-search').attr('data-href', '/jyapp/vipsubscribe/entSearch')
                     } else {
                         $(".govip").show();
                         $('.user .u_left').removeClass('vip')
@@ -221,6 +220,9 @@ var mine = {
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power
                     }
+                    if (res.viper) {
+                        $('.ent-search').show().attr('data-href', '/jyapp/vipsubscribe/entSearch')
+                    }
                     _this.setBigVipState()
                 }
             }

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/price.js

@@ -46,7 +46,7 @@ var Calculation = {
             },
             "provincePrice": 3800,
             "provinceMaxCount": 15,
-            "monthMaxCount": 9
+            "monthMaxCount": 10
         },
         "discount": 1
     }, //套餐价格表
@@ -59,7 +59,7 @@ var Calculation = {
         this.OldBuyset = oldBuyset;
         this.RenewList = renewList;
         this.EndTime = endTime;
-        //this.PriceRule = price;
+        if (price) this.PriceRule = price;
     },
     Check: function (tmpBuyset, oldBuyset) { //校验是否合法
         if (!oldBuyset) {
@@ -208,6 +208,7 @@ var Calculation = {
         } else {//新版大会员价格计算
             let pCount = vipbuyset.areacount
             let count = t[0]
+            let unit = t[1]
             if (pCount > this.PriceRule.new.provinceMaxCount) {
                 pCount = -1
             }
@@ -215,10 +216,11 @@ var Calculation = {
                 pCount = 0
             }
             //当选择月份大于  按照全年计算
-            if (t[0] > this.PriceRule.new.monthMaxCount && t[1] === 2) { //月份十个月以上价格一样
-                count = 10
+            if (t[0] > this.PriceRule.new.monthMaxCount && unit === 2) { //月份十个月以上价格一样
+                count = 1
+                unit = 1
             }
-            return this.getSetMealPrice_new(pCount, t[1]) * count //全国1行业套餐
+            return this.getSetMealPrice_new(pCount, unit) * count //全国1行业套餐
         }
     },
     getSetMealPrice_old: function (c, iCount, u) { //旧套餐价格计算

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -775,7 +775,7 @@ $(function () {
   $('.vip-footer .button-r.confirm').on('click', function () {
     console.log("object")
       $(this).attr("disabled", "disabled");
-      doSubmit();
+      // doSubmit();
       $(this).removeAttr("disabled");
   });
   // 以下数据交互 -------------------
@@ -789,13 +789,8 @@ $(function () {
       checkmerge(state.industry, state.isread)
       // init 已选择的区域和行业
       // var selectedAreaAndInd = getBuySet(state.area, state.industry);
-      // 2021-5-21修改 每次从接口buyset里取，不用通过common.js里公共函数处理 
-      var selectedAreaAndInd = {
-        areacount: state.buyset.areacount,
-        buyerclasscount: state.buyset.buyerclasscount,
-        citys: state.buyset.newcitys
-      }
-      console.log(selectedAreaAndInd, 'selectedAreaAndInd')
+      // 2021-5-21修改 初始化已选择的区域和行业 
+      var selectedAreaAndInd = getSelectBuyset(state.area, state.industry)
       setSelectedAreaAndInd(selectedAreaAndInd);
       // 初始化，已购买的城市和行业
       setBuyAreaAndInd(state.buyset);
@@ -865,6 +860,10 @@ $(function () {
             showGiveStatus(true)
           }
       }
+      // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
+      if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
+        $('*[data-bind-update]').hide()
+      }
   }
 
 
@@ -875,6 +874,7 @@ $(function () {
   var readcache = sessionStorage.getItem('index_read_cache');
   var reqData = JSON.parse(subVipState);
   console.log(readcache,'readcache')
+  /*
   if (readcache) {
       sessionStorage.removeItem('index_read_cache');
       init(reqData);
@@ -917,7 +917,7 @@ $(function () {
       if (status[0] === -1) {
           //直接修改
           $(".vip-footer.modify").show();
-          doSubmit()
+          // doSubmit()
           // initBack(1);
           return
       }
@@ -992,7 +992,9 @@ $(function () {
 
   } else {
       getDataWitXHR()
-  }
+  }*/
+  // 每次请求接口
+  getDataWitXHR()
 
 
   //保存 or 升级

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -20,10 +20,11 @@ var renew = {
         renewList: []
     },
     init: function () {
+        this.initEvents()
         this.recoverState()
         this.getPrice()
         this.getBuySetInfo()
-        this.initEvents()
+        this.setTimePickerSelected(this.timeSelect)
     },
     setAreaAndIndustry: function () {
         var buySet = this.buyInfo.buyset
@@ -84,7 +85,7 @@ var renew = {
                             _this.buyInfo.buyset.areacount,
                             _this.buyInfo.buyset.newcitys,
                             _this.buyInfo.buyset.buyerclasscount,
-                            _this.buyInfo.buyset.upgrade
+                            _this.buyInfo.buyset.upgrade || 0
                         )
                     )
                     // 初始化默认金额
@@ -105,12 +106,14 @@ var renew = {
             }
         })
     },
-    calcPrice: function () {
-        return Calculation.GetTotal(undefined, this.timeSelect)
+    // 计算价格
+    calcPrice: function (timeSelect) {
+        return Calculation.GetTotal(undefined, timeSelect ? timeSelect : this.timeSelect)
     },
+    // 设置价格
     setPrice: function (price) {
         this.price = price
-        coupon.updatePrice(formatMoney(this.price / 100))
+        coupon.updatePrice(this.price / 100)
     },
     // 根据选中结果得到一个时间段的时间戳
     getDuration: function (timeSelect) {
@@ -173,14 +176,14 @@ var renew = {
             month: month
         }
     },
-    checkOver3Years: function () {
+    checkOver3Years: function (timeSelect) {
         // 根据
         var endTime = this.buyInfo.endTime
         if (!endTime) {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(this.timeSelect)
+        var durationInfo = this.getDuration(timeSelect)
         var durationStamp = durationInfo.stamp // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
@@ -213,15 +216,19 @@ var renew = {
         }
     },
     setTimePickerSelected: function (timeSelect) {
-        timeSelect = [1 ,2]
-        if (timeSelect[1] === 1) {
+        if (timeSelect[1] == 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
-        } else if (timeSelect[1] === 2) {
+            var cButton = $('.year_number.j-button-select[data-id=' + timeSelect[0] + ']')
+            if (cButton) {
+                cButton.trigger('click')
+            } else {
+                $('input[value=year]').trigger('click')
+            }
+        } else if (timeSelect[1] == 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
+            $('input[value=month]').trigger('click')
+            $('#number_box_month .month_number').text(timeSelect[0] - 1)
+            $('#number_box_month button.add').trigger('click')
         }
     },
     getTimePickerSelected: function () {
@@ -241,10 +248,10 @@ var renew = {
         return timeSelectedArr
     },
     onTimePickerChange: function () {
-        this.timeSelect = this.getTimePickerSelected()
-        var price = this.calcPrice()
+        var timeSelect = this.getTimePickerSelected()
+        var price = this.calcPrice(timeSelect)
         $('.computed_price').text(formatMoney(price / 100))
-        this.checkOver3Years()
+        this.checkOver3Years(timeSelect)
     },
     // 恢复数据
     recoverState: function () {
@@ -278,8 +285,10 @@ var renew = {
         // 确认订阅周期
         $('#enter_period').on('click', function () {
             $('.weui-mask').trigger('click')
+            _this.timeSelect = _this.getTimePickerSelected()
             _this.calcDuration(true)
             _this.setPrice(_this.calcPrice())
+            _this.saveState()
         })
 
         $('.vip-footer.renew .confirm').on('click', function () {

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_upgrade.js

@@ -107,7 +107,7 @@ var purchase = {
     var old = this.oldBuySet
     //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
     console.log(new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade))
-    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, undefined, this.endTime)
+    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList,  purchase.price, this.endTime)
 
     if (sessionStorage.getItem("payWay")) {
       if (sessionStorage.getItem("payWay").indexOf("ali") > -1) {
@@ -191,13 +191,17 @@ var purchase = {
     }
     this.timeValue = tmp;
   },
+  // 计算价格
   flushPrice: function (time, flag) {
-    //var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
     var times = [time[0], time[1]];
     // var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time); // 2021-5-20
     // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 : time[0], time[1]]); // 2021-5-20
     var obj = this.nowBuyset
-    console.log(obj, 'obj')
+    console.log(obj,  this.oldBuySet,'obj')
+    // 处理如果升级的
+    if (obj.areacount > this.oldBuySet.areacount) {
+      obj.areacount = this.oldBuySet.areacount
+    }
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
     console.log(typeof price,price, 'price')

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -138,7 +138,7 @@
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
-                    <div data-need-bind-phone class="menu_list ent-search" data-href='/jyapp/vipsubscribe/introducePage'>
+                    <div data-need-bind-phone class="menu_list ent-search" style="display: none;" data-href='/jyapp/vipsubscribe/introducePage'>
                         <div class="menu_list_left">
                             <span class="j-icon base-icon icon-qiyechaxun"></span>
                             <span class="label">企业查询</span>

src/jfw/modules/app/src/web/templates/vipsubscribe/commonRules.html

@@ -7,6 +7,7 @@
     text-align: center;
     font-size: .26rem;
     color: #5F5E64;
+    flex-shrink: 0;
   }
   .rights-item{
     padding: .32rem .28rem;

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -107,9 +107,13 @@
     }
 
     .j-button-confirm {
-      flex: none;
+      flex: 1;
+      width: 100%!important;
       border-radius: 0.08rem;
     }
+    .j-button-confirm:nth-child(1){
+      margin-right: .16rem;
+    }
   </style>
 </head>
 

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -233,7 +233,7 @@
                 </table>
                 <dl class="tips">
                   <dt class="b-line">购买须知</dt>
-                  <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                  <dd>套餐周期内，不支持套餐降级；</dd>
                   <dd>用户最多购买/续费3年套餐；</dd>
                   <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算）。</dd>
                   <!-- <dd>3个市及以上即为全省，16个省及以上即为全国。4个行业及以上即为全行业。</dd> -->
@@ -461,7 +461,7 @@
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-      <!-- <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script> -->
+      <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
       <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/price.js?v={{Msg "seo" "version"}}"></script>
       <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>

src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/js/login.js

@@ -80,6 +80,7 @@ var getNewShareId = function(num){
 			redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+      $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -155,7 +156,7 @@ var logic = function(shareid,num){
 			if(data.result=="ok"){
 				//$(".QRLogin").hide();
 				$("#bidLogin").modal("hide")
-				$("#bidcommunity").modal("hide")				
+				$("#bidcommunity").modal("hide")
 				clearInterval(loginfg);
 				processpage(shareid,num);
 				loginflag = true;
@@ -183,12 +184,12 @@ var logic = function(shareid,num){
 								+"</div>"
 								+"<div class='exitDiv' onclick='signout()'>"
 									+"<img id='outImg' src='/images/userexit.png'/>"
-									+"<span>退出</span>"	
+									+"<span>退出</span>"
 								+"</div>"
 							+"</div>"
-						+"</div>"	
+						+"</div>"
 				$("#login").html(hhtml);
-				infoListCss();	
+				infoListCss();
 				commonMouseEvent();
 			}
 		})
@@ -318,10 +319,10 @@ $.post("/front/hasSign",function(data, location){
 					+"</div>"
 					+"<div class='exitDiv' onclick='signout()'>"
 						+"<img id='outImg' src='/images/userexit.png'/>"
-						+"<span>退出</span>"	
+						+"<span>退出</span>"
 					+"</div>"
 				+"</div>"
-			+"</div>"	
+			+"</div>"
 		$("#login").html(hhtml);
 		infoListCss();
 		commonMouseEvent();
@@ -336,4 +337,4 @@ $.post("/front/hasSign",function(data, location){
 		kzyflag = true;//未登录进入快照页面
 		}
 	})
-}
+}

src/jfw/modules/portrait/src/web/staticres/portrait/login.js

@@ -1,7 +1,7 @@
 /**统一登录js文件**/
 var loginfg='';//websocket请求标识
 var bIE9=false;
-if(navigator.appName == "Microsoft Internet Explorer" && navigator.appVersion.match(/[6789]./i)) { 
+if(navigator.appName == "Microsoft Internet Explorer" && navigator.appVersion.match(/[6789]./i)) {
 	bIE9=true
 }
 var wsUrl = "ws"+(!bIE9&&"https:"==document.location.protocol?"s":"")+"://"+window.location.host+"/ws";
@@ -28,7 +28,7 @@ var entjumpflag = false;
 //页面是否被切换走
 var isPageHidden = false;
 try{
-	if(window.addEventListener) {    
+	if(window.addEventListener) {
 		document.addEventListener('visibilitychange',function () {
 		    if(document.hidden){
 				isPageHidden = true;
@@ -36,7 +36,7 @@ try{
 				isPageHidden = false;
 		    }
 		});
-	} 
+	}
 }catch(e){}
 //心跳检测
 var WebSocketHeartCheck = function(scoketType){
@@ -240,6 +240,7 @@ var getNewShareId = function(num){
 			//redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+      $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -303,7 +304,7 @@ var getNewShareId = function(num){
 					}
 					break;
 				case "20"://商务合作
-					
+
 					break;
 			}
 			if(num=="13"&&!kzyflag){
@@ -336,7 +337,7 @@ var logic = function(data,num){
 	if(data.result=="ok"){
 		//$(".QRLogin").hide();
 		$("#bidLogin").modal("hide")
-		$("#bidcommunity").modal("hide")				
+		$("#bidcommunity").modal("hide")
 		clearInterval(loginfg);
 		loginflag = true;
 		processpage(data.shareid,num);
@@ -369,10 +370,10 @@ var logic = function(data,num){
 						+"</div>"
 						+"<div class='exitDiv' onclick='signout()'>"
 							+"<img id='outImg' src='/images/userexit.png'/>"
-							+"<span>退出</span>"	
+							+"<span>退出</span>"
 						+"</div>"
 					+"</div>"
-				+"</div>"	
+				+"</div>"
 		$("#login").html(hhtml);
 		try{
 			infoListCss();
@@ -434,7 +435,7 @@ var processpage = function(shareid,num){
 			if(ful=="true"){
 				break;
 			}
-			
+
 			$("#myModal").modal("hide");
 			$("#labModal").modal("hide");
 			if(dataId!=""){
@@ -623,10 +624,10 @@ var haslogin = function(num,kyorpn,url){
 						+"</div>"
 						+"<div class='exitDiv' onclick='signout()'>"
 							+"<img id='outImg' src='/images/userexit.png'/>"
-							+"<span>退出</span>"	
+							+"<span>退出</span>"
 						+"</div>"
 					+"</div>"
-				+"</div>"	
+				+"</div>"
 			$("#login").html(hhtml);
 			try{
 				infoListCss();
@@ -671,7 +672,7 @@ function getlabstatus(){
         type:'post',
         url:'/jylab/supsearch/getstatus',
         async:false,
-        dataType:'json', 
+        dataType:'json',
         success:function(r){
 				if(r&&r.supstatus){
 					$(".superSearch").hide();
@@ -720,4 +721,4 @@ function changeEntAndSupStatus(w){
 	}
 	$.post("/jylab/changeEntAndSupStatus",{"data":data},function(){})
 
-}
+}

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -348,6 +348,9 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 
 //超级订阅获取购买项
 func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry []string, isUpgrade bool) *SubvipBuySet {
+	if area != nil && (*area)["全国"] != nil {
+		area = &map[string]interface{}{}
+	}
 	buyset := SubvipBuySet{}
 	if !isUpgrade {
 		buyset.Upgrade = 0 //升级版超级订阅标识
@@ -562,7 +565,8 @@ func (this *vipSubscribeStruct) GetSubVipPriceByBuySet(buySet *SubvipBuySet, cou
 			}
 			//当选择月份大于  按照全年计算
 			if count > SubVipPrice.New.MonthMaxCount && unit == 2 { //月份十个月以上价格一样
-				count = 10
+				unit = 1
+				count = 1
 			}
 			return getSetMealPrice(pCount, unit) * count //全国1行业套餐
 		}

src/jfw/modules/subscribepay/src/subvip_price.json

@@ -35,7 +35,7 @@
     },
     "provincePrice": 3800,
     "provinceMaxCount": 15,
-    "monthMaxCount": 9
+    "monthMaxCount": 10
   },
   "discount": 1
 }

src/jfw/modules/weixin/src/config.json

@@ -128,6 +128,7 @@
 		"jywkzmt":"jydocs",
 		"jywkseo":"jydocs",
 		"bidCourse":"bidCourse",
-		"digitalCoupon":"jycoupon"
+		"digitalCoupon":"jycoupon",
+		"digitalExpo":"jynew"
 	}
 }

src/jfw/tag/ad.go

@@ -60,7 +60,7 @@ func Ad(s_code string, n int) []adInfo {
 		if ok && res != nil && (*res)["a_son"] != nil {
 			son := (*res)["a_son"].([]interface{})
 			resmap := adHandle(son, s_code)
-			if len(resmap) > 0 {
+			if len(son) > 0 {
 				redis.PutCKV("other", "ad_"+s_code, son)
 			}
 			return resmap

src/seo.json

@@ -567,7 +567,8 @@
     },
     "urlSource": {
         "bidCourse": "/jyxsapp/",
-		"digitalCoupon":"?Rg=="
+		"digitalCoupon":"?Rg==",
+		"digitalExpoH5":"/active/digital/index"
     },
     "city": {
         "BJ_BJ": {

src/web/staticres/js/index_content.js

@@ -3,9 +3,6 @@ if(location.origin.indexOf('jianyu360.com') > 0 ){
   req_base = location.origin + '/';
 }
 
-console.log("---------最新资讯---------")
-
-
 
 
 function changeHorse(timp) {
@@ -22,7 +19,7 @@ $(function () {
 $("#index .search .tips span").on("click",function(){
   let i = $(this).index();
   $(this).parent().find('i').animate({
-    left: 14+(90*i) +'px'
+    left: 14+(95*i) +'px'
   },200)
   $("#index .search .tips span").removeClass('active')
   $(this).addClass('active')
@@ -30,9 +27,11 @@ $("#index .search .tips span").on("click",function(){
     $("#zbIndex").attr("action", '/jylab/supsearch/index.html');
     $("#zbIndex .ser").attr("name",'keywords')
     $("#index .search .index_search_thikn").hide()
+    $("#zbIndex input").attr('placeholder', '请输入您想要查询的招标信息')
   }else{
     $("#zbIndex").attr("action", '/jylab/bidsearchforent/index.html');
     $("#zbIndex .ser").attr("name",'searchvalue')
+    $("#zbIndex input").attr('placeholder', '请输入中标企业名称')
   }
 })
 
@@ -54,7 +53,7 @@ function thinkList(){
           }else{
             $("#index .search .index_search_thikn").hide()
           }
-          
+
         },
   })
 }
@@ -62,10 +61,8 @@ function thinkList(){
 function debounce(fn,delay) {
   var timeout = null; // 创建一个标记用来存放定时器的返回值
   return function (e) {
-    console.log('----"dcs"----',"dcs");
-    
       // 每当用户输入的时候把前一个 setTimeout clear 掉
-      clearTimeout(timeout); 
+      clearTimeout(timeout);
       // 然后又创建一个新的 setTimeout, 这样就能保证interval 间隔内如果时间持续触发，就不会执行 fn 函数
       timeout = setTimeout(() => {
           fn.apply(this, arguments);
@@ -78,9 +75,9 @@ $("#index .ser").bind("input propertychange",function(){
     debounce(thinkList(),500)
   }
 })
-  
 
 
 
 
-});
+
+});

src/web/staticres/js/login.js

@@ -200,6 +200,7 @@ var getNewShareId = function(num,isFirst){
 			//redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+			$("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -235,6 +236,7 @@ var getNewShareId = function(num,isFirst){
 					break;
 				case "14"://标签页面
 					$("#bottomimg").attr("src","/front/share/"+pageshareid);
+          $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 					$("#layerImg").attr("src","/front/share/"+pageshareid);
 					$("#keyImg").attr("src","/front/share/"+pageshareid);
 					break;

src/web/staticres/vipsubscribe/js/price.js

@@ -46,7 +46,7 @@ var Calculation = {
             },
             "provincePrice": 3800,
             "provinceMaxCount": 15,
-            "monthMaxCount": 9
+            "monthMaxCount": 10
         },
         "discount": 1
     }, //套餐价格表
@@ -59,7 +59,7 @@ var Calculation = {
         this.OldBuyset = oldBuyset;
         this.RenewList = renewList;
         this.EndTime = endTime;
-        //this.PriceRule = price;
+        if (price) this.PriceRule = price;
     },
     Check: function (tmpBuyset, oldBuyset) { //校验是否合法
         if (!oldBuyset) {
@@ -208,6 +208,7 @@ var Calculation = {
         } else {//新版大会员价格计算
             let pCount = vipbuyset.areacount
             let count = t[0]
+            let unit = t[1]
             if (pCount > this.PriceRule.new.provinceMaxCount) {
                 pCount = -1
             }
@@ -215,10 +216,11 @@ var Calculation = {
                 pCount = 0
             }
             //当选择月份大于  按照全年计算
-            if (t[0] > this.PriceRule.new.monthMaxCount && t[1] === 2) { //月份十个月以上价格一样
-                count = 10
+            if (t[0] > this.PriceRule.new.monthMaxCount && unit === 2) { //月份十个月以上价格一样
+                count = 1
+                unit = 1
             }
-            return this.getSetMealPrice_new(pCount, t[1]) * count //全国1行业套餐
+            return this.getSetMealPrice_new(pCount, unit) * count //全国1行业套餐
         }
     },
     getSetMealPrice_old: function (c, iCount, u) { //旧套餐价格计算

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -776,7 +776,7 @@ $(function () {
     //提交请求
     $('.vip-footer .button-r.confirm').on('click', function () {
         $(this).attr("disabled", "disabled");
-        doSubmit();
+        // doSubmit();
         $(this).removeAttr("disabled");
     });
     // 以下数据交互 -------------------
@@ -790,12 +790,8 @@ $(function () {
         checkmerge(state.industry, state.isread)
         // init 已选择的区域和行业
         // var selectedAreaAndInd = getBuySet(state.area, state.industry);
-        // 2021-5-21修改 每次从接口buyset里取，不用通过common.js里公共函数处理 
-        var selectedAreaAndInd = {
-          areacount: state.buyset.areacount,
-          buyerclasscount: state.buyset.buyerclasscount,
-          citys: state.buyset.newcitys
-        }
+        // 2021-5-21修改
+        var selectedAreaAndInd = getSelectBuyset(state.area, state.industry)
         setSelectedAreaAndInd(selectedAreaAndInd);
         // 初始化，已购买的城市和行业
         setBuyAreaAndInd(state.buyset);
@@ -873,6 +869,10 @@ $(function () {
             showGiveStatus(true)
           }
         }
+        // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
+        if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
+          $('*[data-bind-update]').hide()
+        }
     }
 
 
@@ -922,7 +922,7 @@ $(function () {
         if (status[0] === -1) {
             //直接修改
             $(".vip-footer.modify").show();
-            doSubmit()
+            // doSubmit()
             // initBack(1);
             return
         }

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -20,10 +20,11 @@ var renew = {
         renewList: []
     },
     init: function () {
+        this.initEvents()
         this.recoverState()
         this.getPrice()
         this.getBuySetInfo()
-        this.initEvents()
+        this.setTimePickerSelected(this.timeSelect)
     },
     setAreaAndIndustry: function () {
         var buySet = this.buyInfo.buyset
@@ -84,7 +85,7 @@ var renew = {
                             _this.buyInfo.buyset.areacount,
                             _this.buyInfo.buyset.newcitys,
                             _this.buyInfo.buyset.buyerclasscount,
-                            _this.buyInfo.buyset.upgrade
+                            _this.buyInfo.buyset.upgrade || 0
                         )
                     )
                     // 初始化默认金额
@@ -105,12 +106,14 @@ var renew = {
             }
         })
     },
-    calcPrice: function () {
-        return Calculation.GetTotal(undefined, this.timeSelect)
+    // 计算价格
+    calcPrice: function (timeSelect) {
+        return Calculation.GetTotal(undefined, timeSelect ? timeSelect : this.timeSelect)
     },
+    // 设置价格
     setPrice: function (price) {
         this.price = price
-        coupon.updatePrice(formatMoney(this.price / 100))
+        coupon.updatePrice(this.price / 100)
     },
     // 根据选中结果得到一个时间段的时间戳
     getDuration: function (timeSelect) {
@@ -173,14 +176,14 @@ var renew = {
             month: month
         }
     },
-    checkOver3Years: function () {
+    checkOver3Years: function (timeSelect) {
         // 根据
         var endTime = this.buyInfo.endTime
         if (!endTime) {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(this.timeSelect)
+        var durationInfo = this.getDuration(timeSelect)
         var durationStamp = durationInfo.stamp // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
@@ -213,15 +216,19 @@ var renew = {
         }
     },
     setTimePickerSelected: function (timeSelect) {
-        timeSelect = [1 ,2]
-        if (timeSelect[1] === 1) {
+        if (timeSelect[1] == 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
-        } else if (timeSelect[1] === 2) {
+            var cButton = $('.year_number.j-button-select[data-id=' + timeSelect[0] + ']')
+            if (cButton) {
+                cButton.trigger('click')
+            } else {
+                $('input[value=year]').trigger('click')
+            }
+        } else if (timeSelect[1] == 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
+            $('input[value=month]').trigger('click')
+            $('#number_box_month .month_number').text(timeSelect[0] - 1)
+            $('#number_box_month button.add').trigger('click')
         }
     },
     getTimePickerSelected: function () {
@@ -241,10 +248,10 @@ var renew = {
         return timeSelectedArr
     },
     onTimePickerChange: function () {
-        this.timeSelect = this.getTimePickerSelected()
-        var price = this.calcPrice()
+        var timeSelect = this.getTimePickerSelected()
+        var price = this.calcPrice(timeSelect)
         $('.computed_price').text(formatMoney(price / 100))
-        this.checkOver3Years()
+        this.checkOver3Years(timeSelect)
     },
     // 恢复数据
     recoverState: function () {
@@ -278,8 +285,10 @@ var renew = {
         // 确认订阅周期
         $('#enter_period').on('click', function () {
             $('.weui-mask').trigger('click')
+            _this.timeSelect = _this.getTimePickerSelected()
             _this.calcDuration(true)
             _this.setPrice(_this.calcPrice())
+            _this.saveState()
         })
 
         $('.vip-footer.renew .confirm').on('click', function () {
@@ -557,6 +566,7 @@ var coupon = new Vue({
     // 阅读协议点击事件
     readEvent: function () {
       renew.saveState()
+      toRead()
     },
     // 订单提交事件
     submitOrder: function () {

src/web/staticres/vipsubscribe/js/vip_upgrade.js

@@ -195,6 +195,9 @@ var purchase = {
 
     var obj = this.nowBuyset
     console.log(obj, 'obj')
+    if (obj.areacount > this.oldBuySet.areacount) {
+      obj.areacount = this.oldBuySet.areacount
+    }
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
     console.log(typeof price,price, 'price')
@@ -571,6 +574,11 @@ function clearSessionStorage() {
   sessionStorage.removeItem("historypushDataCache");
   sessionStorage.removeItem("endTime");
   sessionStorage.To_introducePage = 2;
+
+  // 2021-5-20添加
+  sessionStorage.removeItem("vipSub_isTrial");
+  sessionStorage.removeItem("vipSub_renewList");
+  sessionStorage.removeItem("vipSub_oldBuySet");
   //订阅首页
   sessionStorage.removeItem("sub_vip_state");
   sessionStorage.removeItem("vip_index_read");

src/web/templates/active/digital/index.html

@@ -27,9 +27,29 @@
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/public.css?v={{Msg "seo" "version"}}'>
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/j-icons.css?v={{Msg "seo" "version"}}'>
     <style>
-        #bidding-page img {
+        body {
+            font-family: PingFang SC;
+            font-style: normal;
+            background-color: #040831;
+        }
+        #bidding-page .content {
+            padding-bottom: 100px;
+        }
+        #bidding-page .content img {
             width: 100%;
         }
+        .fixed-bottom a {
+            margin-left: 0.24rem;
+            font-weight: 500;
+            font-size: 16px;
+            line-height: 24px;
+            color: #FFFFFF;
+        }
+        .fixed-bottom .flex-r-c {
+            height: 56px;
+            background: linear-gradient(360deg, rgba(51, 153, 255, 0.9) 0%, rgba(0, 209, 255, 0.9) 100%);
+            backdrop-filter: blur(4px);
+        }
         .fixed-bottom {
             position: fixed;
             bottom: 0;
@@ -37,185 +57,446 @@
             right: 0;
             cursor: pointer;
         }
-        .weui-picker__item.is-now-select::after {
-            content: "次";
+
+
+
+        .flex {
+            width: 100%;
+            flex: 1;
         }
 
-        .custom-toast .weui-toast {
-            font-size: .3rem;
-            padding: 0.2rem;
-            width: auto;
-            max-width: 6rem;
-            min-height: 0;
-            height: auto;
-            top: 50%;
-            left: 50%;
-            margin-left: 0;
-            margin-top: -0.47rem;
-            transform: translateX(-50%) translateY(-50%);
+        .flex-r-c {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+        }
+        .flex-r-c.center {
+            align-items: center;
+            justify-content: center;
+        }
+        .flex-r-c.center.sb {
+            justify-content: space-between;
+        }
+        .flex-r-c.left {
+            justify-content: flex-start;
+        }
+        .flex-r-c.right {
+            justify-content: flex-start;
+        }
+        .flex-r-c .bottom {
+            align-items: flex-end;
+        }
+        .flex-r-c.wrap {
+            flex-wrap: wrap;
         }
 
-        .custom-toast .weui-icon_toast {
-            display: none;
+        .flex-c-c {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+        }
+        .flex-c-c.center {
+            align-items: center;
+            justify-content: center;
+        }
+        .flex-c-c.right {
+            align-items: flex-end;
+        }
+        .flex-c-c.left {
+            align-items: flex-start;
         }
 
-        .custom-toast .weui-toast__content {
-            margin: 0;
+
+        #bidding-page  .content .icon-s-20,
+        #bidding-page  .icon-s-20 {
+            width: 20px;
+            height: 20px;
+        }
+
+        #bidding-page  .content .icon-s-72,
+        #bidding-page  .icon-s-72 {
+            width: 72px;
+            height: 72px;
+        }
+
+        .color-title-box {
+            width: 140px;
+            padding: 2px 12px;
+            height: 30px;
+            line-height: 30px;
+            background: linear-gradient(90deg, #003CD7 0%, rgba(0, 52, 186, 0) 89.35%);
+            border-radius: 2px;
+            font-weight: 500;
+            font-size: 18px;
+            color: #fff;
         }
-        #js_dialog .weui-dialog{
+        .top-number-box > .text--h {
+            font-weight: bold;
+            font-size: 28px;
+            line-height: 39px;
+            text-align: center;
+            letter-spacing: 0.04em;
+            margin-right: 13px;
+        }
+        .top-number-box {
+            font-size: 14px;
+            line-height: 20px;
+            letter-spacing: 0.04em;
+            color: #FFFFFF;
+            margin-top: 24px;
+            margin-bottom: 35px;
+        }
+
+
+        .info-box {
+            width: calc(100% - 24px);
+
+            background-image: url('{{Msg "seo" "cdn"}}/digital_expo/image/bg_center.png');
+            background-repeat: no-repeat;
+            background-size: cover;
             border-radius: 8px;
-            max-width: 6rem;
-            /* left: .72rem; */
-            /* right: .72rem; */
-        }
-        #js_dialog .weui-dialog__hd{
-            padding: 0.32rem 0;
-            color: #171826;
-            font-size: .36rem;
-            line-height: .52rem;
+            margin: 0 12px;
+            padding-top: 36px;
+            letter-spacing: 0.04em;
+            color: #FFFFFF;
+        }
+        .border-left-box span {
+            margin-left: 10px;
+        }
+        .border-left-box {
+            flex-shrink: 0;
+            color: #fff;
+            font-size: 16px;
+            letter-spacing: 0.04em;
+            border: 1px solid red;
+            background: url('{{Msg "seo" "cdn"}}/digital_expo/image/border_left.png') no-repeat;
+            background-size: 100% 72px;
+            width: 355px;
+            height: 72px;
+            padding-left: 34px;
+            box-sizing: border-box;
+            background-position-y: 4px;
+            margin-left: -12px;
+        }
+
+        .info-box > h3 {
+            font-style: normal;
+            font-weight: bold;
+            font-size: 24px;
+            line-height: 34px;
+            margin: 0 0 10px 20px;
+        }
+        .info-box > p {
+            font-style: normal;
             font-weight: 500;
+            font-size: 13px;
+            line-height: 18px;
+            margin: 0 20px;
+            margin-bottom: 12px;
+        }
+
+
+        .text--h {
+            color: #00F0FF;
+        }
+        .text--y-box .text--y  + span {
+            font-weight: normal;
+            font-size: 12px;
+            line-height: 17px;
+            letter-spacing: 0.04em;
+            color: #FFFFFF;
+
+        }
+        .text--y-box  + .text--y-box {
+            margin-left: 28px;
+        }
+        .text--y-box {
+            font-weight: bold;
+            font-size: 24px;
+            line-height: 34px;
+            letter-spacing: 0.04em;
+            color: #FFE660;
+            margin-bottom: 10px;
+        }
+
+        .list-info {
+            margin: 0 32px;
+        }
+        .title-box h3 {
+            font-weight: bold;
+            font-size: 24px;
+            line-height: 34px;
             text-align: center;
+            letter-spacing: 0.04em;
+            color: #FFFFFF;
         }
-        #js_dialog .weui-dialog__bd{
-            padding-bottom: .48rem;
-            margin: 0;
-            color: #5F5E64;
-            font-size: .3rem;
-            line-height: 0.44rem;
+        .title-box .progress-box {
+            background: linear-gradient(270deg, rgba(51, 153, 255, 0) 0%, rgba(17, 75, 188, 0.5) 50.52%, rgba(51, 153, 255, 0) 100%);
+            filter: drop-shadow(0px 4px 16px rgba(8, 31, 38, 0.08));
+            border-radius: 17px;
+            font-weight: bold;
+            font-size: 14px;
+            line-height: 24px;
             text-align: center;
+            letter-spacing: 0.04em;
+            width: 100%;
+            color: #00F0FF;
+            margin-top: 4px;
         }
-        #js_dialog .weui-dialog__ft{
-            line-height: .92rem;
-            min-height: 0;
+
+        .circle-text-box p {
+            margin-left: 8px;
         }
-        #js_dialog .weui-dialog__btn{
-            color: #2ABED1;
-            font-size: .36rem;
-            font-weight: 500;
+        .circle-text-group .circle-text-box {
+            margin-bottom: 10px;
         }
-        #js_dialog .weui-dialog__btn:active {
-            background-color: #fff;
+        .circle-text-box {
+            font-weight: 500;
+            font-size: 13px;
+            line-height: 18px;
+            letter-spacing: 0.04em;
+            color: #FFFFFF;
         }
-        .icon-jy-check {
-            background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAADb0lEQVRoQ+1XT0gUcRT+3jjS9ufi4qFD4AYhu2vtGkUl/Z3VyDJJySKoSG8F3eoSERp4COoadXMPQQcNjYqUcqeDUQeh3ZL9EwYbeAjctg6W6+rOL2ZxaXad0ZmdRVeYPc6+9/2+733v/eYNYZ3/aJ3zhyVgrR20HLAcMFkBq4VMFtB0uuWA6RKaBLAcMFlAzfS6QOisBPaYQHwG1BnzeZ6rBZelA85A8AQHvASIXyT9O+zzVq0LATJ5Ag0RYMsRZkA84vNuL3sBtYEJL4/MGIAtCvIpCRVNMd/O92UtwDUariGa/whgq5I8A2uL+upHtIalLGZAJg9KvyOQ4z9RtgBwHWGN4c3FrbmA2hfj1fxm/gNAO5RVZkTXI4Ln4Uq3nLaAbpF3HrWf4Yhsf+M/n8W7hNRKYEb/d/SJtk019jcADuXlEnrCgveuHjxNAa7R0FMiXFgEGZ5OJM9Nnxdm9IDqiVkkPwigOZ883QsLnlt6MOQYTQHuQHBecQ+DAWOZP/PtX1v3JvSCa8Z1i7zriH2QCKfz2oaxJ5HG+stG8PU6kMOMplOzxydPHZgyckhhrGs09IgIV5XPJWA4SslWCMKCEWxNAQ5RtG2U7P1LqgTEwSqPRRrd340clIt1i6FuMPQUkk9Rsj0uGJ+z5W8hUeTdUlUfiC7lWV2kCJcYuk0MvflYLEj063BYKG6+dF2j7tHQfRBuFlR8KgM0xXzemB4nnGLoCsfgLyzE7OxcQ7xl3w89GGoxugTIiWrWM7CEBL5N6zWfO1BlOZMvhTibk4Toyd3xYskvewupgaqJADAjgXVove7VlzOWSKczDd+a90yaIW9YgJzgFIM3OEYPClohpbazuAOh/QDeGlnOjArS3UJKYLf4+SKY5C94T6Tk3SXi2/VKji12OVsVAVmCgS8tgDSg3NsBtpAhrpOT+DG15Yyhoi0n0ChRrfiiHFAOZ+HHh/yfPNwEqs5rM53LmVFhpgRkZyL7+UcDyj5fQsLAcrbqAuQD6wITByUsDBVWPesGUW9E8NwxSkxvvGkHcgfVjow7+cpKeTXelnsmMeaPNtZ36SVTTFzJBGTb6fUnB23g+gmsnjHyR7jkNaPLmVERJRVg9PBSxFsCSlFFMxiWA2aqV4pcy4FSVNEMhuWAmeqVItdyoBRVNIOx7h34B4JTL0BLvpIQAAAAAElFTkSuQmCC");
-            background-size: cover;
+        .icon-circle-index {
             display: inline-block;
-            width: 0.48rem;
-            height: 0.48rem;
+            width: 8px;
+            height: 8px;
+            background: url('{{Msg "seo" "cdn"}}/digital_expo/image/icon_index.png') no-repeat center center;
+            background-size: cover;
+        }
+
+        .address-info-box img {
+            width: 24px !important;
+            height: 24px !important;
         }
-        #js_dialog .weui-dialog__hd .icon-jy-check{
-            margin-right: 0.08rem;
+        .address-info-box span {
+            font-weight: 500;
+            font-size: 18px;
+            line-height: 26px;
+            margin-left: 8px;
+            color: #FFFFFF;
         }
-        #js_dialog .weui-dialog__hd {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: center;
+        .address-info-box p {
+            margin-top: 12px;
+            font-weight: 500;
+            font-size: 14px;
+            line-height: 20px;
+            color: rgba(255, 255, 255, 0.8);
         }
-        .back-box {
-            position: fixed;
-            top: 0;
-            left: 0;
-            box-sizing: border-box;
-            padding: 0.2rem 0.24rem;
-            z-index: 666;
+        .address-info-box {
+            margin-top: 24px;
+        }
+
+
+        .p-16 {
+            padding: 0 16px;
+        }
+        .m-16 {
+            margin: 0 16px;
+        }
+        .m-t-16 {
+            margin-top: 16px;
         }
+        .m-t-24 {
+            margin-top: 24px;
+        }
+
+
     </style>
 </head>
 
 <body class="p13">
 <div class="j-container">
-    <!--        <div class="back-box">-->
-    <!--            <span class="icon-back-white j-icon base-icon"></span>-->
-    <!--        </div>-->
-    <div class="js_dialog" id="js_dialog" style="opacity: 1;display: none;">
-        <div class="weui-mask"></div>
-        <div class="weui-dialog">
-            <div class="weui-dialog__hd">
-                <i class="icon-jy-check"></i>
-                <span>兑换成功！</span>
+    <div class="j-main" id="bidding-page">
+        <div class="content">
+            <img src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_top.png' alt="">
+
+            <div class="m-16 m-t-16 color-title-box">最现场</div>
+
+            <div class="flex-r-c center top-number-box">
+                <span class="text--h">300万+</span>
+                <div class="flex-c-c left">
+                    <p>投标人选择使用剑鱼标讯</p>
+                    <p><span class="text--h">中标</span>就是轻松！</p>
+                </div>
+            </div>
+
+            <div class="flex-c-c info-box">
+                <h3>剑鱼标讯</h3>
+                <p>
+                    基于云计算、大数据和人工智能技术，为企业提供全
+                    国招投标信息检索、订阅、跟踪、市场分析、商机挖
+                    掘等功能，帮助企业及时全面掌握商机信息。
+                </p>
+                <div class="flex-r-c center left border-left-box">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_0.png' alt="">
+                    <span>不漏掉一个招标信息，就用剑鱼标讯</span>
+                </div>
+                <div class="flex-r-c center">
+                    <div class="flex-c-c center left text--y-box">
+                        <h3 class="text--y">10000+</h3>
+                        <span>全国政府和企业招标网站</span>
+                    </div>
+                    <div class="flex-c-c center left text--y-box">
+                        <h3 class="text--y">100%</h3>
+                        <span>行业和地区覆盖</span>
+                    </div>
+                </div>
+                <div class="flex-r-c center left border-left-box">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_1.png' alt="">
+                    <span>精准获取项目信息，就用剑鱼标讯</span>
+                </div>
+                <div class="flex-r-c center left border-left-box">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_2.png' alt="">
+                    <span>快速达成销售目标，就用剑鱼标讯</span>
+                </div>
+            </div>
+
+            <div class="flex-c-c center list-info">
+                <div class="flex title-box flex-c-c center">
+                    <h3>商机智能管理</h3>
+                    <div class="flex progress-box">充分挖掘潜在商机</div>
+                </div>
+                <div class="flex flex-r-c center sb m-t-24">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/image/c_1.png' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/image/c_2.png' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/image/c_3.png' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/image/c_4.png' alt="">
+                </div>
+                <div class="flex flex-c-c center left m-t-24 circle-text-group">
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>每日10万商机自动化推送，全面解锁销售机会</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>联系方式全公开，直接对接采购人</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>自动化追踪管理用户招标订阅项目进度</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>创建跟踪列表，追踪结果及时结果反馈</p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="flex-c-c center data-info">
+                <div class="flex title-box flex-c-c center">
+                    <h3>数据服务</h3>
+                    <div class="flex progress-box">企业信息一手掌控</div>
+                </div>
+                <p>基于招标大数据，利用数据可视化、数据分析建模和人工智能等技术，为客户提供数据场景化数据分析。</p>
+                <div class="flex flex-c-c center left m-t-24 circle-text-group">
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>招采信息监测</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>多维度细分数据</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>行业招采情况跟踪</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>辅助企业决策</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>重点客户详细信息分析</p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="flex-c-c center class-info">
+                <div class="flex title-box flex-c-c center">
+                    <h3>行业解决方案</h3>
+                    <div class="flex progress-box">聚焦数据价值变现</div>
+                </div>
+            </div>
+
+            <div class="flex-c-c center gov-info">
+                <div class="flex title-box flex-c-c center">
+                    <h3>政府机关应用</h3>
+                    <div class="flex progress-box">加强监管，助力廉政建设</div>
+                </div>
+                <div class="flex flex-c-c center left m-t-24 circle-text-group">
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>依托海量数据库，实现信息透明共享，降低管理成本</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>监测预警企业异常，分析监管主体风险，提前干预</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>为查处不正当竞争提供数据支持，助力廉政建设</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>适用于审计、税务、招商、纪检委、司法、监察、工商等政府机关单位</p>
+                    </div>
+                </div>
             </div>
-            <div class="weui-dialog__bd">
-                <div>请登录剑鱼标讯官网</div>
-                <div style="color: #2ABED1">www.jianyu360.com</div>
-                <div>点击【招标文件解读】使用</div>
+
+            <div class="m-16 m-t-16 color-title-box">我们的数博会</div>
+            <div class="m-16 m-t-16 color-title-box">数博视点</div>
+            <div class="m-16 m-t-16 color-title-box">多彩数博</div>
+            <div class="m-16 m-t-16 color-title-box">展位交通</div>
+            <div class="flex flex-c-c p-16 m-t-24">
+                <img src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_address_1.png' alt="">
+                <img class="m-t-16" src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_address_2.png' alt="">
+                <div class="flex-c-c left address-info-box">
+                    <div class="flex-r-c center left">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_address_1.png' alt="">
+                        <span>机场大巴路线</span>
+                    </div>
+                    <p>贵阳龙洞堡机场-纪念塔-新路口-火车站（可在任意站点下车，换乘公交车到达贵阳国际会展中心）</p>
+                </div>
+                <div class="flex-c-c left address-info-box">
+                    <div class="flex-r-c center left">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_address_2.png' alt="">
+                        <span>火车站至展馆</span>
+                    </div>
+                    <p>1. 坐1路车、17路车到喷水池站下车，换乘58路到贵阳国际会展中心<br>2. 坐24路车、60路车，换乘208路到贵阳国际会展中心</p>
+                </div>
+                <div class="flex-c-c left address-info-box">
+                    <div class="flex-r-c center left">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_address_3.png' alt="">
+                        <span>直达公交路线</span>
+                    </div>
+                    <p>贵阳48路、贵阳58路、贵阳208路、贵阳209路、贵阳218路</p>
+                </div>
+                <div class="flex-c-c left address-info-box">
+                    <div class="flex-r-c center left">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_address_4.png' alt="">
+                        <span>地铁路线</span>
+                    </div>
+                    <p>在贵阳任意地铁站乘坐地铁1号线，到国际会议生态中心站（C出口）即可到达会场</p>
+                </div>
             </div>
-            <div class="weui-dialog__ft">
-                <a href="javascript:" class="weui-dialog__btn weui-dialog__btn_primary know">我知道了</a>
+
+            <div class="m-16 m-t-16 color-title-box">合作伙伴</div>
+            <div class="flex p-16 m-t-24">
+                <img src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_bottom.png' alt="">
             </div>
         </div>
-    </div>
-    <div class="j-main" id="bidding-page">
-        <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/bg_1.png' alt="">
-        <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/bg_2.png' alt="">
-        <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/bg_3.png' alt="">
-        <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/bg_4.png' alt="">
-        <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/bg_5.png' alt="">
         <div class="fixed-bottom">
-            <img src='{{Msg "seo" "cdn"}}/bid-fileinter/h5/image/button.png' alt="">
+            <div class="flex-r-c center">
+                <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_phone.png' alt="">
+                <a href="tel:400-108-6670">咨询电话：400-108-6670</a>
+            </div>
         </div>
     </div>
 </div>
 
-<script>
-  function goBack() {
-    history.back()
-    window.afterClickBack && window.afterClickBack()
-  }
-  ;(function () {
-    $('.fixed-bottom').on('click', showPicker)
-    $('.weui-dialog__btn.know').on('click', toggleShowDialog.bind(this, false))
-    function showPicker () {
-      weui.picker([1,2,3,4,5,6,7,8,9,10], {
-        title: '请选择兑换次数',
-        className: 'jymobile-datePicker start',
-        container: 'body',
-        defaultValue: [1],
-        onChange: function (result) {
-          var nowTArr = result.map(function (v) {
-            return String(v.label)
-          })
-          $(".jymobile-datePicker.start .weui-picker__item").each(function(){
-            var nowT = $(this).text()
-            $(this).removeClass('is-now-select')
-            if (nowTArr.indexOf(nowT) !== -1) {
-              $(this).addClass('is-now-select')
-            }
-          })
-        },
-        onConfirm: function (result) {
-          ajaxExCount(result[0].value)
-        },
-        id: 'singleLinePicker'
-      });
-    }
-    function ajaxExCount (count) {
-      $.post('/bidfileinter/exchange/bidcount', { count: count }).done(function (r) {
-        if (r && r.error_msg === '') {
-          toggleShowDialog(true)
-        } else {
-          location.href = './middle'
-        }
-      }).fail(function (r) {
-        weui.toast('抱歉,请稍后重试', {
-          duration: 2000,
-          className: 'custom-toast',
-        })
-      })
-    }
-    function toggleShowDialog (type) {
-      var nDom = $('#js_dialog')
-      if (type) {
-        nDom.show()
-      } else {
-        nDom.hide()
-      }
-    }
-    try {
-      document.querySelector('.back-box').addEventListener('click', goBack)
-    } catch (error) {}
-  })()
-</script>
+<script></script>
 
 
 <!--S-当前页面的资源-->

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

@@ -963,6 +963,18 @@
     $(".tab-nav-box--slider").each(function() {
         computeSliderStyle.bind(this)()
     })
+    function recoverNameMark () {
+      var name = getParam('name')
+      if (name) {
+        name = name.split('_')
+      }
+      try {
+        $('#'+name[0]+' .tab-nav-item').eq(name[1]).trigger('click')
+      } catch (e) {
+        console.warn('recover name mark error !')
+      }
+    }
+    recoverNameMark()
 </script>
 <script>
     var pageUserInfo = {
@@ -1034,7 +1046,7 @@
                 openLoginDig()
                 return
             }
-            
+
               var buy_ontrial_href ='/big/pc/page/custom';
               if(source!=null&&source!=undefined){
                 buy_ontrial_href+="?source="+source;//baidusem
@@ -1058,7 +1070,7 @@
             } catch (e) {
               console.log('未初始化百度统计')
             }
-            /* 
+            /*
               // 原功能演示代码
               var scaleRote = document.documentElement.clientHeight / 700
               $("#iphoneX-box").css('transform', 'scale('+(scaleRote > 1 ? 1 : scaleRote)+')')

src/web/templates/common/commonRules.html

@@ -7,6 +7,7 @@
     text-align: center;
     font-size: .26rem;
     color: #5F5E64;
+    flex-shrink: 0;
   }
   .rights-item{
     padding: .32rem .28rem;

src/web/templates/common/pcbottom.html

@@ -65,22 +65,22 @@
                             <li class="active">
                                 <span></span>
                                 <div>
-                                    <img src='{{Msg "seo" "cdn"}}/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                                    <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
                                     <p>扫码下载</p>
                                 </div>
                             </li>
                             <li>
-                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Windows.exe?source=pc_index"></a></span>
+                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
 
                             </li>
                             <li>
-                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Mac.dmg?source=pc_index"></a></span>
+                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
 
                             </li>
                             <li>
                                 <span></span>
                                 <div>
-                                    <img src="/front/share/NQw2JDBFBAIAAEJeRVhSQwoDBwZNOCo/" alt="">
+                                    <img data-share-img src="/front/share/10" alt="">
                                     <p>扫码关注</p>
                                 </div>
                             </li>
@@ -530,7 +530,7 @@ new pcShare()
         <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx_grey.png?v={{Msg "seo" "version"}}' alt=""></span>
         <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx.png?v={{Msg "seo" "version"}}' alt=""></span>
         <div class="slidePop">
-            <img src='{{Msg "seo" "cdn"}}/images/pc/wxshare.png?v={{Msg "seo" "version"}}' alt="">
+            <img data-share-img src="/front/share/10" alt="">
             <p>微信扫码关注</p>
         </div>
     </div>

src/web/templates/common/pchead.html

@@ -147,6 +147,12 @@
     </div>
 </div>
 <script>
+     var jyTempLog = window.console.log
+     if (window.localStorage.getItem('log') === '1') {
+        window.console.log = jyTempLog
+     } else {
+        window.console.log = () => null
+     }
     function getCookieValue(name) {
         var result = document.cookie.match("(^|[^;]+)\\s*" + name + "\\s*=\\s*([^;]+)")
         return result ? result.pop() : ""
@@ -376,10 +382,10 @@
         background-size: 20px;
     }
     #public-nav[data-theme="light"] .iner .fl .jynav-search::placeholder{
-        color: #ccc;  
-        font-style: 14px; 
+        color: #ccc;
+        font-style: 14px;
     }
-    
+
 
     #public-nav .iner .jynav{
         position: relative;
@@ -421,12 +427,12 @@
         width: 186px;
         position: absolute;
         left: 50%;
-        transform: translate(-50%, 0%); 
+        transform: translate(-50%, 0%);
         line-height: 34px;
         padding: 24px;
         background: #fff;
         border-radius: 0px 0px 4px 4px;
-        box-shadow: 0px 6px 8px 0px rgba(0,0,0,0.08); 
+        box-shadow: 0px 6px 8px 0px rgba(0,0,0,0.08);
         font-size: 14px;
         display: none;
         text-align: left;
@@ -660,12 +666,12 @@
                 <form method="post" action="/jylab/supsearch/index.html" id="public_header">
                     <input class="jynav-search" autocomplete="off" placeholder="请输入您想要查询的招标信息" value="" type="text" name="keywords" />
                     <input type="hidden" name="searchvalue">
-                    <button class="public-nav-search" type="submit" onclick="zbSeatch('public_header')" ></button><i>|</i> 
+                    <button class="public-nav-search" type="submit" onclick="zbSeatch('public_header')" ></button><i>|</i>
                     <span class="public-nav-close search-close"></span>
                 </form>
             </div>
            <span class="jy_nav_searchBtn">
-                
+
             </span>
         </div>
 		<div class="fr">
@@ -701,13 +707,13 @@
                         <span name="中标必听课"><a href="/jyxspc">中标必听课</a></span>
                         <span class="discount" name="招标文件解读"><a href="/bid/pc/page/bidfile_landpage">招标文件解读</a></span>
                         <span name="剑鱼文库"><a href="/swordfish/docs">剑鱼文库</a></span>
-                        <span name="bbx_0"><a href="/big/page/index?name=0#zb">中标预测</a></span>
-                        <span name="bbx_1"><a href="/big/page/index?name=bbx_1#qz">潜在客户挖掘</a></span>
-                        <span name="bbx_2"><a href="/big/page/index?name=bbx_2#qz">潜在合作伙伴挖掘</a></span>
-                        <span name="bbx_3"><a href="/big/page/index?name=bbx_3#jc">投标决策分析</a></span>
-                        <span name="bbx_4"><a href="/big/page/index?name=bbx_4#jc">竞争对手分析</a></span>
-                        <span name="bbx_5"><a href="/big/page/index?name=bbx_5#fx">市场分析</a></span>
-                        <span name="bbx_6"><a href="/big/page/index?name=bbx_6#fx">客户分析</a></span>
+                        <span name="bbx_0"><a href="/big/page/index#jc">中标预测</a></span>
+                        <span name="bbx_1"><a href="/big/page/index#qz">潜在客户挖掘</a></span>
+                        <span name="bbx_2"><a href="/big/page/index?name=qz_1#qz">潜在合作伙伴挖掘</a></span>
+                        <span name="bbx_3"><a href="/big/page/index#jc">投标决策分析</a></span>
+                        <span name="bbx_4"><a href="/big/page/index#fx">竞争对手分析</a></span>
+                        <span name="bbx_5"><a href="/big/page/index#fx">市场分析</a></span>
+                        <span name="bbx_6"><a href="/big/page/index?name=fx_2#fx">客户分析</a></span>
                     </div>
 				</li>
                 <li  name="联系我们">
@@ -835,14 +841,14 @@
                 el.style.background = 'rgba(255,255,255,'+ opa +')'
             }else{
                 el.style.background = 'rgba(255,255,255,'+ baseOpa +')'
-            } 
+            }
             if(firstPage){
                 firstPage = false;
                 firstTheme = el.getAttribute('data-theme')
             }
         }
-       
-        
+
+
     }
     function trySelectNav (name) {
         try {
@@ -868,15 +874,13 @@
                 var isLightTheme = lightThemeRegs.some(function (v) {
                     return $href.indexOf(v) !== -1
                 })
-                
+
                 if (isLightTheme || isEnableCheck.getAttribute('theme') === 'light') {
                     console.log(1234)
                     setNavTheme('light',1)
                 } else {
                     setNavTheme('dark')
                 }
-                console.log('----$href----',window.location.pathname);
-                
                 if(window.location.pathname == ('/swordfish/integral/index')){
                     setNavTheme('dark')
                     $("body").css({
@@ -902,7 +906,7 @@
             if(isEnableCheck.content != '首页'){
                 $("#public-nav .iner .jy_nav_searchBtn").hide();
                 $("#public-nav .iner .search-box").fadeIn()
-                
+
             }
 
             // 导航栏是否固定
@@ -916,7 +920,7 @@
             }
         }
         navInit()
-        
+
     })();
     function docScroll(e){
         var $href = window.location.href;
@@ -938,11 +942,11 @@
                 $(".loginBtn").attr("onmouseout","this.style.borderColor='#fff'; this.style.color='#fff';");
             }
         }
-        
+
     }
     window.addEventListener('scroll', docScroll, true)
-    
-    
+
+
 
 $(function(){
 

src/web/templates/pc/index.html

@@ -465,7 +465,7 @@
               <img src='{{Msg "seo" "cdn"}}/images/pc/yitu.png?v={{Msg "seo" "version"}}" alt="' />
             </li>
             <li>
-              <img src='{{Msg "seo" "cdn"}}/images/pc/zhongtong.png?v={{Msg "seo" "version"}}" alt="' />
+              <img src='{{Msg "seo" "cdn"}}/images/pc/dekey.png?v={{Msg "seo" "version"}}" alt="' />
             </li>
             <li>
               <img src='{{Msg "seo" "cdn"}}/images/pc/zhonghui.png?v={{Msg "seo" "version"}}" alt="' />
@@ -524,7 +524,6 @@
     <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index_content.js?v={{Msg "seo" "version"}}'></script>
     <script>
       var onlineData_arr = [{{.T.infoNum.i_push}},{{.T.infoNum.i_bidmonth}},{{.T.infoNum.i_bidtoday}}]
-      console.log(onlineData_arr)
       var onlineData_arr1 = []
       onlineData_arr.forEach(function(v,i){
         v = Number(v.replace(/,/g,''))
@@ -775,8 +774,6 @@ var str_left_img = "",str_left_ = "",left_img_index = -1;
     }
   }
 {{end}}
-console.log('----str_left_img----',str_left_img);
-
 $(".jy-banner-l .carousel-inner").html(str_left_img)
 $(".jy-banner-l  .carousel-indicators").html(str_left_)
 

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

@@ -72,9 +72,13 @@
     }
 
     .j-button-confirm {
-      flex: none;
+      flex: 1;
+      width: 100%!important;
       border-radius: 0.08rem;
     }
+    .j-button-confirm:nth-child(1){
+      margin-right: .16rem;
+    }
     </style>
 </head>
 

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

@@ -174,8 +174,8 @@
                     -->
                     <!-- 超级订阅专属权益 封装为公共页面-->
                     {{include "/common/commonRules.html"}}
-                    <div class="vip_prise_table" style="display: none;">
-                        <table class="monthly">
+                    <div class="vip_prise_table">
+                        <table class="monthly" style="display: none;">
                             <caption class="table_title b-line">超级订阅价格</caption>
                             <tr>
                                 <td class="table-label" colspan="2">按月购买</td>
@@ -193,7 +193,7 @@
                                 <td><span>388</span>元 月/全国/全行业</td>
                             </tr>
                         </table>
-                        <table class="yearly">
+                        <table class="yearly" style="display: none;">
                             <tr>
                                 <td class="table-label" colspan="2">按年购买</td>
                             </tr>
@@ -212,10 +212,10 @@
                         </table>
                         <dl class="tips">
                             <dt class="b-line">购买须知</dt>
-                            <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                            <dd>套餐周期内，不支持套餐降级；</dd>
                             <dd>用户最多购买/续费3年套餐；</dd>
-                            <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
-                            <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd>
+                            <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算）。</dd>
+                            <!-- <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd> -->
                             <dd>购买的采购单位行业与地域为个数，购买后可不限次数进行更换。</dd>
                         </dl>
                     </div>

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

@@ -134,8 +134,7 @@
                 </div>
                 <div class="clause-box">
                     <span class="checkbox"></span>
-                    <span class="clause-read">我已阅读，理解并接受<a
-                                href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
+                    <span class="clause-read" onclick="toRead">我已阅读，理解并接受<a onclick="toRead()">《剑鱼标讯线上购买与服务条款》</a></span>
                 </div>
             </div>
             <div class="footer-button-group j-footer">
@@ -398,6 +397,10 @@
         }
     });
 
+    function toRead () {
+        sessionStorage.setItem('pay_read_cache', '0');
+        window.location.href = '/front/staticPage/wx-serviceterms.html'
+    }
 
     document.body.addEventListener("focusout", function () {
         //软键盘收起的事件处理