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

src/jfw/modules/app/src/web/staticres/jyapp/squeeze/css/squeezeMobile.css

@@ -48,33 +48,33 @@
   z-index: 1;
   margin: 0 auto;
   width: 6.86rem;
-  height: 7.58rem;
-  background: url('/jyapp/squeeze/images/ticketBg.png') no-repeat;
-  background-size: cover;
+  height: 4.8rem;
+  background: url(/jyapp/squeeze/images/ticketBg.png) no-repeat;
+  background-size: 100%;
   text-align: center;
   overflow: hidden;
 }
 .squeeze-mobile main .ticket ul {
-  height: 5.04rem;
-  margin-top: 1.26rem;
+  height: 3.14rem;
+  margin-top: 1rem;
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
 }
 .squeeze-mobile main .ticket ul li {
   position: relative;
-  margin: 0 0.12rem;
-  margin-bottom: 0.27rem;
-  width: 3.03rem;
+  margin: 0;
+  margin-bottom: 0.20rem;
+  width: 100%;
   height: 1.41rem;
 }
 .squeeze-mobile main .ticket ul li img {
-  width: 100%;
+  width: 4.5rem;
 }
 .squeeze-mobile main .ticket ul li .ticket-btn {
   position: absolute;
   bottom: 0.21rem;
-  right: 0.32rem;
+  right: 1.85rem;
   width: 1.07rem;
   height: 0.41rem;
   text-align: center;
@@ -96,8 +96,8 @@
   transform: scale(0.5) translate(-50%, -50%);
 }
 .squeeze-mobile main .ticket ul li .ticket-btn button.use {
-  color: #fff;
-  background-color: #da1f0f;
+  color: #da1f0f;
+  background-color: #fff;
 }
 .squeeze-mobile main .ticket ul li .ticket-btn button.get {
   color: #da1f0f;
@@ -107,13 +107,14 @@
   font-size: 0.29rem;
   color: rgba(255, 255, 255, 0.5);
 }
+.squeeze-mobile main .ticket ul li .ticket-btn span.end{
+  font-size: 0.2rem;
+}
 .squeeze-mobile main .ticket #getAll {
-  width: 2.94rem;
+  width: 100%;
   height: 0.67rem;
-  background-color: #fff;
-  color: #da1f0f;
+  color: #fff;
   font-size: 0.28rem;
-  border: 1px solid #fff;
   border-radius: 0.33rem;
 }
 .squeeze-mobile main .ticket #getAll.dis {

src/jfw/modules/app/src/web/staticres/jyapp/squeeze/js/squeeze_mobile.js

@@ -7,13 +7,8 @@ let activityId // 活动id
 let isWX = isWeChat()
 console.log(isWX);
 ticketImg = [
-  // '/frontRouter/wx/squeeze/images/ticket5.png',
-  // '/frontRouter/wx/squeeze/images/ticket15.png',
-  // '/frontRouter/wx/squeeze/images/ticket38.png',
-  // '/frontRouter/wx/squeeze/images/ticket100.png',
-  // '/frontRouter/wx/squeeze/images/ticket250.png'
-  '/frontRouter/wx/squeeze/images/ticket380.png',
-  '/frontRouter/wx/squeeze/images/ticket1000.png',
+  '/jyapp/squeeze/images/ticket380.png',
+  '/jyapp/squeeze/images/ticket1000.png'
 ]
 
 activityId = GetRequest() || ''
