Merge branch 'master' into feature/v4.7.12

src/active.json

@@ -16,7 +16,9 @@
 		"vipsubscribe":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/jy_mobile/common/order/create/svip?type=buy&title=%E8%B6%85%E7%BA%A7%E8%AE%A2%E9%98%85",
 		"dataPack":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=/jy_mobile/common/order/create/datapack&title=%E6%95%B0%E6%8D%AE%E6%B5%81%E9%87%8F%E5%8C%85",
 		"doubleEleven":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https://www.jianyu360.cn/weixin/leads/doubleEleven&title=%E7%95%99%E8%B5%84%E4%BA%92%E5%8A%A8%E6%8A%BD%E5%A5%96",
-		"mayActive":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/front/vipsubscribe/toSubVipSetPage?active=may&title=%E6%A0%87%E8%AE%AF%E8%AE%A2%E9%98%85&discored=81"
+		"mayActive":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/front/vipsubscribe/toSubVipSetPage?active=may&title=%E6%A0%87%E8%AE%AF%E8%AE%A2%E9%98%85&discored=81",
+		"introducePageB":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/big/wx/page/landingPage&title=%E5%A4%A7%E4%BC%9A%E5%91%98%E4%BB%8B%E7%BB%8D%E9%A1%B5",
+		"pageBBuy":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https://wx.jianyu360.cn/jy_mobile/common/order/create/bigmember&title=%E5%A4%A7%E4%BC%9A%E5%91%98"
 	},
 	"lottery":"https://host.huiju.cool/p/26256",
 	"mayActive":{

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

@@ -478,15 +478,13 @@
                     }
 
                 }
-
+                //周期
                 var effectiveBool = true; 
                 //续费升级逻辑修改后判断是否不延期
                 if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
                   effectiveBool=false;
                   $(".cyclecount").text("不延期");
-                }
-                //周期
-                if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
+                }else if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
                     var start_time_vip = r.data.order.vip_starttime;
                     var end_time_vip = r.data.order.vip_endtime;
                     var start_time_arr = start_time_vip.split(" ")[0].split("-")