Merge branch 'v_c_application_feature_1031' into 'develop'

V c application feature 1031

See merge request !25

src/pages/ApplyConsumption/businessRecord/components/device/device.vue

@@ -9,8 +9,8 @@
 						:src="ImgUrl+'xzf/h5/xia.png'" mode="aspectFit"></image>
 				</view>
 				<view class="rowr">
-					当前设备 <text class="text">{{storeInfo['onlineDeviceCnt']||0}}</text> 台，离线<text class="text"
-						style="color: #F65200 !important">{{storeInfo['offlineDeviceCnt']||0}}</text>台
+					当前设备 <text class="text" style="font-weight: bold;">{{storeInfo['onlineDeviceCnt']||0}}</text> 台，离线<text class="text"
+						style="color: #F65200 !important;font-weight: bold;">{{storeInfo['offlineDeviceCnt']||0}}</text>台
 				</view>
 			</view>
 			<view class="warning" v-if="storeInfo['offlineDeviceCnt']>0">
@@ -413,7 +413,7 @@
 
 				.line {
 					width: 542rpx;
-					height: 1rpx;
+					height: 0.5px;
 					background-color: #E2E2E2;
 					position: absolute;
 					bottom: -30rpx;

src/pages/ApplyConsumption/businessRecord/components/store/store.vue

@@ -15,8 +15,9 @@
 						:src="ImgUrl+'xzf/h5/xia.png'" mode="aspectFit"></image>
 				</view>
 				<view class="rowr">
-					当前设备 <text class="text">{{storeInfo['onlineDeviceCnt']||0}}</text> 台，离线<text class="text"
-						style="color: #F65200 !important">{{storeInfo['offlineDeviceCnt']||0}}</text>台
+					当前设备 <text class="text" style="font-weight: bold;">{{storeInfo['onlineDeviceCnt']||0}}</text>
+					台，离线<text class="text"
+						style="color: #F65200 !important;font-weight: bold;">{{storeInfo['offlineDeviceCnt']||0}}</text>台
 				</view>
 			</view>
 			<view class="warning" v-if="storeInfo['offlineDeviceCnt']>0">
@@ -239,8 +240,9 @@
 
 			.dataList {
 				width: 100%;
+
 				/* background: #FFFFFF; */
-				.dataitem:nth-child(1){
+				.dataitem:nth-child(1) {
 					border-top: 1rpx solid #E2E2E2;
 				}
 
@@ -274,7 +276,7 @@
 						line-height: 44rpx;
 
 						position: absolute;
-						right: 52rpx;
+						right: 22rpx;
 					}
 
 					.row1 {
@@ -440,7 +442,7 @@
 
 				.line {
 					width: 542rpx;
-					height: 0.5rpx;
+					height: 0.5px;
 					background-color: #E2E2E2;
 					position: absolute;
 					bottom: -30rpx;

src/pages/ApplyConsumption/businessRecord/transactionDetails/transactionDetails.vue

@@ -17,9 +17,15 @@
 				</view>
 			</view>
 			<view class="devices_sn">
-				SN：{{details['deviceId']||''}}
+				SN：{{details['snCode']||''}}
 			</view>
-			<view class="rowbox">
+			<view class="warning" v-if="onlineStatus=='offline'">
+				<image class="warnpng" style="width: 25rpx;height: 25rpx;margin-left:  25rpx;"
+					:src="ImgUrl+'xzf/h5/warnpng.png'">
+				</image>
+				<text style="display: inline-block;margin-left: 8rpx;">当前设备离线，无法统计准确数据，请尽快处理</text>
+			</view>
+			<view class="rowbox" :style="onlineStatus=='online'?'border-top: 1rpx solid #E2E2E2;':''">
 				<view class="rowl">
 					<view class="rowltxt">交易笔数(笔)</view>
 					<view class="rowltxt2">{{totalCnt||0}}</view>
@@ -145,7 +151,7 @@
 					return
 				}
 				let jsonData = JSON.parse(JSON.stringify(data || {}))
-				this.onlineStatus = jsonData.data.onlineStatus || "offline"
+				this.onlineStatus = jsonData.data['backData']['onlineStatus'] || "offline"
 			},
 			//设备流水
 			async DeviceFlows() {
@@ -254,6 +260,7 @@
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #F65200;
+			margin-top: 10rpx;
 		}
 
 		.store_data_detail {
@@ -270,6 +277,7 @@
 				/* background: #FFFFFF; */
 
 				.dataitem {
+					margin-left: 32rpx;
 					height: 154rpx;
 					display: flex;
 					align-items: center;
@@ -298,14 +306,14 @@
 						line-height: 44rpx;
 
 						position: absolute;
-						right: 52rpx;
+						right: 25rpx;
 					}
 
 					.row1 {
 						display: flex;
 						align-items: center;
 						width: 100%;
-						margin-left: 32rpx;
+						// margin-left: 32rpx;
 						position: relative;
 					}
 
@@ -318,7 +326,7 @@
 						font-weight: 400;
 						color: rgba(0, 0, 0, 0.35);
 						line-height: 44rpx;
-						padding-left: 32rpx;
+						// padding-left: 32rpx;
 					}
 				}
 			}
@@ -466,7 +474,7 @@
 
 				.line {
 					width: 542rpx;
-					height: 1rpx;
+					height: 0.5px;
 					background-color: #E2E2E2;
 					position: absolute;
 					bottom: -30rpx;
@@ -491,6 +499,7 @@
 				padding-left: 18rpx;
 				padding-right: 25rpx;
 				justify-content: space-between;
+				margin-top: 10rpx;
 
 				.rowltxt {
 					height: 28rpx;