Merge branch 'dev4.6.3.11' of ssh://192.168.3.207:10022/qmx/jy into dev4.6.3.11

src/web/staticres/js/login.js

@@ -981,6 +981,10 @@ $(function(){
                     if (r && r.error_code > -1) {
                         if(r.data.state==1){
                             if (isBindPage) {
+                              var backToUrl = getParam('backTo')
+                              if (backToUrl) {
+                                return location.replace(decodeURIComponent(backToUrl))
+                              }
                               if (history.length === 1) {
                                 goBackOrigin()
                               } else {

src/web/staticres/public-pc/js/article-content.js

@@ -1150,7 +1150,7 @@ $(function(){
         $(".pdf-div").html(pdfshow);
         var pdfhtml = "";
         pdfhtml = '<div class="preb-encont"><div style="float:left;"><img src="'+goTemplateData.cdn+'/images/wx/pdf.png"/></div><div style="float:left;line-height: 22px;">'+arr["filename"]+'<br><a style="color:blue;" href="'+arr["url"]+'">下载</a></div><div style="clear:both;"></div></div>';
-        PDFObject.embed(arr["url"], "#preb-pdf"+j);
+        //PDFObject.embed(arr["url"], "#preb-pdf"+j);
       }
       //}
       $(".preb-enclosure").append(pdfhtml)