改字

config/.env.dev.js

@@ -3,7 +3,7 @@ const UNI_APP = {
 	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/',
 
 	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
-	BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
+	//BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/',
 	
@@ -13,12 +13,12 @@ const UNI_APP = {
 	openId:"123",//zq
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//test
 	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0",//测试人员 开发环境
-	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //王晓春
+	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //王晓春
 	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//ys
-	openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq
+	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//凡佳佳
 	//appid
 	VUE_APP_WXAPPID:"wx0b3c41a903053808",

pages/mine/electronicMonitoring/water.vue

@@ -191,6 +191,12 @@
 					<view>水量合计：{{sumQuantity}} m³</view>
 					<view>水费合计：{{(sumQuantity*meterDetail.price).toFixed(2)}}元</view>
 				</view>
+				<view  v-if="meterDetail.lastRecordTime"
+				 style="color: #777777;background: white;    display: flex;justify-content: space-between;padding: 0 12px;" >
+				 
+				最近一次上传数据时间:{{meterDetail.lastRecordTime}}
+				</view>
+				
 				
 			</view>
 		</view>
@@ -213,12 +219,22 @@
 			</view>
 		
 			<view class="infos">
-				<view class="item" style="width: 30%;">
+				<view class="item" style="width: 40%;" v-if="dtuInfo&&dtuInfo.id&&!meterDetail.customer">
+					<view class="item-title">
+						通讯模块
+					</view>
+					<view class="item-value">
+						{{dtuInfo.name}}
+						
+					</view>
+				</view>
+				<view class="item" style="width: 20%;" v-else >
 					<view class="item-title">
-						设备类型
+						使用单位
 					</view>
 					<view class="item-value">
-						{{meterDetail.deviceTypeN}}
+						{{meterDetail.customer}}
+						
 					</view>
 				</view>
 				<view class="border">
@@ -235,9 +251,17 @@
 				<view class="border">
 		
 				</view>
-				<view class="item" style="width: 30%;">
+				<view class="item" style="width: 30%;" v-if="!meterDetail.installationAddressSimple">
 					<view class="item-title">
-						设备地址
+						水价
+					</view>
+					<view class="item-value">
+						{{meterDetail.price}}元/吨
+					</view>
+				</view>
+				<view class="item" style="width: 30%;" v-else>
+					<view class="item-title">
+						地址简称
 					</view>
 					<view class="item-value">
 						{{meterDetail.installationAddressSimple}}
@@ -1518,6 +1542,7 @@
 				color: rgba(16, 16, 16, 1);
 				font-size: 32rpx;
 				margin-top: 16rpx;
+				overflow: hidden;
 			}
 	
 		}