Browse Source

Merge branch '2017zt' of http://svn.ouj.com:3000/FED/dwweb-pc into 2017zt

PC-20180523CIYM\Administrator 6 years ago
parent
commit
683dd79b18

+ 6 - 4
2017专区/PC单机/src/modules/page/zt.js

@@ -150,10 +150,12 @@ var V = {
             $(".zt-intro-wrap").append('<div class="btn-focus">+ 关注</div>')
         }
 
-        if(dwUDBProxy.isLogin()) {
-            M.getFocus(ztId);
-        } else{
-            $(".btn-focus").addClass("active")
+        if(window.dwUDBProxy) {
+             if(dwUDBProxy.isLogin()) {
+                M.getFocus(ztId);
+            } else{
+                $(".btn-focus").addClass("active")
+            }
         }
    },
    initWapPage : function(){

+ 1 - 1
2017专区/PC单机/src/modules/sealoader/sealoader.js

@@ -70,7 +70,7 @@ if (window.seajs) {
 		if (queue) {
 			if (queue === true) {
 				queue = [callback];
-				loadScript('http://assets.dwstatic.com/amkit/entry.js', function() {
+				loadScript('//assets.dwstatic.com/amkit/entry.js', function() {
 					var c;
 					for (var i = 0, len = queue.length; i < len; i++) {
 						c = queue[i];

+ 13 - 2
2017专区/PC单机/src/zt1.html

@@ -31,7 +31,7 @@
     </style>
 </head>
 <body class="zq-pc" data-title="专题模板1">
-    <script src="//pub.dwstatic.com/common/dwNavbar/navbar.js"></script> 
+    <!-- <script src="//pub.dwstatic.com/common/dwNavbar/navbar.js"></script>  -->
 
     <link rel="import" href="modules/common/mheader.html?__inline">        
 
@@ -1969,9 +1969,20 @@
         </div>
     </div>
     <script src="//pub.dwstatic.com/common/js/dwudbproxy.js "></script>
-    <script src="http://pub.dwstatic.com/common/js/articleComment.js"></script>
     <script charset="utf-8" src="//pub.dwstatic.com/common/dwFoot/duowanFooter.js"></script>
     <script src="lib/mod.js"></script>
     <script>require('modules/page/zt.js');</script>
+    <script>
+//小程序不执行
+var isWxminiprogram = /(\?|\&)platform=wxminiprogram(&*|$)/.test(location.href)
+if(!isWxminiprogram) {
+	if((!/Android|webOS|iPhone|Windows Phone|iPod|BlackBerry|SymbianOS/i.test(window.navigator.userAgent) && !/[\?&]pc(?:[=&].*|$)/.test(window.location.href)) || /from=pc/i.test(location.search)){
+    document.write('<script src="//comment3.duowan.com/scripts/comments.js"><\/script>')
+    } else {
+      document.write('<script src="//pub.dwstatic.com/common/js/articleComment.js"><\/script>')
+    }
+} 
+</script>
+    <script src="//pub.dwstatic.com/p/2017dwh5/1.1.0/lib/miniprogram_9a7dd4d.js"></script>
 </body>
 </html>