合并

css/global.css

@@ -4015,7 +4015,7 @@ td div.dlLev3{
 
 
 .itineraryCon{
-  margin:20px 10px;
+  margin:20px 10px 20px 10px;
 }
 .itineraryTitle{
   margin-top: 30px;
@@ -4026,6 +4026,9 @@ td div.dlLev3{
 .addressName{
   font-size: 16px;
 }
+.itineraryCon ul{
+  margin-top: 30px;
+}
 .itineraryCon ul li .pointLine{
   margin:10px 0;
   padding-left: 15px;
@@ -4051,6 +4054,12 @@ td div.dlLev3{
   margin-left: 5px;
 }
 .route p{
-  width: 570px;
+  width: 560px;
   margin-bottom: 5px;
+}
+.totalB{
+  background: #faf2cc;
+  font-weight: bold;
+  font-size: 16px;
+  color: #333;
 }

saea-myList-detail.html

@@ -461,6 +461,7 @@
 									<tr><td colspan="2"><div class="itinerary">
 			  						<div class="itineraryCon">
 			  							<ul>
+			  								<li>行程1#</li>
 			  								<li>
 			  									<div class="itineraryList">
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
@@ -551,6 +552,50 @@
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
 						  						</div>
 			  								</li>
+			  								<li>
+			  									<div class="pointLine">
+					  								<div class="routeList clearfix">
+					  									<span class="routeTitle fL totalB">合计</span>
+					  									<span class="route fL">
+					  										<p class="routeW">
+					  											<b class="colGreen fR">￥2160.00</b>
+					  											<!-- <b>往来交通费</b> -->
+					  										</p>
+					  									</span>
+					  								</div>
+					  							</div>
+			  								</li>
+			  							</ul>
+			  							<ul>
+			  								<li>行程2#</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
+						  								<div class="priceList">
+						  									<span class="priceTitle">金额</span>
+						  									<span class="price colGreen">￥70</span>
+						  								</div>
+						  								<div class="timeList">
+						  									<span class="timeTitle">时间</span>
+						  									<span class="time">2020-05-12 ~ 2020-05-13</span>
+						  								</div>
+						  							</div>
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="pointLine">
+					  								<div class="routeList clearfix">
+					  									<span class="routeTitle fL totalB">合计</span>
+					  									<span class="route fL">
+					  										<p class="routeW">
+					  											<b class="colGreen fR">￥70.00</b>
+					  											<!-- <b>往来交通费</b> -->
+					  										</p>
+					  									</span>
+					  								</div>
+					  							</div>
+			  								</li>
 			  							</ul>
 			  						</div></td></tr>
 									<tr><th class="taR">合计</th><td class="colGreen taR">￥2160.00</td></tr>

saea-receipt-add2.html

@@ -52,7 +52,7 @@
 			  				<div class="seTable">
 			  					<table class="table table-bordered table-condensed table-hover">
 			  					<tbody>
-			  						<tr><th colspan="2" class="taC">行程1#详细<a href="#" class="fR text-danger">删除</a></th></tr>
+			  						<tr><th colspan="2" class="taC">行程1#详细<a href="#del" class="fR text-danger" data-toggle="modal">删除</a></th></tr>
 			  						<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03 珠海-广州<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div></th></tr>
 			  						<tr><th>往来交通费<p class="colGray">#高铁</p></th><td  width="200" class="taR">￥75.00</td></tr>
 			  						<tr><th>市内交通费<p class="colGray">#出租车</p></th><td  width="200" class="taR">￥25.00</td></tr>
@@ -186,20 +186,10 @@
 			  								<li>
 			  									<div class="itineraryList">
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
-						  							<!-- <div class="pointLine">
-						  								<div class="priceList">
-						  									<span class="priceTitle">金额</span>
-						  									<span class="price colGreen">￥70</span>
-						  								</div>
-						  								<div class="timeList">
-						  									<span class="timeTitle">时间</span>
-						  									<span class="time">2020-05-15 ~ 2020-05-15</span>
-						  								</div>
-						  							</div> -->
 						  						</div>
 			  								</li>
 			  							</ul>
-			  							<ul style="margin-top:30px">
+			  							<ul>
 			  								<li>行程2#</li>
 			  								<li>
 			  									<div class="itineraryList">
@@ -275,5 +265,23 @@
         </div>
     </div>
 	<!--结束 弹出 添加行程 -->
+	<!--移除-->
+	<div class="modal hide fade" id="del">
+		<div class="modal-dialog">
+			<div class="modal-content">
+			<div class="modal-header">
+			<h3>确认移除</h3>
+			</div>
+			<div class="modal-body">
+				请确认是否移除改行程。
+			</div>
+			<div class="modal-footer">
+					<a href="#" class="button">确定移除</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+			</div>
+			</div>
+		</div>
+	</div>
+			<!--移除-->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

saea-reportList-report-3.html

@@ -217,7 +217,6 @@
 			  							<ul>
 			  								<li>
 			  									<div class="itineraryList">
-			  										<div class="fR"><a href="">编辑</a></div>
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
 						  							<div class="pointLine">
 						  								<div class="priceList">
@@ -248,7 +247,6 @@
 			  								</li>
 			  								<li>
 			  									<div class="itineraryList">
-			  										<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div>
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
 						  							<div class="pointLine">
 						  								<div class="priceList">
@@ -274,7 +272,6 @@
 			  								</li>
 			  								<li>
 			  									<div class="itineraryList">
-			  										<div class="fR"><a href="">编辑</a>&nbsp;<a href="" class="colRed">移除</a></div>
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>广州</b></div>
 						  							<div class="pointLine">
 						  								<div class="priceList">
@@ -306,33 +303,52 @@
 			  								<li>
 			  									<div class="itineraryList">
 						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>中山</b></div>
-						  							<!-- <div class="pointLine">
+						  						</div>
+			  								</li>
+			  								<li>
+			  									<div class="pointLine">
+					  								<div class="routeList clearfix">
+					  									<span class="routeTitle fL totalB">合计</span>
+					  									<span class="route fL">
+					  										<p class="routeW">
+					  											<b class="colGreen fR">￥2160.00</b>
+					  											<!-- <b>往来交通费</b> -->
+					  										</p>
+					  									</span>
+					  								</div>
+					  							</div>
+			  								</li>
+			  							</ul>
+			  							<ul>
+			  								<li>行程2#</li>
+			  								<li>
+			  									<div class="itineraryList">
+						  							<div class="addressName"><i class="contactsMark icon-">P</i> <b>珠海</b></div>
+						  							<div class="pointLine">
 						  								<div class="priceList">
 						  									<span class="priceTitle">金额</span>
 						  									<span class="price colGreen">￥70</span>
 						  								</div>
 						  								<div class="timeList">
 						  									<span class="timeTitle">时间</span>
-						  									<span class="time">2020-05-15 ~ 2020-05-15</span>
-						  								</div>
-						  								<div class="routeList clearfix">
-						  									<span class="routeTitle fL">详情</span>
-						  									<span class="route fL">
-						  										<p class="routeW">
-						  											<b class="fR">￥75.00</b>
-						  											<b>往来交通费</b>
-							  										<p class="colGray">#高铁</p>
-						  										</p>
-						  										<p class="routeW">
-						  											<b class="fR">￥25.00</b>
-						  											<b>市内交通费</b>
-							  										<p class="colGray">#出租车</p>
-						  										</p>
-						  									</span>
+						  									<span class="time">2020-05-12 ~ 2020-05-13</span>
 						  								</div>
-						  							</div> -->
+						  							</div>
 						  						</div>
 			  								</li>
+			  								<li>
+			  									<div class="pointLine">
+					  								<div class="routeList clearfix">
+					  									<span class="routeTitle fL totalB">合计</span>
+					  									<span class="route fL">
+					  										<p class="routeW">
+					  											<b class="colGreen fR">￥70.00</b>
+					  											<!-- <b>往来交通费</b> -->
+					  										</p>
+					  									</span>
+					  								</div>
+					  							</div>
+			  								</li>
 			  							</ul>
 			  						</div></td></tr>
 			  						<!-- <tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> 2020-01-03 珠海-广州</th></tr>