@@ -39,11 +34,11 @@ function getTicket() {
         }else{
           if (item.IsUser) {
             lis += `<li>
-                        <img src="${ticketImg[index]}" alt="">
-                        <div class="ticket-btn">
-                          <span  data-id="${item.LotteryIdStr}">已使用</span>
-                        </div>
-                      </li>`
+                      <img src="${ticketImg[index]}" alt="">
+                      <div class="ticket-btn">
+                        <span  data-id="${item.LotteryIdStr}">已使用</span>
+                      </div>
+                    </li>`
           } else {
             if (item.IsReceive) {
               if (item.StockNumber > 0) {

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

@@ -123,7 +123,7 @@ function getBuySet (area, industry, price) {
     "citys": [] //购买省份中城市数量
   };
   //行业
-  console.log(industry,price.buyerClassMaxCount, 'industry')
+  // console.log(industry,price.buyerClassMaxCount, 'industry')
   if (industry.length != 0 && industry.length <= price.buyerClassMaxCount) {
     buyset.buyerclasscount = industry.length
   }

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

@@ -41,7 +41,7 @@ var Calculation = {
                 "allProvince_allBuyerClass": 59900
             },
             "year": {
-                "oneProvince_allBuyerClass": 38800,
+                "oneProvince_allBuyerClass": 38000,
                 "allProvince_allBuyerClass": 599900
             },
             "provincePrice": 3800,

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

@@ -289,7 +289,7 @@ $(function () {
       }
 
       // 设置已选择行业
-      console.log(selected, 'selected')
+      // console.log(selected, 'selected')
       if (selected.buyerclasscount === -1) {
           $('.vip-body .industry .selected-industry').text('全行业')
       } else {
@@ -323,7 +323,7 @@ $(function () {
       }
 
       // 设置已选择行业
-      console.log(buySet, 'buySet')
+      // console.log(buySet, 'buySet')
       if (buySet.buyerclasscount === -1) {
           $('.vip-body .industry .buy-set-industry').text('全行业')
       } else {
@@ -860,9 +860,12 @@ $(function () {
             showGiveStatus(true)
           }
       }
-      // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
-      if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
-        $('*[data-bind-update]').hide()
+      // 如果购买的是升级版套餐 不显示升级提示 且如果是全国全行业 则不显示升级按钮
+      if (state.buyset.upgrade === 1) {
+        $('[data-update-tips]').hide()
+        if (state.buyset.areacount == -1) {
+          $('*[data-bind-update]').hide()
+        }
       }
   }
 
@@ -873,7 +876,6 @@ $(function () {
   var subVipState = sessionStorage.getItem('sub_vip_state');
   var readcache = sessionStorage.getItem('index_read_cache');
   var reqData = JSON.parse(subVipState);
-  console.log(readcache,'readcache')
   /*
   if (readcache) {
       sessionStorage.removeItem('index_read_cache');

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

@@ -115,24 +115,17 @@ var renew = {
         this.price = price
         coupon.updatePrice(this.price / 100)
     },
-    // 根据选中结果得到一个时间段的时间戳
+    // 根据选中结果得到续费了多长时间的字符串
     getDuration: function (timeSelect) {
-        var dStamp = 0
-        var s = ''
-        var perMonthStamp = 1000 * 60 * 60 * 24 * 30
+        var durationStr = ''
         if (timeSelect[1] === 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
+            durationStr = timeSelect[0] + '年'
         } else if (timeSelect[1] === 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
-        }
-        return {
-            stamp: dStamp,
-            s: s
+            durationStr = timeSelect[0] + '个月'
         }
+        return durationStr
     },
     // 计算续费后的日期区间
     calcDuration: function (needSet) {
@@ -142,11 +135,10 @@ var renew = {
             $('.select_cycle .duration').hide()
             return
         }
-        var durationInfo = this.getDuration(this.timeSelect)
-        var durationStamp = durationInfo.stamp // 续费时间段时间戳
-        var durationStr = durationInfo.s // 续费时间段字符串
+        var durationStamp = getVipEndDate(this.timeSelect[1], this.timeSelect[0], endTime) - endTime // 续费时间段时间戳
+        var durationStr = this.getDuration(this.timeSelect) // 续费时间段字符串
         var buyEndTimeString = new Date(endTime * 1000).pattern('yyyy年MM月dd日') // svip到期时间
-        var renewEndTimeString = new Date(endTime * 1000 + durationStamp).pattern('yyyy年MM月dd日') //续费后到期时间
+        var renewEndTimeString = new Date((endTime + durationStamp) * 1000).pattern('yyyy年MM月dd日') //续费后到期时间
 
         if (needSet) {
             $('.select_cycle .month').text(durationStr)
@@ -183,17 +175,16 @@ var renew = {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(timeSelect)
-        var durationStamp = durationInfo.stamp // 续费时间段时间戳
+        var durationStamp = getVipEndDate(timeSelect[1], timeSelect[0], endTime) - endTime // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
         var nowStamp = Math.floor(Date.now() / 1000)
         // 已购买的套餐剩余月数
         var lastMonthStamp = endTime - nowStamp
-        var lastMonth = Math.ceil(lastMonthStamp / (60 * 60 * 24 * 30))
+        var lastMonth = Math.round(lastMonthStamp / (60 * 60 * 24 * 30))
         // 续费后套餐剩余月数（需要加上原剩余月数lastMonth）
-        var renewMonthTotalStamp = lastMonthStamp + (durationStamp / 1000)
-        var renewMonthTotal = Math.ceil(renewMonthTotalStamp / (60 * 60 * 24 * 30))
+        var renewMonthTotalStamp = lastMonthStamp + durationStamp
+        var renewMonthTotal = Math.round(renewMonthTotalStamp / (60 * 60 * 24 * 30))
 
         if (renewMonthTotal > maxEndMonth) {
             var showTipText = '<div style="white-space: nowrap;">最长订阅周期不可超过3年</div>剩余周期：' + this.monthToYear(lastMonth).str
@@ -297,7 +288,7 @@ var renew = {
             var data = {
                 userLotteryId :coupon.$refs.couponRef.coupon.userLotteryId,
                 lotteryId : coupon.$refs.couponRef.coupon.lotteryId,
-                time : _this.getDuration(_this.timeSelect).s.trim(),
+                time : _this.getDuration(_this.timeSelect).trim(),
                 orderType: 5,
                 disWord :GetQueryString('disWord'),
                 price: _this.price

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

@@ -105,8 +105,15 @@ var purchase = {
     this.nowBuyset = getBuySet(purchase.areaSelect, purchase.industrySelect, this.price);
 
     var old = this.oldBuySet
-    //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
-    console.log(new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade))
+    // 选择完区域回显后 需判断选择省份结果
+    // if (purchase.nowBuyset.areacount == -1) {
+    //   old.areacount = -1
+    // } else {
+    //   if (purchase.nowBuyset.areacount > old.areacount) {
+    //     old.areacount = purchase.nowBuyset.areacount
+    //   }
+    // }
+    //初始化 
     Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList,  purchase.price, this.endTime)
 
     if (sessionStorage.getItem("payWay")) {
@@ -119,7 +126,6 @@ var purchase = {
   },
   showArea: function () {
     if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["一个省"]) { //有选择
-      console.log(this.nowBuyset, '----------123---------')
       if (this.nowBuyset.areacount === -1 || this.nowBuyset.areacount >= 16) {
         $(".selected-area").text("全国");
       } else {
@@ -198,10 +204,22 @@ var purchase = {
     // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 : time[0], time[1]]); // 2021-5-20
     var obj = this.nowBuyset
     console.log(obj,  this.oldBuySet,'obj')
-    // 处理如果升级的
-    if (obj.areacount > this.oldBuySet.areacount) {
-      obj.areacount = this.oldBuySet.areacount
+    /* 处理 
+      1.如果原选择的是全国，则不让跳转选择区域
+      2.当前选择的省份数量大于原省份数量 则按当前选择的数量
+      3.当前选择的省份数量小于原省份数量 则按原省份数量
+      总：按照选择最多省份数量的计算
+    */
+    if (this.oldBuySet.areacount == -1) {
+      $('[data-upgrade-to-area]').attr('href', 'javascript:;')
+      // $('[data-upgrade-to-area] .iconfont').hide()
+    } else {
+      // 如果原购买的省份数量大于当前选择的 则按最大的数量走
+      if (obj.areacount != -1 && this.oldBuySet.areacount > obj.areacount) {
+        obj.areacount = this.oldBuySet.areacount
+      }
     }
+    console.log(obj.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')
@@ -506,13 +524,22 @@ $(function () {
     $('.vip-footer.renew .confirm').attr("disabled", "disabled");
     //支付请求
     var area = purchase.areaSelect;
-    var industry = purchase.industrySelect;
-    if (area["全国"]) {
+    var flag = true
+    // var industry = purchase.industrySelect;
+    if (area["全国"] || purchase.nowBuyset.areacount == -1) {
       area = {};
     }
-    if (industry.length === 1 && industry[0] === "全部行业") {
-      industry = [];
+    // 如果原购买的省份数量大于当前选择的 则按最大的数量走
+    var areaCount;
+    // 如果当前选择的省份数量小于原购买的省份数量， 则按照原购买的省份数量
+    if (Object.keys(area).length != 0 && Object.keys(area).length < purchase.nowBuyset.areacount) {
+      areaCount = purchase.nowBuyset.areacount
+      flag = false
     }
+    console.log(Object.keys(area).length, areaCount, '选择的省份数量和原购买的省份数量')
+    // if (industry.length === 1 && industry[0] === "全部行业") {
+    //   industry = [];
+    // }
     //优惠码
     /*var activeCode = $('.coupon-picker .weui-input').val();
     var activeCodes = "";
@@ -523,19 +550,21 @@ $(function () {
     var param = {
       "userLotteryId": coupon.$refs.couponRef.coupon.userLotteryId,
       "lotteryId": coupon.$refs.couponRef.coupon.lotteryId,
-      "area": JSON.stringify(area),
+      "area": flag ? JSON.stringify(area) : '',
+      'area_count': flag ? 0 : areaCount,
       // "industry": industry.join(","),
       'price': Number(coupon.initPrice*100),
       "time": purchase.timeValue.trim(),
       // "orderType": 5,
       "disWord": GetQueryString("disWord"),
     };
+    console.log(area, 'area', purchase.nowBuyset)
     $DoPost("/subscribepay/vipsubscribe/upgrade", param, function (r) {
       if (r.success) {
         try {
           clearSessionStorage()
           history.replaceState({}, '', '/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + r.data.code);
-          window.location.href = "/jyapp/pay/checkout_subvip?orderCode=" + r.data.code + "&t=1&from=buy"
+          window.location.href = "/jyapp/pay/checkout_subvip?orderCode=" + r.data.code + "&t=2&from=buy"
         } catch (e) {
           showToast(e)
         }

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

@@ -75,13 +75,13 @@
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">企业画像</p>
-        <p class="rights-content">对企业进行全景透视，提供企业基本信息，中标项目分析、重点客户等，帮你挖掘销售线索。</p>
+        <p class="rights-content">对企业进行全景透视，提供企业基本信息，中标项目分析、重点客户等，帮你挖掘销售线索。仅限APP、PC端使用。</p>
       </td>
     </tr>
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">企业搜索</p>
-        <p class="rights-content">搜索全国超七千万企业，获取企业情报信息，全方位监控竞争对手或用户关注的企业。</p>
+        <p class="rights-content">搜索全国超七千万企业，获取企业情报信息，全方位监控竞争对手或用户关注的企业。仅限APP、PC端使用。</p>
       </td>
     </tr>
     <tr>

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

@@ -46,7 +46,7 @@
       <div class="vip-body">
         <ul style="padding: .16rem .24rem;">
           <li class="body-item area">
-            <a class="item-container" href="/jyapp/vipsubscribe/toChooseArea?header=upgrade">
+            <a class="item-container" data-upgrade-to-area href="/jyapp/vipsubscribe/toChooseArea?header=upgrade">
               <div class="item">
                 <span class="item-l">
                   <span class="item-label">省份数量</span>

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

@@ -382,7 +382,7 @@
         </div> -->
         <!-- 升级 -->
         <div class="update_renew">
-          <div class="update-tips">因系统升级，已购买用户可选择原套餐续费，或升级到新版本享受更多权益。</div>
+          <div class="update-tips" data-update-tips>因系统升级，已购买用户可选择原套餐续费，或升级到新版本享受更多权益。</div>
           <div class="footer-button-group j-button-group">
             <button class="j-button-confirm" data-bind-renew>续费</button>
             <button class="j-button-confirm" data-bind-update>升级</button>

src/jfw/modules/bigmember/src/entity/followEnterprise.go

@@ -44,7 +44,7 @@ func CreateEntFollowManager(userid string, pageFlag ...string) (*EntFollow, erro
 //关注企业联想
 func (this *EntFollow) GetAssociationEnt(entName string) ([]map[string]interface{}, error) {
 	accMap := []map[string]interface{}{}
-	query := fmt.Sprintf(`{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id","company_area","company_city","establish_date","capital","company_phone"],"size":%d}`, entName, 6)
+	query := fmt.Sprintf(`{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id"],"size":%d}`, entName, 6)
 	r := elastic.Get("qyxy", "qyxy", query)
 	if r == nil || len(*r) == 0 {
 		return accMap, nil
@@ -52,14 +52,9 @@ func (this *EntFollow) GetAssociationEnt(entName string) ([]map[string]interface
 	for _, v := range *r {
 		//accMap[qutil.ObjToString(v["name"])] = ""
 		accMap = append(accMap, map[string]interface{}{
-			"entId":          qutil.ObjToString(v["_id"]), //id需要加密
-			"entName":        qutil.ObjToString(v["name"]),
-			"company_area":   qutil.ObjToString(v["company_area"]),   //地区
-			"company_city":   qutil.ObjToString(v["company_city"]),   //城市
-			"establish_date": qutil.ObjToString(v["establish_date"]), //注册日期
-			"capital":        qutil.Float64All(v["capital"]),         //注册资本
-			"company_phone":  qutil.ObjToString(v["company_phone"]),  //企业联系方式
-			"isFollow":       "",
+			"entId":    qutil.ObjToString(v["_id"]), //id需要加密
+			"entName":  qutil.ObjToString(v["name"]),
+			"isFollow": "",
 		})
 	}
 	//查询是否关注

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

@@ -20,7 +20,7 @@ type Search struct {
 }
 
 //查询中标企业名称【带曾用名检索】
-const queryFullEntName = `{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id"],"size":%d}`
+const queryFullEntName = `{"query":{"function_score":{"query":{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id","company_area","company_city","establish_date","capital","company_phone"],"size":%d}`
 
 func (s *Search) EntAssociation() {
 	if !R.CheckReqParam(s.ResponseWriter, s.Request, "name") {
@@ -37,8 +37,13 @@ func (s *Search) EntAssociation() {
 		if r != nil {
 			for _, v := range *r {
 				list = append(list, map[string]interface{}{
-					"name":  v["name"],
-					"entId": util.EncodeId(qutil.ObjToString(v["_id"])),
+					"name":           v["name"],
+					"entId":          util.EncodeId(qutil.ObjToString(v["_id"])),
+					"company_area":   qutil.ObjToString(v["company_area"]),   //地区
+					"company_city":   qutil.ObjToString(v["company_city"]),   //城市
+					"establish_date": qutil.ObjToString(v["establish_date"]), //注册日期
+					"capital":        qutil.Float64All(v["capital"]),         //注册资本
+					"company_phone":  qutil.ObjToString(v["company_phone"]),  //企业联系方式
 				})
 			}
 		}

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

@@ -386,7 +386,7 @@ func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry
 	} else {
 		buyset.Upgrade = 1 //升级版超级订阅标识
 		if len(*area) > 0 {
-			pCount := len(*area)
+			pCount = len(*area)
 			//省份数量自动转换全国
 			if pCount > SubVipPrice.New.ProvinceMaxCount {
 				pCount = -1

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -517,10 +517,15 @@ func getSubtotalPrice(oldBuyset, newBuyset *entity.SubvipBuySet, startTime, endt
 	if monthNum != 0 {
 		beforePrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, monthNum, 2, false)
 		newPrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, monthNum, 2, false)
+		log.Println("monthNum beforePrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, monthNum, 2, false))
+		log.Println("monthNum newPrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, monthNum, 2, false))
 	}
 	if yearNum != 0 {
 		beforePrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, yearNum, 1, false)
 		newPrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, yearNum, 1, false)
+
+		log.Println("yearNum beforePrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, yearNum, 1, false))
+		log.Println("newPrice newPrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, yearNum, 1, false))
 	}
 	log.Printf("old %+v \n new %+v \n %d-%d 相差%d年 %d个月\n price: %d-%d=%d  \n", oldBuyset, newBuyset, startTime, endtime, yearNum, monthNum, newPrice, beforePrice, newPrice-beforePrice)
 	return newPrice - beforePrice

src/seo.json

@@ -13,13 +13,14 @@
         }
     },
     "version": "1414",
-    "applyVersion":[
+    "applyVersion": [
     	"docs_v:0001",
 		"points_v:0001",
 		"entniche_v:0001",
 		"coupon_v:0001",
 		"big_pc_v:0001",
-		"xskc_v:0001"
+		"xskc_v:0001",
+        "digital_v:0001"
     ],
     "area": {
         "QG": {
@@ -2771,7 +2772,7 @@
 				"DESCRIPTION": "建筑工程",
 				"INDUSTRY": "JZGC"
 			}
-		}, 
+		},
 		{
 			"JIANZHUANZHUANG": {
 				"NAME": "建筑安装",
@@ -4439,4 +4440,4 @@
 		["合同", "验收", "违规", "招标信用信息其它"],
 		["预告","需求公示", "预审", "论证意见", "预审结果", "招标预告其它"]
 	]
-}	
+}

src/web/staticres/digital_expo/css/index.css

@@ -0,0 +1,435 @@
+body {
+    font-family:PingFang SC;
+    font-style:normal;
+    background-color:#040831;
+}
+#bidding-page .content {
+    padding-bottom:2rem;
+}
+#bidding-page .content img {
+    width:100%;
+}
+.fixed-bottom a {
+    margin-left:0.24rem;
+    font-weight:500;
+    font-size:0.32rem;
+    line-height:0.48rem;
+    color:#FFFFFF;
+}
+.fixed-bottom .flex-r-c {
+    height:1.12rem;
+    background:linear-gradient(360deg,rgba(51,153,255,0.9) 0%,rgba(0,209,255,0.9) 100%);
+    backdrop-filter:blur(0.08rem);
+}
+.fixed-bottom {
+    position:fixed;
+    bottom:0;
+    left:0;
+    right:0;
+    cursor:pointer;
+    z-index:6666;
+}
+.flex {
+    width:100%;
+    flex:1;
+}
+.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;
+}
+.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;
+}
+#bidding-page  .content .icon-s-20,#bidding-page  .icon-s-20 {
+    width:0.4rem;
+    height:0.4rem;
+}
+#bidding-page  .content .icon-s-72,#bidding-page  .icon-s-72 {
+    width:1.44rem;
+    height:1.44rem;
+}
+#bidding-page  .content .icon-s-32,#bidding-page  .icon-s-32 {
+    width:0.64rem;
+    height:0.64rem;
+}
+.color-title-box {
+    width:2.8rem;
+    padding:0.04rem 0.24rem;
+    height:0.6rem;
+    line-height:0.6rem;
+    background:linear-gradient(90deg,#003CD7 0%,rgba(0,52,186,0) 89.35%);
+    border-radius:0.04rem;
+    font-weight:500;
+    font-size:0.36rem;
+    color:#fff;
+}
+.top-number-box > .text--h {
+    font-weight:bold;
+    font-size:0.56rem;
+    line-height:0.78rem;
+    text-align:center;
+    letter-spacing:0.04em;
+    margin-right:0.26rem;
+}
+.top-number-box {
+    font-size:0.28rem;
+    line-height:0.4rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+    margin-top:0.48rem;
+    margin-bottom:0.7rem;
+}
+.info-box {
+    width:calc(100% - 0.48rem);
+    background-repeat:no-repeat;
+    background-size:cover;
+    border-radius:0.16rem;
+    margin:0 0.24rem;
+    padding-top:0.72rem;
+    padding-bottom:0.72rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+}
+.border-left-box span {
+    margin-left:0.2rem;
+}
+.border-left-box {
+    flex-shrink:0;
+    color:#fff;
+    font-size:0.32rem;
+    letter-spacing:0.04em;
+    background-size:100% 1.44rem;
+    width:7.1rem;
+    height:1.44rem;
+    padding-left:0.68rem;
+    box-sizing:border-box;
+    background-position-y:0.08rem;
+    margin-left:-0.24rem;
+}
+.info-box > h3 {
+    font-style:normal;
+    font-weight:bold;
+    font-size:0.48rem;
+    line-height:0.68rem;
+    margin:0 0 0.2rem 0.4rem;
+}
+.info-box > p {
+    font-style:normal;
+    font-weight:500;
+    font-size:0.26rem;
+    line-height:0.36rem;
+    margin:0 0.4rem;
+    margin-bottom:0.24rem;
+}
+.text--h {
+    color:#00F0FF;
+}
+.text--y-box  + .text--y-box {
+    margin-left:0.56rem;
+}
+.text--y-box {
+    font-weight:bold;
+    font-size:0.48rem;
+    line-height:0.68rem;
+    letter-spacing:0.04em;
+    color:#FFE660;
+    margin-bottom:0.2rem;
+}
+p.text--y {
+    padding-left:1.04rem;
+}
+.text--y {
+    font-weight:normal;
+    font-size:0.24rem;
+    line-height:0.34rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+}
+.list-info {
+    margin:0.24rem 0.64rem;
+}
+.title-box h3 {
+    font-weight:bold;
+    font-size:0.48rem;
+    line-height:0.68rem;
+    text-align:center;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+}
+.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(0rem 0.08rem 0.32rem rgba(8,31,38,0.08));
+    border-radius:0.34rem;
+    font-weight:bold;
+    font-size:0.28rem;
+    line-height:0.48rem;
+    text-align:center;
+    letter-spacing:0.04em;
+    width:100%;
+    color:#00F0FF;
+    margin-top:0.08rem;
+}
+.circle-text-box p {
+    margin-left:0.16rem;
+}
+.circle-text-group .circle-text-box {
+    margin-bottom:0.2rem;
+}
+.circle-text-box {
+    font-weight:500;
+    font-size:0.26rem;
+    line-height:0.36rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+}
+.icon-circle-index {
+    flex-shrink:0;
+    display:inline-block;
+    width:0.16rem;
+    height:0.16rem;
+    background:no-repeat center center;
+    background-size:cover;
+}
+.address-info-box img {
+    width:0.48rem !important;
+    height:0.48rem !important;
+}
+.address-info-box span {
+    font-weight:500;
+    font-size:0.36rem;
+    line-height:0.52rem;
+    margin-left:0.16rem;
+    color:#FFFFFF;
+}
+.address-info-box p {
+    margin-top:0.24rem;
+    font-weight:500;
+    font-size:0.28rem;
+    line-height:0.4rem;
+    color:rgba(255,255,255,0.8);
+}
+.address-info-box {
+    margin-top:0.48rem;
+}
+.tag-color-group {
+    flex-wrap:wrap;
+    padding-left:0.34rem;
+    padding-right:0.8rem;
+    padding-bottom:0.2rem;
+}
+.tag-color-box {
+    margin-top:0.24rem;
+    font-weight:bold;
+    font-size:0.26rem;
+    display:flex;
+    align-items:center;
+    text-align:center;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+    width:1.8rem;
+    height:0.64rem;
+    background:linear-gradient(90deg,#00D7B0 0%,rgba(0,175,186,0) 89.35%);
+    border-radius:0.36rem;
+}
+.data-info {
+    margin-top:0.6rem;
+}
+.text--title-sm {
+    font-weight:500;
+    font-size:0.26rem;
+    line-height:0.36rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+    margin-top:0.24rem;
+}
+.play-title-box p {
+    font-weight:bold;
+    font-size:0.28rem;
+    line-height:0.4rem;
+    display:flex;
+    align-items:center;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+}
+.play-title-box span {
+    font-style:normal;
+    font-weight:normal;
+    font-size:0.26rem;
+    line-height:0.36rem;
+    letter-spacing:0.04em;
+    color:#00F0FF;
+    margin-top:0.04rem;
+}
+.play-group {
+    margin-top:0.64rem;
+    padding-left:0.64rem;
+}
+.play-icon-box p {
+    margin-left:0.08rem;
+}
+.play-icon-box {
+    width:1.6rem;
+    height:0.8rem;
+    background:linear-gradient(90deg,#00D7B0 0%,rgba(0,175,186,0) 89.35%);
+    filter:drop-shadow(0rem 0.08rem 0.32rem rgba(8,31,38,0.08));
+    border-radius:0.4rem 0rem 0rem 0.4rem;
+    font-weight:bold;
+    font-size:0.24rem;
+    line-height:0.32rem;
+    letter-spacing:0.1em;
+    text-decoration-line:underline;
+    color:#FFFFFF;
+}
+.wrap-list > div {
+    width:50%;
+}
+.class-info {
+}.wrap-text-box.p-32 {
+     padding-right:0.24rem;
+ }
+.fill-text-box {
+    margin-top:-0.2rem;
+}
+.border-change-group {
+    margin-top:0.16rem;
+}
+.border-change-box  + .border-change-box {
+    margin-left:0.16rem;
+}
+.border-change-box {
+    flex-shrink:0;
+    font-weight:bold;
+    font-size:0.26rem;
+    line-height:0.36rem;
+    letter-spacing:0.04em;
+    color:#FFFFFF;
+    padding:0 0.16rem;
+    border: 0.08rem solid #005ACD;
+    box-sizing:border-box;
+    border-image-outset:0;
+    border-image-slice:10 12;
+}
+.gov-info {
+    margin-top:0.96rem;
+    margin-bottom:0.64rem;
+}
+.articles-group {
+    padding-left:0.32rem;
+    margin-top:0.24rem;
+}
+.articles-box {
+    padding:0.24rem 0;
+    border-bottom: 0.5px solid rgba(255,255,255,0.16);
+}
+.articles-info {
+    font-weight:500;
+    font-size:0.24rem;
+    line-height:0.36rem;
+    color:rgba(255,255,255,0.5);
+    margin-top:0.08rem;
+    justify-content:flex-end !important;
+    padding-right:0.32rem;
+}
+.articles-info span + span {
+    margin-left:0.32rem;
+}
+.articles-title {
+    font-weight:500;
+    font-size:0.32rem;
+    line-height:0.48rem;
+    color:#FFFFFF;
+    padding-right:0.32rem;
+}
+.swiper-slide img {
+    width:100%;
+}
+#swiper1 .swiper-container,#swiper2 .swiper-container,#swiper3 .swiper-container {
+    width:100%;
+    height:100%;
+}
+.swiper-slide {
+    display:flex;
+    justify-content:center;
+    align-items:center;
+    overflow:hidden;
+}
+#swiper1 .swiper-slide {
+    width:6rem;
+    border-radius:0.16rem;
+}
+#swiper2 .swiper-slide,#swiper3 .swiper-slide {
+    width:3.04rem;
+    border-radius:0.08rem;
+}
+#swiper2 .swiper-wrapper {
+    margin-left:0.32rem;
+}
+.play-tip-box {
+    position:relative;
+}
+.play-tip-info-box span {
+    font-weight:500;
+    font-size:0.24rem;
+    line-height:0.36rem;
+    color:#FFFFFF;
+    margin-left:0.08rem;
+}
+.play-tip-info-box {
+    position:absolute;
+    pointer-events:none;
+    bottom:0.08rem;
+    left:0.16rem;
+}
+.p-32 {
+    padding:0 0.64rem;
+}
+.p-l-32 {
+    padding-left:0.64rem;
+}
+.p-16 {
+    padding:0 0.32rem;
+}
+.m-16 {
+    margin:0 0.32rem;
+}
+.m-t-16 {
+    margin-top:0.32rem;
+}
+.m-t-24 {
+    margin-top:0.48rem;
+}
+.m-t-32 {
+    margin-top:0.64rem;
+}

