Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages/MyInvoice/invoiceManagement.vue

pages/MyInvoice/invoiceDetail.vue

@@ -12,7 +12,7 @@
 		
 		<u-cell-group>
 				<u-cell-item  title="开票状态" :arrow="false">
-					<text class="text">开票成功</text>
+					<text class="success">开票成功</text>
 				</u-cell-item>
 				<u-cell-item  title="发票代码" :arrow="false" value="000011110000"></u-cell-item>
 				<u-cell-item  title="发票号码" :arrow="false" value="00000000"></u-cell-item>
@@ -22,7 +22,7 @@
 				<u-cell-item  title="开票时间" :arrow="false" value="2022-06-08"></u-cell-item>
 			</u-cell-group>
 			<u-cell-item style="background-color: #fff;"  title="发票预览":arrow="false">
-				<text class="text">查看</text>
+				<text class="success">查看</text>
 			</u-cell-item>
 	</view>
 </template>
@@ -55,7 +55,14 @@
 	/deep/.u-cell__value,/deep/.u-cell_title{
 		font-size: 18px 
 	}
-	.text{
+	/deep/.u-cell_title{
+		color: #666666;
+	}
+	/deep/.u-cell__value{
+		color: #101010;
+	}
+	
+	.success{
 		color: #00b962;
 	}
 </style>

pages/MyInvoice/invoiceManagement.vue

@@ -22,24 +22,42 @@
 			</view>
 			<view class="content"  @click="submit(item.id)">
 				<view class="title">
-					用户充电订单发票 <text class="price">50.00元</text>
+					荆鹏软件园充电站 <text class="price">50.00元</text>
 				</view>
-				<p><text class="text-1">车牌号码</text> <text class="text-2">鄂D9GX23</text></p>
-				<p><text class="text-1">充电电流</text> <text class="text-2">50.00</text></p>
-			<p><text class="text-1">支付号码</text> <text class="text-2">2022-06-07 16:00:00</text></p>
-				<p class=order-box>
+				<p><text class="text-1">充电电量</text> <text class="text-2">50.00度</text></p>
+				<p><text class="text-1">充电笔数</text> <text class="text-2">10笔</text></p>
+				<!-- <p><text class="text-1">车牌号码</text> <text class="text-2">鄂D9GX23</text></p> -->
+				<!-- <p><text class="text-1">充电电流</text> <text class="text-2">50.00</text></p> -->
+			<!-- <p><text class="text-1">支付号码</text> <text class="text-2">2022-06-07 16:00:00</text></p> -->
+				<!-- <p class=order-box>
 					<view class="order">
 						订单号
 					</view>
 					<view class="order-num">
 						2022060715035348150312
 					</view>
-				</p>
+				</p> -->
 			</view>
+			
         	
         </view>
        <p class="tips" v-if="list[current].list.length == list[current].recordsTotal && list[current].recordsTotal != 0" > 已经到底了</p>
        
+		<view class="not-invoiced-item flex">
+			<view class="radio">
+				<radio></radio>
+			</view>
+			<view class="content">
+				<view class="title">
+					玉桥公园充电站 <text class="price">15.00元</text>
+				</view>
+				<p><text class="text-1">充电电量</text> <text class="text-2">50.00度</text></p>
+				<p><text class="text-1">充电笔数</text> <text class="text-2">10笔</text></p>
+				
+			</view>
+			
+		</view>
+      	
 		<view class="bottom">
 			<view class="radio">
 				<u-checkbox v-model="allck" @change="allckBtn"></u-checkbox>
@@ -59,7 +77,7 @@
 	  	<view class="invoiced-item">
 	  		<view class="content">
 	  			<view class="title">
-	  				用户充电订单发票 <text class="invoice">开票中</text>
+	  				荆鹏软件园充电站 <text class="invoice">开票中</text>
 	  			</view>
 	  			<p><text class="text-1">发票金额</text> <text class="text-2">50.00元</text></p>
 	  			<p><text class="text-1">发票抬头</text><text class="text-2">刘德华</text></p>
@@ -69,7 +87,7 @@
 		<view class="invoiced-item">
 			<view class="content">
 				<view class="title">
-					用户充电订单发票 <text class="have-invoiced">开票成功</text>
+					玉桥公园充电站 <text class="have-invoiced">开票成功</text>
 				</view>
 				<p><text>发票抬头</text> <text class="text-2">50.00元</text></p>
 				<p><text class="text-1">发票抬头</text> <text class="text-2">刘德华</text></p>
@@ -253,6 +271,10 @@
 		 display: flex;
 		 
 	}
+	/deep/.u-tab-bar{
+		width: 24% !important;
+		left: -8% !important;
+		background-color: #00B962 !important; }
 	
 	// 未开票
 	.flex{
@@ -296,29 +318,31 @@
 		.text-1{
 			display: inline-block;
 			width: 17vw;
-			
+			color: #666666;
 		}
 		.text-2{
 			display: inline-block;
 			margin-left:4px;
-			width:54.6vw;
+			width:55vw;
+			color: #101010;
 			
 		}
-		.order-box{
+		// .order-box{
 			
-			display: flex;
-			.order{
-				width: 17vw;
-			}
-			.order-num{
-				flex: 1;
-				margin-left:4px;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
+		// 	display: flex;
+		// 	.order{
+		// 		width: 17vw;
+		// 	}
+		// 	.order-num{
 				
-			}
-		}
+		// 		width:55vw;
+		// 		margin-left:4px;
+		// 		overflow: hidden;
+		// 		white-space: nowrap;
+		// 		text-overflow: ellipsis;
+				
+		// 	}
+		// }
 		
 	}
 	.radio{