【说明】基本稳定

manifest.json

@@ -1,80 +1,87 @@
 {
-	"name": "智慧校园水电",
-	"appid": "__UNI__D7AE6E0",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"payment": {}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx2fc3f45732fae5d3",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"plugins": {
-			"myPlugin": {
-				"provider": "wx1549b963bbae9931",
-				"version": "4.0.0"
-			}
-		},
-		"permission": {}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	}
+    "name" : "智慧校园水电",
+    "appid" : "__UNI__D7AE6E0",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "payment" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx2fc3f45732fae5d3",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "plugins" : {
+            "myPlugin" : {
+                "provider" : "wx1549b963bbae9931",
+                "version" : "4.0.0"
+            }
+        },
+        "permission": {
+            "scope.userLocation": {
+              "desc": "您的位置信息将用于连接热水表蓝牙"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    }
 }

pages/jiaofei/jiaofei.vue

@@ -55,7 +55,7 @@
 			<input type="number" class="input-money" maxlength="4" placeholder="请输入金额(10-200)"
 				placeholder-class="input-ph-color" v-model:value="amount" @input="onInput" @blur="onBlur" />
 		</view>
-		<view class="submit-item">
+		<view class="submit-item" v-if="true">
 			<button class="submit" :data-rooms='room' @tap="input_money">充值</button>
 		</view>
 		<view class="change-show" @tap="navigateToShow">
@@ -382,6 +382,7 @@
 			},
 			//增加可变金额
 			input_money(e) {
+				// console.log(this.test);
 				// console.log(e)
 				this.confirm_room('input_money')
 			},

pages/reshui/reshui.vue

@@ -54,8 +54,9 @@
 				</view>
 				<view class="item-list" v-for="(item, i) in xiaofei_items" :key="i">
 					<text class="item-list-txt"><text class="iconfont icon-shijian"></text>{{item.begin_time}}</text>
-					<text class="item-list-txt"><text class="iconfont icon-shuidi"></text>{{item.use_size}}升</text>
-					<text class="item-list-txt">{{item.use_amount}}</text>
+					<text class="item-list-txt"><text
+							class="iconfont icon-shuidi"></text>{{numFilter(item.use_size)}}t</text>
+					<text class="item-list-txt">{{numFilter(item.use_amount)}}</text>
 				</view>
 			</view>
 		</view>
@@ -121,6 +122,39 @@
 		},
 		onLoad(options) {
 			// console.log(options);
+			uni.authorize({
+				scope: 'scope.userLocation',
+				success(res) {
+					uni.getLocation({
+						success: (loc) => {
+							// console.log(loc);
+							// uni.showToast({
+							// 	icon: 'none',
+							// 	title: '纬度：' + loc.latitude + '\n' + '经度：' + loc
+							// 		.longitude,
+							// 	duration: 2000
+							// })
+							uni.showToast({
+								icon: 'success',
+								title: '已获定位信息'
+							})
+						},
+						fail: (err) => {
+							uni.showToast({
+								icon: 'none',
+								title: '获取定位失败，请手动开启定位！'
+							})
+						}
+					})
+				},
+				fail: (err) => {
+					// console.log(err);
+					uni.showToast({
+						icon: 'none',
+						title: '请手动设置定位授权！'
+					})
+				}
+			})
 			if (typeof(options) != 'undefined' && typeof(options) != '' && JSON.stringify(options) == '{}') {
 				// 获取基本信息
 				this.get_base_info(options, 'onLoad')
@@ -149,6 +183,12 @@
 			}
 		},
 		methods: {
+			// 保留小数点数值后两位，尾数四舍五入
+			numFilter(value) {
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
 			/**
 			 * 获取基本信息
 			 */
@@ -231,9 +271,9 @@
 					}
 				})
 
-				// console.log('getOpenId', res);
+				// console.log(res);
 				if (res.data.mess == '返回成功') {
-					// 判断存储的stu_number与返回的stu_number是否一致
+					// stu_number是否存在
 					let cardNumber = res.data.info[0].card_number
 					if (typeof(cardNumber) != 'undefined' && cardNumber != '' && JSON.stringify(cardNumber) != '{}') {
 						// 学号 和 姓名
@@ -594,6 +634,34 @@
 						this.process_control(0);
 
 						this.onBluetoothDeviceFound() //监听搜索到新设备  同时进行
+
+						setTimeout(() => {
+							if (this.isScan) {
+								uni.showModal({
+									title: '温馨提示',
+									content: '请确认已开启【蓝牙授权】或【定位授权】！',
+									confirmText: '我已开启',
+									cancelText: '取消',
+									success: (res) => {
+										if (res.confirm) {
+											// console.log(res)
+										} else if (res.cancel) {
+											switch (uni.getSystemInfoSync().platform) {
+												case 'android':
+													// 打开设置
+													break;
+												case 'ios':
+													// 打开设置
+													break;
+												default:
+													// console.log('运行在开发者工具上')
+													break;
+											}
+										}
+									}
+								})
+							}
+						}, 5000)
 					},
 					fail: err => {
 						// console.log(err, '错误信息');
@@ -648,7 +716,6 @@
 						if (device.name == this.device_code) {
 							this.process_control(0);
 
-
 							//data里面建立一个deviceId、device_code，存储起来
 							// this.device_code = device.name;
 							this.deviceId = device.deviceId
@@ -656,7 +723,7 @@
 							if (this.devices.indexOf(res.devices[0].deviceId) == -1) {
 								this.devices.push(res.devices[0].deviceId)
 							}
-							
+
 							// 放此位置,苹果手机兼容
 							this.stopBluetoothDevicesDiscovery()