Merge branch 'dev' of C:\Users\US50\GitProject\platform-b2b with conflicts.

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

@@ -342,24 +342,21 @@
 	</div>
 	<!-- footer End -->
 	<!--新手引导-->
-	<div id="mask"></div>
-	<div id="searchTip">
+	<!--<div id="mask"></div>-->
+	<!--<div id="searchTip" style="display: none">
 		<div class="stepA">
-			<!--<img src="static/img/guide/more1.png" alt="" class="bg">-->
-			<em class="img"></em>
-			<a class="btn">下一步&gt;&gt;</a><span title="关闭" class="close">&times;</span>
+			&lt;!&ndash;<img src="static/img/guide/more00003.png" alt="" class="bg"/>&ndash;&gt;
+			<a class="btn">下一步</a><span title="关闭" class="close"></span>
 		</div>
 		<div class="stepB">
-			<!--<img src="static/img/guide/more02.png" alt="" class="bg">-->
-			<em class="img"></em>
-			<a>下一步&gt;&gt;</a><span title="关闭" class="close">&times;</span>
+			<img src="static/img/guide/more02.jpg" alt="" class="bg"/>
+			<a>下一步</a><span title="关闭" class="close"></span>
 		</div>
 		<div class="stepC">
-			<!--<img src="static/img/guide/more03.png" alt="" class="bg">-->
-			<em class="img"></em>
-			<a>完成</a><span title="关闭" class="close">&times;</span>
+			<img src="static/img/guide/more03.jpg" alt="" class="bg"/>
+			<a>完成</a><span title="关闭" class="close"></span>
 		</div>
-	</div>
+	</div>-->
 	<!-- 消息提示框  Start-->
 	<toaster-container
 		toaster-options="{'position-class': 'toast-top-center'}"></toaster-container>

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

@@ -4501,6 +4501,7 @@ a.order-detail {
 	display: inline-block;
 	width: 100%;
 	height: 100%;
+	/*background: url('../img/guide/more00001.png');*/
 }
 .stepA em.img{
 	background: url(../img/guide/more1.png) no-repeat center 0;