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

src/web/staticres/js/login.js

@@ -377,6 +377,7 @@ function checkMenuForEnt () {
 
 //查询用户信息，响应页面登录信息
 var logic = function(data,num){
+  // TODO login callback
 	if(data.result=="ok"){
 	  clearLoginStorage(/-login-clear/)
 		//$(".QRLogin").hide();

src/web/templates/pc/subscribe_new.html

@@ -85,7 +85,7 @@
           margin-right: 22px;
       }
       .footer-banner.active {
-          background: linear-gradient(91deg, #B10300 6%, #E24301 54%, #A60000 100%);
+          background: #D70606;
       }
 
       .footer-banner .icon-close-box {
@@ -455,12 +455,12 @@
                                 // 活动中
                                 $('.double12').attr('data-tip', res.tip || '免费送1年')
                                 $('.double12').addClass('active')
-                                // $('.footer-banner').addClass('active')
-                                // $('.footer-banner img').attr('src', '{{Msg "seo" "cdn"}}/vipsubscribe/image/double_12.png?v={{Msg "seo" "version"}}').css({
-                                //     width: '1200px',
-                                //     'margin-top': '-30px'
-                                // })
-                                // $('.footer-banner area').attr('coords', '1058.5, 46.5, 1194.5, 87')
+                                $('.footer-banner img').attr('src', '{{Msg "seo" "cdn"}}/vipsubscribe/image/active_vip_2-18.png?v={{Msg "seo" "version"}}').css({
+                                  width: '1200px',
+                                  'margin-top': '-30px'
+                                })
+                                $('.footer-banner area').attr('coords', '795,40,930,86')
+                                $('.footer-banner').addClass('active')
                                 activeReloadPage(res.nowtime * 1000, res.endtime * 1000)
                             } else {
                                 activeReloadPage(res.nowtime * 1000, res.starttime * 1000)