Merge branch 'dev/v4.8.83_cyl' of qmx/jy into feature/v4.8.83

src/web/staticres/course/css/base.css

@@ -10,15 +10,12 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
     padding: 0;
 }
 html,body {
-    /* max-width: 750px; */
     -webkit-text-size-adjust: 100%;
     margin: 0 auto;
-    height: 100%;
     overflow-x: hidden;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
-    font-size: .24rem;
-    background:rgba(245,244,249,1);;
+    background:rgba(245,244,249,1);
     color: #3d3d3d;
     font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 }

src/web/staticres/css/pc.css

@@ -5441,7 +5441,8 @@ h6 {
 .friend-link-container.theme-light .friendlink-href,
 .friend-link-container.theme-light .friendlink-href:hover,
 .j-bottom.theme-light .jy_classify_l .jy_classify_column .jy_classify_column_content_item a,
-.j-bottom.theme-light .jy_renzheng div {
+.j-bottom.theme-light .jy_renzheng div,
+.j-bottom.theme-light .jy_classify_r .qr_box div p {
 	color: #686868;
 }
 .friend-link-container.theme-light .jy_friendlink_title,

src/web/staticres/css/pc/index.css

@@ -1093,6 +1093,10 @@ cursor: pointer;
   transition-timing-function: linear !important;
 }
 
+.jy-index-partners .swiper-container,
+.jy-index-partners .swiper-container .swiper-slide {
+  cursor: auto;
+}
 .jy-index-partners .swiper-slide {
   width: auto !important;
   padding: 4px 8px;

src/web/staticres/js/login.js

@@ -485,9 +485,14 @@ var logic = function(data,num){
 			afterLoginSetCookit(data.cName,data.cValue,data.expires)
 		}
   		// TODO login callback
-	    try {
-	      loginCallback()
-	    } catch (e) {}
+      try {
+        // header专用回调。
+        loginCallbackHeader(data)
+      } catch (e) {}
+      try {
+        // 页面专用回调
+        loginCallback(data)
+      } catch (e) {}
 	  	clearLoginStorage(/-login-clear/)
 		//$(".QRLogin").hide();
 		$("#bidLogin").modal("hide")