src/web/staticres/vipsubscribe/js/choose_area.js

@@ -192,7 +192,7 @@ var AreaChoose = {
           }
       }*/
       this.selectObj = tmpSelect;
-      console.log("this.selectObj:", tmpSelect)
+      // console.log("this.selectObj:", tmpSelect)
       // $('.result_name').append(html)
       AreaChoose.isOpen()
       // console.log(result)
@@ -228,7 +228,7 @@ var AreaChoose = {
       let pHeight = $('.result_text').height()
       let minHeight = $('.result_text').css('min-height')
       let rows = Math.round(Math.round(pHeight) / parseFloat(minHeight));
-      console.log("高度：" + pHeight, "最小高度" + minHeight, "行数：" + rows)
+      // console.log("高度：" + pHeight, "最小高度" + minHeight, "行数：" + rows)
       if (rows == 1) {
           $('.packup').hide()
           $('.detail').hide()

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

@@ -41,7 +41,7 @@ var Calculation = {
                 "allProvince_allBuyerClass": 59900
             },
             "year": {
-                "oneProvince_allBuyerClass": 38800,
+                "oneProvince_allBuyerClass": 38000,
                 "allProvince_allBuyerClass": 599900
             },
             "provincePrice": 3800,

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

@@ -869,9 +869,12 @@ $(function () {
             showGiveStatus(true)
           }
         }
-        // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
-        if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
-          $('*[data-bind-update]').hide()
+        // 如果购买的是升级版套餐 不显示升级提示 且如果是全国全行业 则不显示升级按钮
+        if (state.buyset.upgrade === 1) {
+          $('[data-update-tips]').hide()
+          if (state.buyset.areacount == -1) {
+            $('*[data-bind-update]').hide()
+          }
         }
     }
 

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

@@ -115,24 +115,17 @@ var renew = {
         this.price = price
         coupon.updatePrice(this.price / 100)
     },
-    // 根据选中结果得到一个时间段的时间戳
+    // 根据选中结果得到续费了多长时间的字符串
     getDuration: function (timeSelect) {
-        var dStamp = 0
-        var s = ''
-        var perMonthStamp = 1000 * 60 * 60 * 24 * 30
+        var durationStr = ''
         if (timeSelect[1] === 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
+            durationStr = timeSelect[0] + '年'
         } else if (timeSelect[1] === 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
-        }
-        return {
-            stamp: dStamp,
-            s: s
+            durationStr = timeSelect[0] + '个月'
         }
+        return durationStr
     },
     // 计算续费后的日期区间
     calcDuration: function (needSet) {
@@ -142,11 +135,10 @@ var renew = {
             $('.select_cycle .duration').hide()
             return
         }
-        var durationInfo = this.getDuration(this.timeSelect)
-        var durationStamp = durationInfo.stamp // 续费时间段时间戳
-        var durationStr = durationInfo.s // 续费时间段字符串
+        var durationStamp = getVipEndDate(this.timeSelect[1], this.timeSelect[0], endTime) - endTime // 续费时间段时间戳
+        var durationStr = this.getDuration(this.timeSelect) // 续费时间段字符串
         var buyEndTimeString = new Date(endTime * 1000).pattern('yyyy年MM月dd日') // svip到期时间
-        var renewEndTimeString = new Date(endTime * 1000 + durationStamp).pattern('yyyy年MM月dd日') //续费后到期时间
+        var renewEndTimeString = new Date((endTime + durationStamp) * 1000).pattern('yyyy年MM月dd日') //续费后到期时间
 
         if (needSet) {
             $('.select_cycle .month').text(durationStr)
@@ -183,17 +175,16 @@ var renew = {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(timeSelect)
-        var durationStamp = durationInfo.stamp // 续费时间段时间戳
+        var durationStamp = getVipEndDate(timeSelect[1], timeSelect[0], endTime) - endTime // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
         var nowStamp = Math.floor(Date.now() / 1000)
         // 已购买的套餐剩余月数
         var lastMonthStamp = endTime - nowStamp
-        var lastMonth = Math.ceil(lastMonthStamp / (60 * 60 * 24 * 30))
+        var lastMonth = Math.round(lastMonthStamp / (60 * 60 * 24 * 30))
         // 续费后套餐剩余月数（需要加上原剩余月数lastMonth）
-        var renewMonthTotalStamp = lastMonthStamp + (durationStamp / 1000)
-        var renewMonthTotal = Math.ceil(renewMonthTotalStamp / (60 * 60 * 24 * 30))
+        var renewMonthTotalStamp = lastMonthStamp + durationStamp
+        var renewMonthTotal = Math.round(renewMonthTotalStamp / (60 * 60 * 24 * 30))
 
         if (renewMonthTotal > maxEndMonth) {
             var showTipText = '<div style="white-space: nowrap;">最长订阅周期不可超过3年</div>剩余周期：' + this.monthToYear(lastMonth).str
@@ -297,7 +288,7 @@ var renew = {
             var data = {
                 userLotteryId :coupon.$refs.couponRef.coupon.userLotteryId,
                 lotteryId : coupon.$refs.couponRef.coupon.lotteryId,
-                time : _this.getDuration(_this.timeSelect).s.trim(),
+                time : _this.getDuration(_this.timeSelect).trim(),
                 orderType: 5,
                 disWord :GetQueryString('disWord'),
                 price: _this.price

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

@@ -78,7 +78,7 @@ var purchase = {
       //加载价格
       $DoPost("/subscribepay/vipsubscribe/getPrice", {}, function (r) {
         if (r) {
-          purchase.price = r.new;
+          purchase.price = r;
           purchase.can1111 = r.isActiving && r.isWritten === 0
           if (purchase.can1111) {
             if (!sessionStorage.getItem("vipSubSelectTime")) {
@@ -102,10 +102,10 @@ var purchase = {
       if (readSelect) {
         coupon.checkboxStatus = true
       }
-      console.log(areaSelect && industrySelect && readSelect,'22222',coupon.$refs.couponRef.submitStatus)
+      // console.log(areaSelect && industrySelect && readSelect,'22222',coupon.$refs.couponRef.submitStatus)
       if (areaSelect && industrySelect && readSelect) {
         coupon.$refs.couponRef.submitStatus = false
-        console.log(coupon.$refs.couponRef.submitStatus)
+        // console.log(coupon.$refs.couponRef.submitStatus)
       } else {
         coupon.$refs.couponRef.submitStatus = true
       }
@@ -115,7 +115,16 @@ var purchase = {
     this.nowBuyset = getBuySet(purchase.areaSelect, purchase.industrySelect, this.price);
     var old = this.oldBuySet
     //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
-    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, undefined, this.endTime)
+    // 选择完区域回显后 需判断选择省份结果与原购买的省份结果进行对比，取最多的值
+    // if (purchase.nowBuyset.areacount == -1) {
+    //   old.areacount = -1
+    // } else {
+    //   if (purchase.nowBuyset.areacount > old.areacount) {
+    //     old.areacount = purchase.nowBuyset.areacount
+    //   }
+    // }
+    console.log(old)
+    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, purchase.price, this.endTime)
   },
   showArea: function () {
     if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["一个省"]) { //有选择
@@ -194,10 +203,25 @@ var purchase = {
     // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 :time[0], time[1]]);
 
     var obj = this.nowBuyset
+    // console.log(obj, 'obj')
+    /* 处理 
+      1.如果原选择的是全国，则不让跳转选择区域
+      2.当前选择的省份数量大于原省份数量 则按当前选择的数量
+      3.当前选择的省份数量小于原省份数量 则按原省份数量
+      总：按照选择最多省份数量的计算
+    */
     console.log(obj, 'obj')
-    if (obj.areacount > this.oldBuySet.areacount) {
-      obj.areacount = this.oldBuySet.areacount
+    if (this.oldBuySet.areacount == -1) {
+      $('[data-upgrade-to-area]').attr('href', 'javascript:;')
+      // $('[data-upgrade-to-area] .iconfont').hide()
+      obj.areacount = -1
+    } else {
+      // 如果原购买的省份数量大于当前选择的 则按最大的数量走
+      if (obj.areacount != -1 && this.oldBuySet.areacount > obj.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')
@@ -509,13 +533,22 @@ $(function () {
     $('.vip-footer.renew .confirm').attr("disabled", "disabled");
     //支付请求
     var area = purchase.areaSelect;
-    var industry = purchase.industrySelect;
-    if (area["全国"]) {
-        area = {};
+    var flag = true
+    // var industry = purchase.industrySelect;
+    if (area["全国"] || purchase.nowBuyset.areacount == -1) {
+      area = {};
     }
-    if (industry.length === 1 && industry[0] === "全部行业") {
-        industry = [];
+    // 如果原购买的省份数量大于当前选择的 则按最大的数量走
+    var areaCount;
+    // 如果当前选择的省份数量小于原购买的省份数量， 则按照原购买的省份数量
+    if (Object.keys(area).length != 0 && Object.keys(area).length < purchase.nowBuyset.areacount) {
+      areaCount = purchase.nowBuyset.areacount
+      flag = false
     }
+    console.log(Object.keys(area).length, areaCount, '选择的省份数量和原购买的省份数量')
+    // if (industry.length === 1 && industry[0] === "全部行业") {
+    //     industry = [];
+    // }
     //优惠码
     var activeCode = $('.coupon-picker .weui-input').val();
     var activeCodes = "";
@@ -538,7 +571,7 @@ $(function () {
       if (r.success) {
         clearSessionStorage();
         history.replaceState({}, '', '/front/vipsubscribe/toOrderDetailPage?orderCode=' + r.data.code);
-        window.location.href = "/weixin/pay/checkout_subvip?t=1&orderCode=" + r.data.code;
+        window.location.href = "/weixin/pay/checkout_subvip?t=2&orderCode=" + r.data.code;
       } else {
         $('.vip-footer.renew .confirm').removeAttr("disabled");
       }

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

@@ -16,7 +16,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="format-detection" content="telephone=no">
     <link rel="icon" href="/favicon.ico">
-    <title>招标文件解读</title>
+    <title>数博会</title>
     <script src='{{Msg "seo" "cdn"}}/js/rem.js'></script>
     <script src='{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}'></script>
     {{include "/common/weixin.html"}}
@@ -26,282 +26,30 @@
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css'>
     <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"}}'>
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/digital_expo/css/index.css?v={{Msg "seo" "digital_v"}}'>
+    <link rel="stylesheet" href='https://cdn-common.jianyu360.cn/cdn/lib/swiper/5.4.2/swiper.min.css'>
     <style>
-        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;
-            left: 0;
-            right: 0;
-            cursor: pointer;
-        }
-
-
-
-        .flex {
-            width: 100%;
-            flex: 1;
-        }
-
-        .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;
-        }
-
-        .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;
-        }
-
-
-        #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;
-        }
-        .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-image: url('{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/bg_center.png?v={{Msg "seo" "digital_v"}}');
             background-repeat: no-repeat;
             background-size: cover;
-            border-radius: 8px;
-            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;
+        .border-change-box {
+            border: 4px solid #005ACD;
+            border-image: url('{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/border_c.png?v={{Msg "seo" "digital_v"}}') ;
             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;
-        }
-        .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;
-        }
-
-        .circle-text-box p {
-            margin-left: 8px;
-        }
-        .circle-text-group .circle-text-box {
-            margin-bottom: 10px;
-        }
-        .circle-text-box {
-            font-weight: 500;
-            font-size: 13px;
-            line-height: 18px;
-            letter-spacing: 0.04em;
-            color: #FFFFFF;
+            border-image-outset: 0;
+            border-image-slice: 10 12;
         }
         .icon-circle-index {
-            display: inline-block;
-            width: 8px;
-            height: 8px;
-            background: url('{{Msg "seo" "cdn"}}/digital_expo/image/icon_index.png') no-repeat center center;
+            background: url('{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_index.png?v={{Msg "seo" "digital_v"}}') no-repeat center center;
             background-size: cover;
         }
-
-        .address-info-box img {
-            width: 24px !important;
-            height: 24px !important;
-        }
-        .address-info-box span {
-            font-weight: 500;
-            font-size: 18px;
-            line-height: 26px;
-            margin-left: 8px;
-            color: #FFFFFF;
-        }
-        .address-info-box p {
-            margin-top: 12px;
-            font-weight: 500;
-            font-size: 14px;
-            line-height: 20px;
-            color: rgba(255, 255, 255, 0.8);
-        }
-        .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;
+        .border-left-box {
+            background: url('{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/border_left.png?v={{Msg "seo" "digital_v"}}') no-repeat;
+            background-size: 100% 1.44rem;
+            background-position-y: 0.08rem;
         }
-
-
     </style>
 </head>
 
@@ -309,10 +57,39 @@
 <div class="j-container">
     <div class="j-main" id="bidding-page">
         <div class="content">
-            <img src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_top.png' alt="">
+            <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/bg_top.png?v={{Msg "seo" "digital_v"}}' alt="">
 
             <div class="m-16 m-t-16 color-title-box">最现场</div>
 
+            <div class="swiper-container m-t-24" id="swiper1">
+                <div class="swiper-wrapper">
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/0.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/1.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/2.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/3.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/4.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/5.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/6.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/7.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                </div>
+            </div>
+
             <div class="flex-r-c center top-number-box">
                 <span class="text--h">300万+</span>
                 <div class="flex-c-c left">
@@ -329,27 +106,41 @@
                     掘等功能，帮助企业及时全面掌握商机信息。
                 </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="">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_0.png?v={{Msg "seo" "digital_v"}}' 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>
+                        <h3>10000+</h3>
+                        <span class="text--y">全国政府和企业招标网站</span>
                     </div>
                     <div class="flex-c-c center left text--y-box">
-                        <h3 class="text--y">100%</h3>
-                        <span>行业和地区覆盖</span>
+                        <h3>100%</h3>
+                        <span class="text--y">行业和地区覆盖</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="">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_1.png?v={{Msg "seo" "digital_v"}}' alt="">
                     <span>精准获取项目信息，就用剑鱼标讯</span>
                 </div>
+                <div class="flex flex-c-c left">
+                    <p class="text--y">支持按照不同需求订阅信息</p>
+                    <div class="flex flex-r-c tag-color-group">
+                        <div class="flex-r-c center tag-color-box">行业</div>
+                        <div class="flex-r-c center tag-color-box">区域</div>
+                        <div class="flex-r-c center tag-color-box">金额</div>
+                        <div class="flex-r-c center tag-color-box">发布时间</div>
+                        <div class="flex-r-c center tag-color-box">信息类型</div>
+                        <div class="flex-r-c center tag-color-box">推送时间</div>
+                    </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_2.png' alt="">
+                    <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_2.png?v={{Msg "seo" "digital_v"}}' alt="">
                     <span>快速达成销售目标，就用剑鱼标讯</span>
                 </div>
+                <div class="flex flex-c-c left">
+                    <p class="text--y">招标信息分钟级更新，第一时间获取拟建项目，<br> 提前分析市场、建立客户关系</p>
+                </div>
             </div>
 
             <div class="flex-c-c center list-info">
@@ -358,10 +149,10 @@
                     <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="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/c_1.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/c_2.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/c_3.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    <img  class="icon-s-72" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/c_4.png?v={{Msg "seo" "digital_v"}}' 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">
@@ -384,12 +175,22 @@
             </div>
 
             <div class="flex-c-c center data-info">
-                <div class="flex title-box flex-c-c center">
+                <div class="flex title-box flex-c-c center p-32">
                     <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">
+                <p class="text--title-sm p-32">基于招标大数据，利用数据可视化、数据分析建模和人工智能等技术，为客户提供数据场景化数据分析。</p>
+                <div class="flex flex-r-c center sb play-group">
+                    <div class="flex-c-c left play-title-box">
+                        <p>企业全景分析</p>
+                        <span>对采购单位和竞对进行全景透视</span>
+                    </div>
+                    <div class="flex-r-c center play-icon-box" data-media="0">
+                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                        <p>介绍<br>视频</p>
+                    </div>
+                </div>
+                <div class="flex flex-r-c wrap center left m-t-24 circle-text-group p-32 wrap-list">
                     <div class="flex-r-c center left circle-text-box">
                         <span class="icon-circle-index"></span>
                         <p>招采信息监测</p>
@@ -411,21 +212,123 @@
                         <p>重点客户详细信息分析</p>
                     </div>
                 </div>
+                <div class="flex flex-r-c center sb play-group">
+                    <div class="flex-c-c left play-title-box">
+                        <p>企业情报监控</p>
+                        <span>商业情报，一手掌控</span>
+                    </div>
+                    <div class="flex-r-c center play-icon-box" data-media="1">
+                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                        <p>介绍<br>视频</p>
+                    </div>
+                </div>
+                <div class="flex flex-r-c wrap center left m-t-24 circle-text-group p-32 wrap-list">
+                    <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 class="flex-r-c center left circle-text-box">
+                        <span class="icon-circle-index"></span>
+                        <p>商业情报一手掌控</p>
+                    </div>
+                </div>
+                <div class="flex flex-r-c center sb play-group">
+                    <div class="flex-c-c left play-title-box">
+                        <p>采购单位画像</p>
+                        <span>利用数据可视化，挖解销售线索</span>
+                    </div>
+                    <div class="flex-r-c center play-icon-box" data-media="2">
+                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                        <p>介绍<br>视频</p>
+                    </div>
+                </div>
+                <div class="flex flex-r-c wrap center left m-t-24 circle-text-group p-32 wrap-list">
+                    <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">
+            <div class="flex-c-c center class-info m-t-32">
+                <div class="flex title-box flex-c-c center p-32">
                     <h3>行业解决方案</h3>
                     <div class="flex progress-box">聚焦数据价值变现</div>
                 </div>
+                <div class="flex flex-c-c left class-list-box m-t-24">
+                    <div class="flex-r-c center left circle-text-box p-32">
+                        <span class="icon-circle-index"></span>
+                        <p>整合企业多维度数据，洞察行业市场</p>
+                    </div>
+                    <div class="flex flex-r-c center left p-l-32 border-change-group">
+                        <div class="border-change-box">公示</div>
+                        <div class="border-change-box">招标</div>
+                        <div class="border-change-box">新闻舆情</div>
+                        <div class="border-change-box">...</div>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box p-32 m-t-24">
+                        <span class="icon-circle-index"></span>
+                        <p>提供分析服务，提供决策参考</p>
+                    </div>
+                    <div class="flex flex-r-c center left p-l-32 border-change-group">
+                        <div class="border-change-box">市场</div>
+                        <div class="border-change-box">竞对</div>
+                        <div class="border-change-box">客户</div>
+                        <div class="border-change-box">产品报价</div>
+                        <div class="border-change-box">...</div>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box p-32 m-t-24">
+                        <span class="icon-circle-index"></span>
+                        <p>助力传统行业数字化转型，重塑企业核心竞争力</p>
+                    </div>
+                    <div class="flex flex-r-c center left p-l-32 border-change-group">
+                        <div class="border-change-box">电信</div>
+                        <div class="border-change-box">金融</div>
+                        <div class="border-change-box">ICT</div>
+                        <div class="border-change-box">医疗</div>
+                        <div class="border-change-box">传统行业...</div>
+                    </div>
+                </div>
             </div>
 
             <div class="flex-c-c center gov-info">
-                <div class="flex title-box flex-c-c center">
+                <div class="flex title-box flex-c-c center p-32">
                     <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 flex-c-c center left m-t-24 circle-text-group p-32 wrap-text-box">
                     <div class="flex-r-c center left circle-text-box">
                         <span class="icon-circle-index"></span>
                         <p>依托海量数据库，实现信息透明共享，降低管理成本</p>
@@ -440,63 +343,209 @@
                     </div>
                     <div class="flex-r-c center left circle-text-box">
                         <span class="icon-circle-index"></span>
-                        <p>适用于审计、税务、招商、纪检委、司法、监察、工商等政府机关单位</p>
+                        <p>适用于审计、税务、招商、纪检委、司法、监察、</p>
+                    </div>
+                    <div class="flex-r-c center left circle-text-box fill-text-box">
+                        <span class="icon-circle-index" style="opacity: 0"></span>
+                        <p>工商等政府机关单位</p>
                     </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="swiper-container m-t-24" id="swiper2">
+                <div class="swiper-wrapper">
+                    <div class="swiper-slide">
+                        <div class="play-tip-box">
+                            <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/play-jy.png?v={{Msg "seo" "digital_v"}}' alt="">
+                            <div class="flex-r-c center left play-tip-info-box">
+                                <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                                <span>02:03</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="swiper-slide">
+                        <div class="play-tip-box">
+                            <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/play-yn.png?v={{Msg "seo" "digital_v"}}' alt="">
+                            <div class="flex-r-c center left play-tip-info-box">
+                                <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                                <span>09:25</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="m-16 m-t-32 color-title-box">数博视点</div>
+
+            <div class="flex flex-c-c">
+                <div class="flex flex-c-c left articles-group">
+                    <a href="https://mp.weixin.qq.com/s/Z3NW4rqMtnG_YqMrbUF89Q" class="flex flex-c-c right articles-box">
+                        <div class="flex articles-title">相约爽爽贵阳，演绎数据精彩|拓普获邀参展2021中国国际大数据产业博览会</div>
+                        <div class="flex flex-r-c center articles-info">
+                            <span>2021/05/12</span>
+                            <span>数据观</span>
+                        </div>
+                    </a>
+                    <a href="https://mp.weixin.qq.com/s/M3yGiZko5psBpTh57hB5uA" class="flex flex-c-c right articles-box">
+                        <div class="flex articles-title">创新发展，数说未来！拓普再次亮相贵阳数博会</div>
+                        <div class="flex flex-r-c center articles-info">
+                            <span>2021/05/12</span>
+                            <span>数据观</span>
+                        </div>
+                    </a>
+                    <a href="https://www.chinanews.com/business/2019/06-13/8863976.shtml" class="flex flex-c-c right articles-box">
+                        <div class="flex articles-title">数博前沿丨剑鱼标讯新品发布会亮相2019数博会</div>
+                        <div class="flex flex-r-c center articles-info">
+                            <span>2021/05/12</span>
+                            <span>数据观</span>
+                        </div>
+                    </a>
+                </div>
+            </div>
+
+
+            <div class="m-16 m-t-32 color-title-box">多彩数博</div>
+
+            <div class="swiper-container m-t-24" id="swiper3">
+                <div class="swiper-wrapper">
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/0.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/1.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/2.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/3.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/4.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/5.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/6.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                    <div class="swiper-slide">
+                        <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/spot-image/7.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    </div>
+                </div>
+            </div>
+
+            <div class="m-16 m-t-32 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="">
+                <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/bg_address_1.png?v={{Msg "seo" "digital_v"}}' alt="">
+                <img class="m-t-16" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/bg_address_2.png?v={{Msg "seo" "digital_v"}}' 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="">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_address_1.png?v={{Msg "seo" "digital_v"}}' 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="">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_address_2.png?v={{Msg "seo" "digital_v"}}' 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="">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_address_3.png?v={{Msg "seo" "digital_v"}}' 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="">
+                        <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_address_4.png?v={{Msg "seo" "digital_v"}}' alt="">
                         <span>地铁路线</span>
                     </div>
                     <p>在贵阳任意地铁站乘坐地铁1号线，到国际会议生态中心站（C出口）即可到达会场</p>
                 </div>
             </div>
 
-            <div class="m-16 m-t-16 color-title-box">合作伙伴</div>
+            <div class="m-16 m-t-32 color-title-box">合作伙伴</div>
             <div class="flex p-16 m-t-24">
-                <img src='{{Msg "seo" "cdn"}}/digital_expo/image/bg_bottom.png' alt="">
+                <img src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/bg_bottom.png?v={{Msg "seo" "digital_v"}}' alt="">
             </div>
         </div>
         <div class="fixed-bottom">
             <div class="flex-r-c center">
-                <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/image/icon_phone.png' alt="">
+                <img class="icon-s-20" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_phone.png?v={{Msg "seo" "digital_v"}}' alt="">
                 <a href="tel:400-108-6670">咨询电话：400-108-6670</a>
             </div>
         </div>
     </div>
 </div>
 
-<script></script>
+<script src="https://cdn-common.jianyu360.cn/cdn/lib/swiper/5.4.2/swiper.min.js"></script>
+<script>
+  var swiper1 = new Swiper('#swiper1',{
+    slidesPerView: 'auto',
+    centeredSlides: true,
+    spaceBetween: '3.2%',
+    speed:800,
+    autoplay: {
+      delay: 4000,
+      disableOnInteraction: false
+    },
+    loop: true,
+  });
+  swiper1.init()
+
+  var swiper3 = new Swiper('#swiper3',{
+    slidesPerView: 'auto',
+    centeredSlides: true,
+    spaceBetween: '2.13%',
+    speed:800,
+    autoplay: {
+      delay: 4000,
+      disableOnInteraction: false
+    },
+    loop: true,
+  });
+  swiper3.init()
+
+  var playMediaBottom = [
+    'http://1500005266.vod2.myqcloud.com/6c9a37fbvodcq1500005266/5cfda6a45285890818681574899/PWOWD4f9uDQA.mp4',
+    'http://1500005266.vod2.myqcloud.com/6c9a37fbvodcq1500005266/b5abb34a5285890818546421315/CWZjYawaatAA.mp4'
+  ]
+  var swiper2 = new Swiper('#swiper2',{
+    slidesPerView: 'auto',
+    centeredSlides: false,
+    spaceBetween: '2.13%',
+    speed:800,
+    autoplay: {
+      delay: 4000,
+      disableOnInteraction: false
+    },
+    on: {
+      click: function (swiper, event) {
+        var index = this.clickedIndex || 0
+        location.href =  playMediaBottom[Number(index)]
+      }
+    }
+  });
+  swiper2.init()
+
+  var playMedia = [
+    'http://1500005266.vod2.myqcloud.com/6c9a37fbvodcq1500005266/014b9ef05285890818673168033/jNW6lsMeaW8A.mp4',
+    'http://1500005266.vod2.myqcloud.com/6c9a37fbvodcq1500005266/01496d4b5285890818673164023/a3hxlHvYWNEA.mp4',
+    'http://1500005266.vod2.myqcloud.com/6c9a37fbvodcq1500005266/014a97f65285890818673166491/4JJJjIcCz4cA.mp4'
+  ]
+  $('.play-icon-box').on('click', function () {
+    var index = $(this).attr('data-media') || 0
+    location.href =  playMedia[Number(index)]
+  })
+
+</script>
 
 
 <!--S-当前页面的资源-->

src/web/templates/common/commonRules.html

@@ -75,13 +75,13 @@
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">企业画像</p>
-        <p class="rights-content">对企业进行全景透视，提供企业基本信息，中标项目分析、重点客户等，帮你挖掘销售线索。</p>
+        <p class="rights-content">对企业进行全景透视，提供企业基本信息，中标项目分析、重点客户等，帮你挖掘销售线索。仅限APP、PC端使用。</p>
       </td>
     </tr>
     <tr>
       <td class="rights-item" colspan="2">
         <p class="rights-title">企业搜索</p>
-        <p class="rights-content">搜索全国超七千万企业，获取企业情报信息，全方位监控竞争对手或用户关注的企业。</p>
+        <p class="rights-content">搜索全国超七千万企业，获取企业情报信息，全方位监控竞争对手或用户关注的企业。仅限APP、PC端使用。</p>
       </td>
     </tr>
     <tr>

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

@@ -345,7 +345,7 @@
     <!-- 升级 -->
     <!-- 升级 -->
     <div class="update_renew">
-      <div class="update-tips">因系统升级，已购买用户可选择原套餐续费，或升级到新版本享受更多权益。</div>
+      <div class="update-tips" data-update-tips>因系统升级，已购买用户可选择原套餐续费，或升级到新版本享受更多权益。</div>
       <div class="footer-button-group j-button-group">
         <button class="j-button-confirm" data-bind-renew>续费</button>
         <button class="j-button-confirm" data-bind-update>升级</button>