分支合并

src/jfw/front/vipsubscribe.go

@@ -189,7 +189,8 @@ func (s *Subscribepay) Introduce() error {
 	}
 	obj := util.ObjToMap((*m)["o_vipjy"])
 	log.Println("disWord:", s.GetString("disWord"))
-	if util.IntAll((*m)["i_vip_status"]) > 0 {
+	from := s.GetString("type") //双十一活动 接受参数renew 跳转到介绍页（续费）
+	if util.IntAll((*m)["i_vip_status"]) > 0 && from != "renew" {
 		if s.GetString("disWord") != "" {
 			//分销识别 直接VIP续费
 			if util.IntAll((*m)["i_vip_status"]) == 1 { //试用用户

src/jfw/modules/app/src/app/front/big-member.go

@@ -23,7 +23,7 @@ func init() {
 var whiteReg = regexp.MustCompile(`full|landingPage|buy_commit|contrast|memberdetail|write_infor|init|set_*`)
 
 //推送设置列表
-var setListReg = regexp.MustCompile(`push_*|full`)
+var setListReg = regexp.MustCompile(`push_*|full|memberdetail`)
 
 //专家版可进入的页面
 var expertReg = regexp.MustCompile(`potential_cor_list|bigvip_subreport|ent_portrait_change`)

src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -96,7 +96,8 @@ func (s *Subscribepay) Introduce() error {
 	if len(*m) == 0 {
 		return s.Redirect("/jyapp/login")
 	}
-	if util.IntAll((*m)["i_vip_status"]) > 0 {
+	from := s.GetString("type") //双十一活动 接受参数renew 跳转到介绍页（续费）
+	if util.IntAll((*m)["i_vip_status"]) > 0 && from != "renew" {
 		if s.GetString("disWord") != "" {
 			//分销识别 直接VIP续费
 			if util.IntAll((*m)["i_vip_status"]) == 1 { //试用用户

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

@@ -1,5 +1,6 @@
 function showGiveStatus (t) {
     if (t) {
+        $(".banner-ad-box").css('display', 'flex')
         $("#giveTimeBox").addClass('hasDoubleEleven')
         $('.discount-button').show().on('click', function () {
             var details = $('.discount-details')
@@ -14,6 +15,7 @@ function showGiveStatus (t) {
     } else {
         $("#giveTimeBox").removeClass('hasDoubleEleven')
         $(".origin-price").hide()
+        $(".banner-ad-box").hide()
     }
 }
 // 拦截获取价格接口读取11.11活动信息
@@ -307,7 +309,7 @@ $(function () {
     $('.billing-list-container .dialog_hd__close').on('click', function () {
         pickerShow('.billing-list-container', false)
     })
-    $('.weui-mask').on('click', function () {
+    $('.weui-mask,.icon-del-grey').on('click', function () {
         pickerShow('.billing-list-container', false)
         $('.coupon-picker').hide()
         $('.discount-details').hide()
@@ -380,6 +382,7 @@ $(function () {
         sessionStorage.setItem("vip_index_read", state ? true : false);
     });
     $('.vip-footer .button-l.reset').off("click").on("click", function () {
+        $('.weui-mask').trigger('click')
         window.history.back();
     });
 
@@ -744,6 +747,7 @@ $(function () {
             $(".custom-header-right.go_buy").show();
             $('.title-vip-logo').hide(); // 隐藏title前的图标
             $('.title-tip').show(); // 展示试用7天
+            $(".banner-ad-box").hide()
         }
     }
 

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

@@ -77,6 +77,21 @@
     .sub-info{
         min-height: 4.5rem;
     }
+      .banner-ad-box {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: space-between;
+          background: rgba(251, 72, 61, 0.88);
+          border-radius: 8px;
+          margin: 0.24rem .24rem;
+          padding: 0.16rem 0.32rem;
+          color: #fff;
+          font-size: 0.26rem;
+      }
+      .banner-ad-box .iconfont.icon-arrow {
+          color: #fff;
+      }
   </style>
 </head>
 
@@ -121,6 +136,10 @@
         <ul class="vip-body">
 
           <li class="sub-box">
+           <a href="/jyapp/vipsubscribe/introducePage?type=renew" class="banner-ad-box" style="display: none">
+               <span>现在购买或续费，买多久送多久，错过再等一年！</span>
+               <i class="iconfont icon-arrow"></i>
+           </a>
             <ul class="sub-info">
               <li class="area">
                 <a class="item-container" href="/jyapp/vipsubscribe/toChangeArea">

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

@@ -151,6 +151,9 @@
             <span class="vi-footer-r" data-need-bind-phone data-url="/jyapp/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
                 <span class="text">开通 超级订阅</span>
             </span>
+            <span style="display: none;" class="vi-footer-r" id="vip-introduce-renew" onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_renew{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}')">
+                <span class="text">去续费</span>
+            </span>
         </div>
     </div>
 </div>
@@ -162,7 +165,11 @@
             window.location.replace($(this).attr('data-url'))
         })
     </script>
-    <script>
+<script>
+        if (location.href.lastIndexOf('type=renew') !== -1) {
+            $("#vip-introduce").hide()
+            $("#vip-introduce-renew").show()
+        }
     $(function(){
         try{
             //隐藏底部栏 0:隐藏；1:显示

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

@@ -1,5 +1,6 @@
 function showGiveStatus (t) {
     if (t) {
+        $(".banner-ad-box").css('display', 'flex')
         $("#giveTimeBox").addClass('hasDoubleEleven')
         $('.discount-button').show().on('click', function () {
             var details = $('.discount-details')
@@ -17,6 +18,7 @@ function showGiveStatus (t) {
     } else {
         $("#giveTimeBox").removeClass('hasDoubleEleven')
         $(".origin-price").hide()
+        $(".banner-ad-box").hide()
     }
 }
 // 拦截获取价格接口读取11.11活动信息
@@ -758,6 +760,7 @@ $(function () {
             $(".renew").show();
         } else {
             $('.try-seven').show();
+            $(".banner-ad-box").hide()
             $(".trail").show();
         }
     }
@@ -918,6 +921,7 @@ $(function () {
         pushHistory();
         //weui.toast(module);
         $('.vip-footer .button-l.reset').off("click").on("click", function () {
+            $('.weui-mask').trigger('click')
             cancelTip(module);
         });
         window.addEventListener("popstate", function (e) {

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

@@ -47,6 +47,21 @@
         .item-label-other{
           width: 4rem;
         }
+    .banner-ad-box {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        background: rgba(251, 72, 61, 0.88);
+        border-radius: 8px;
+        margin: 0.24rem .24rem;
+        padding: 0.16rem 0.32rem;
+        color: #fff;
+        font-size: 0.26rem;
+    }
+    .banner-ad-box .iconfont.icon-arrow {
+        color: #fff;
+    }
     </style>
 </head>
 
@@ -73,6 +88,10 @@
     </div>
     <ul class="vip-body">
         <li class="sub-box">
+            <a href="/front/vipsubscribe/introducePage?type=renew" class="banner-ad-box" style="display: none">
+                <span>现在购买或续费，买多久送多久，错过再等一年！</span>
+                <i class="iconfont icon-arrow"></i>
+            </a>
           <ul class="sub-info">
             <li class="area">
               <a class="item-container" href="/front/vipsubscribe/toChangeArea">

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

@@ -146,6 +146,9 @@
                 <span class="vi-footer-r" data-need-bind-phone data-url="/front/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}">
                     <span class="text">开通 超级订阅</span>
                 </span>
+                <span class="vi-footer-r" style="display: none;" id="vip-introduce-renew"  onclick="window.location.replace('/front/vipsubscribe/vipsubscribe_renew{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}')">
+                    <span class="text">去续费</span>
+                </span>
             </div>
         </div>
     </div>
@@ -159,6 +162,10 @@
         })
     </script>
     <script>
+    if (location.href.lastIndexOf('type=renew') !== -1) {
+        $("#vip-introduce").hide()
+        $("#vip-introduce-renew").show()
+    }
         initShare({{.T.signature }});
         $.ajax({
             url: '/jyactive/doubleEleven/isActiving',