水电费合并

manifest.json

@@ -74,7 +74,8 @@
             "scope.userLocation" : {
                 "desc" : "您的位置信息将用于连接热水表蓝牙"
             }
-        }
+        },
+		"lazyCodeLoading": "requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -31,7 +31,7 @@
 		{
 			"path": "pages/jiaofei/jiaofei",
 			"style": {
-				"navigationBarTitleText": "电费充值",
+				"navigationBarTitleText": "水电充值",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -53,7 +53,7 @@
 		{
 			"path": "pages/select/select",
 			"style": {
-				"navigationBarTitleText": "缴电费",
+				"navigationBarTitleText": "缴水电费",
 				"enablePullDownRefresh": false
 			}
 

pages/jiaofei/jiaofei.vue

@@ -14,8 +14,8 @@
 			<view class="picker-item-logol">
 				<image class="picker-item-logo-left" src="/static/image/elec.png"></image>
 			</view>
-			<view class="picker-item-label">剩余电量</view>
-			<view class="picker-item-content font-txt">{{remainElec}} 度</view>
+			<view class="picker-item-label">剩余额度</view>
+			<view class="picker-item-content font-txt">¥ {{remainElec}}</view>
 		</view>
 		<view class="show-item add-money">
 			<view class="add-money-show">

pages/show/show.vue

@@ -211,10 +211,19 @@
 						})
 
 						// console.log(res.data.data);
+						// console.log(res.data);
 						if (res.data.code != 200) {
 							return
 						}
 
+						if (typeof res.data.data === 'undefined') {
+							uni.showToast({
+								title: '加载数据异常',
+								duration: 1500
+							})
+							return
+						}
+
 						let chrt_data = {
 							categories: [],
 							series: [{