Merge remote-tracking branch 'origin/dev4.0' into dev4.0

src/web/templates/pc/biddetail_rec.html

@@ -632,70 +632,70 @@ function isWechat() {
 		{{if .T.obj.urltop}}<a class="trs" style="color:white">　</a>{{end}}
 	</div>
 	<div  onclick="adv_statistics(this)" adv_name="PC快照页-右部"  class="adv-pccontent-right" id="B1" style="cursor:default;">
-        <script>
+    <script>
 			{{$s:=(Ad "jy-pccontent-right" -1)}}
-            var ADList={{$s}};
-            var ExcludeList = ""
-            if (ADList.length>0){
-              for (var i=0;i<ADList.length;i++ ){
-                if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
-                  break;
-                }
-                var random=Math.floor(Math.random()*ADList.length);
-                if (ExcludeList.indexOf(random)>-1){
-                  continue;
-                }
-                var AD=ADList[random];
-                if (AD.o_extend != undefined) {
-                  var nowTime = new Date().getTime();
-                  if (AD.o_extend.startTime!=undefined){
-                    var stArr = AD.o_extend.startTime.split("-");
-                    if (stArr.length==6){
-                      var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
-                      var stTime = new Date(stStr).getTime();
-                      //未开始
-                      if (stTime>nowTime){
-                        if (ExcludeList!=""){
-                          ExcludeList +="-"
-                        }
-                        ExcludeList = ExcludeList+ random 
-                        continue
-                      }
-                    }
-                  }
-                  if (AD.o_extend.endTime!=undefined){
-                    var etArr = AD.o_extend.endTime.split("-");
-                    if (etArr.length==6){
-                      var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
-                      var etTime = new Date(etStr).getTime();
-                      //已结束
-                      if (etTime<nowTime){
-                        if (ExcludeList!=""){
-                          ExcludeList +="-"
-                        }
-                        ExcludeList = ExcludeList+ random 
-                        continue
-                      }
-                    }
+      var ADList={{$s}};
+      var ExcludeList = ""
+      if (ADList.length>0){
+        for (var i=0;i<ADList.length;i++ ){
+          if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+            break;
+          }
+          var random=Math.floor(Math.random()*ADList.length);
+          if (ExcludeList.indexOf(random)>-1){
+            continue;
+          }
+          var AD=ADList[random];
+          if (AD.o_extend != undefined) {
+            var nowTime = new Date().getTime();
+            if (AD.o_extend.startTime!=undefined){
+              var stArr = AD.o_extend.startTime.split("-");
+              if (stArr.length==6){
+                var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                var stTime = new Date(stStr).getTime();
+                //未开始
+                if (stTime>nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
                   }
+                  ExcludeList = ExcludeList+ random 
+                  continue
                 }
-                var ADHtml = "";
-                if(AD.s_pic){
-                    if(AD.s_link){
-                        ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
-                    }
-                    ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
-                    if(AD.s_link){
-                        ADHtml += "</a>";
-                    }
-                }else {
-                    ADHtml += AD.s_script;
+              }
+            }
+            if (AD.o_extend.endTime!=undefined){
+              var etArr = AD.o_extend.endTime.split("-");
+              if (etArr.length==6){
+                var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                var etTime = new Date(etStr).getTime();
+                //已结束
+                if (etTime<nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
+                  }
+                  ExcludeList = ExcludeList+ random 
+                  continue
                 }
-                $("#B1").html(ADHtml);
-                break;
               }
             }
-        </script>
+          }
+          var ADHtml = "";
+          if(AD.s_pic){
+              if(AD.s_link){
+                  ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+              }
+              ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
+              if(AD.s_link){
+                  ADHtml += "</a>";
+              }
+          }else {
+              ADHtml += AD.s_script;
+          }
+          $("#B1").html(ADHtml);
+          break;
+        }
+      }
+    </script>
 	</div>
 	<!--去掉一键报告排版问题-->
 	<!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">