Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/webapp/WEB-INF/views/normal/index.html

src/main/webapp/WEB-INF/views/normal/index.html

@@ -342,24 +342,24 @@
 	</div>
 	<!-- footer End -->
 	<!--新手引导-->
-	<div ng-init="currentStep = 1" class="guide" style="display: none">
-		<ul  ui-tour="currentStep">
+	<div ng-init="currentStep = 1" class="guide">
+		<ul  ui-tour="currentStep" class="container">
 			<li target="h1:eq(0)" class="popover right in" overlay>
 				<img src="static/img/guide/more1.png" alt=""/>
 				<!--点击下一步-->
-				<span class="guide01" ng-click="currentStep = currentStep + 1">下一步 <i class="fa fa-angle-double-right"></i></span>
+				<span class="guide01" ng-click="currentStep = currentStep + 1"></span>
 				<div class="close" ng-click="currentStep = false">&times;</div>
 			</li>
 			<li target="h1:eq(1)" class="popover right in">
 				<img src="static/img/guide/more2.png" alt=""/>
 				<!--点击下一步-->
-				<span class="guide02" ng-click="currentStep = currentStep + 1">下一步 <i class="fa fa-angle-double-right"></i></span>
+				<span class="guide02" ng-click="currentStep = currentStep + 1"></span>
 				<div class="close close02" ng-click="currentStep = false">&times;</div>
 			</li>
 			<li target="h1:eq(2)" class="popover right in">
 				<img src="static/img/guide/more3.png" alt=""/>
 				<!--点击下一步-->
-				<span class="guide03" ng-click="currentStep = false">完成</span>
+				<span class="guide03" ng-click="currentStep = false"></span>
 				<div class="close close03" ng-click="currentStep = false">&times;</div>
 			</li>
 		</ul>

src/main/webapp/resources/css/index.css

@@ -4467,6 +4467,7 @@ a.order-detail {
 	margin-left: 0 !important;
 }
 .popover {
+	max-width: 100%;
 	padding: 0 !important;
 	border: none !important;
 }
@@ -4478,48 +4479,57 @@ a.order-detail {
 	bottom: 0;
 	z-index: 100000;
 }
+.guide ul li {
+	width: 100%;
+	height: 100%;
+}
+.guide ul li img{
+	width: 100%;
+	height: 100%;
+	margin: 0 auto;
+}
 .guide ul li span {
 	display: inline-block;
 	position: absolute;
-	width: 108px;
-	height: 40px;
-	line-height: 40px;
+	width: 5.6%;
+	height: 3.9%;
+	line-height: 38px;
 	text-align: center;
 	font-size: 16px;
 	color: #fff;
 	border-radius: 4px;
-	background: #d32526;
-	cursor: pointer ;
+	background: transparent ;
+	cursor: pointer;
 }
 .guide ul li span.guide01 {
-	top: 489px;
-	left: 1069px;
+	top: 45%;
+	left: 55.7%;
 }
 .guide ul li span.guide02 {
-	top: 650px;
-	left: 1066px;
+	top: 60.1%;
+	left: 55.5%;
 }
 .guide ul li span.guide03 {
-	top: 776px;
-	left: 1084px;
+	top: 71.6%;
+	left: 56.5%;
 }
 .guide ul li div.close{
 	position: absolute;
-	top: 106px;
-	left: 1168px;
-	width: 50px;
-	height: 50px;
-	line-height: 45px;
+	top: 10.7%;
+	left: 60.9%;
+	width: 40px;
+	height: 40px;
+	line-height: 35px;
 	text-align: center;
-	font-size: 50px;
+	font-size: 40px;
 	background: rgba(0,0,0,.6);
 	border-radius: 50%;
 }
 .guide ul li div.close02{
-	top: 269px;
-	left: 1165px;
+	top: 24.8%;
+	left: 60.8%;
 }
 .guide ul li div.close03{
-	top: 297px;
-	left: 1520px;
+	top: 36.7%;
+	left: 61.8%;
 }

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -204,14 +204,26 @@
     .tender-list-content .slider{
         padding-left: 35px;
         height: 65px;
+        width: 1170px;
         line-height: 65px;
-        overflow-y: hidden;
+        overflow: hidden;
         border-bottom: 1px solid #cfcfcf;
     }
+    .tender-list-content .slider .all{
+        width: 1000%;
+        height: 65px;
+    }
+    .tender-list-content .slider .all div{
+        float: left;
+        height: 65px;
+        overflow: hidden;
+        zoom: 1;
+    }
     .tender-list-content .slider span{
         margin-right: 155px;
         font-size: 14px;
         color: #333;
+        cursor: pointer;
     }
     .tender-list-content .slider span img.circle{
         margin: -3px 5px 0 0;
@@ -323,8 +335,16 @@
                                <!--</span>-->
                            <!--</marquee>-->
                                <!-- 指令 -->
-                            <div class="slideUl">
-                                <slide-follow id="slide" dataset-data = "datasetData"></slide-follow>
+                            <!--<div class="slideUl">-->
+                                <!--<slide-follow id="slide" dataset-data = "datasetData"></slide-follow>-->
+                            <!--</div>-->
+                            <div class="all">
+                                <div id="slider01" class="slider01">
+                                    <span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>
+                                    <span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>
+                                    <span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>
+                                </div>
+                                <div id="slider02" class="slider02"></div>
                             </div>
                         </div>
                         <div class="filter row">
@@ -402,6 +422,29 @@
         });
         $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
             $(".bomb-box").hide();
-        })
+        });
+        //    文字滚动
+        var slider = document.getElementById("slider");
+        var slider01 = document.getElementById("slider01");
+        var slider02 = document.getElementById("slider02");
+        slider02.innerHTML = slider01.innerHTML;
+        function Marquee() {
+            if(slider.scrollLeft - slider02.offsetWidth >= 0) {
+                slider.scrollLeft -= slider01.offsetWidth;
+                console.log(slider.scrollLeft);
+            } else {
+                slider.scrollLeft++;
+                console.log( slider.scrollLeft++);
+            }
+        }
+        var myvar = setInterval(Marquee, 30);
+        slider.onmouseout = function() {
+            myvar = setInterval(Marquee, 30);
+        }
+        slider.onmouseover = function() {
+            clearInterval(myvar);
+        }
+
     })
+
 </script>