热水页面bug修复

README.md

@@ -1,25 +0,0 @@
-# waterElectricityMinApp
-
-1.首页
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183205026.png?download=false)
-
-2.洗浴页提示
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183340973.png?download=false)
-
-3.洗浴页
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183419695.png?download=false)
-
-4.缴电费
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717204153.png?download=false)
-
-5.选房间
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717204222.png?download=false)
-
-6.台账管理
-
-![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717204246.png?download=false)

components/instructions.vue

@@ -2,28 +2,19 @@
 	<view class="content">
 		<view class="container">
 			<view class="item_warp">
-				<view class="title">
-					使用说明
-				</view>
+				<view class="title">使用说明</view>
 				<view class="item">
-					<view class="text">
-						1.点【扫码连接】，扫描水表中的二维码；
-					</view>
-					<view class="text">
-						2.待进度显示“数据通讯”后，点【开启设备】启动水表；
-					</view>
-					<view class="text">
-						3.在水表上手动滑动，可启动、暂停、停止用水；手机APP也可直接停止用水。
-					</view>
-					<view class="text">
-						4.示意图如下：
-					</view>
+					<view class="text">1.点【扫码连接】，扫描水表中的二维码；</view>
+					<view class="text">2.待进度显示“数据通讯”后，点【开启设备】启动水表；</view>
+					<view class="text">3.在水表上手动滑动，可启动、暂停、停止用水；手机APP也可直接停止用水。</view>
+					<view class="text">4.示意图如下：</view>
 					<view class="img">
-						<image class="img_scan" src="../static/images/qr-code.png" mode=""></image>
+						<image class="img_scan" src="https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/excelModel/qr-code.png" mode=""></image>
 					</view>
 					<view class="bot">
 						<label class="bot_text" @tap="child_noshow" hover-class="bot_text_hover_color">
-							<checkbox class="chk" /><text>以后不再出现</text>
+							<checkbox class="chk" />
+							<text>以后不再出现</text>
 						</label>
 						<text class="bot_text" @tap="child_cancel" hover-class="bot_text_hover_color">我知道了</text>
 					</view>
@@ -34,99 +25,99 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				chk: false
-			}
+export default {
+	data() {
+		return {
+			chk: false
+		}
+	},
+	methods: {
+		child_noshow(e) {
+			this.chk = !this.chk
+			this.$emit('parent_noshow', this.chk)
 		},
-		methods: {
-			child_noshow(e) {
-				this.chk = !this.chk
-				this.$emit('parent_noshow', this.chk)
-			},			
-			child_cancel() {
-				this.$emit('parent_cancel', false)
-			}
+		child_cancel() {
+			this.$emit('parent_cancel', false)
 		}
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	.content {
+.content {
+	width: 100%;
+	height: 100%;
+
+	.container {
 		width: 100%;
 		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, 0.4);
 
-		.container {
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			background: rgba(0, 0, 0, .4);
+		.item_warp {
+			width: 650rpx;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			padding: 40rpx 50rpx;
+			box-sizing: border-box;
+			background: #fff;
+			border-radius: 10rpx;
 
-			.item_warp {
-				width: 650rpx;
-				position: absolute;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				padding: 40rpx 50rpx;
-				box-sizing: border-box;
-				background: #fff;
-				border-radius: 10rpx;
+			.title {
+				font-size: 32rpx;
+				color: #000;
+				font-weight: bold;
+				text-align: center;
+				margin-bottom: 30rpx;
+			}
 
-				.title {
-					font-size: 32rpx;
-					color: #000;
-					font-weight: bold;
-					text-align: center;
-					margin-bottom: 30rpx;
-				}
+			.text {
+				font-size: 32rpx;
+				color: #333;
+				line-height: 40rpx;
+				margin-bottom: 20rpx;
+				text-indent: 2em;
+			}
 
-				.text {
-					font-size: 32rpx;
-					color: #333;
-					line-height: 40rpx;
-					margin-bottom: 20rpx;
-					text-indent: 2em;
+			.img {
+				text-align: center;
+				margin: 30rpx 0;
+
+				.img_scan {
+					width: 300rpx;
+					height: 200rpx;
 				}
+			}
+
+			.bot {
+				display: flex;
+				flex-direction: row;
+				justify-content: space-around;
+				align-items: center;
 
-				.img {
+				.bot_text {
+					width: 50%;
+					height: 70rpx;
+					line-height: 70rpx;
+					border-radius: 10rpx;
+					color: $my-color-primary;
+					font-size: 32rpx;
 					text-align: center;
-					margin: 30rpx 0;
 
-					.img_scan {
-						width: 300rpx;
-						height: 200rpx;
+					.chk {
+						transform: scale(0.7);
 					}
 				}
 
-				.bot {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-around;
-					align-items: center;
-					
-					.bot_text {
-						width: 50%;
-						height: 70rpx;
-						line-height: 70rpx;
-						border-radius: 10rpx;
-						color: $my-color-primary;
-						font-size: 32rpx;
-						text-align: center;
-						
-						.chk {
-							transform:scale(0.7);
-						}
-					}
-					
-					.bot_text_hover_color {
-						background-color: $my-color-btn-background;
-					}
+				.bot_text_hover_color {
+					background-color: $my-color-btn-background;
 				}
 			}
 		}
 	}
+}
 </style>

manifest.json

@@ -42,9 +42,7 @@
 					"<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.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
 				]
 			},
 			/* ios打包配置 */

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="banner">
-			<image src="../../static/images/banner2x.png" mode=""></image>
+			<image src="https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/excelModel/banner2x.png" mode=""></image>
 		</view>
 		<view class="nav">
 			<view class="menu">

pages/reshui/reshui.vue

@@ -50,7 +50,7 @@
 				<uni-steps :options="list1" :active-color="colorPrimary" :active="active" />
 			</view>
 			<!-- <view class="ad">
-				<image src="../../static/images/ad_reshui.jpg" mode="aspectFill" class="ad_img" @tap="ad_redirect">
+				<image src="https://wanzai-1306339220.cos.ap-shanghai.myqcloud.com/excelModel/ad_reshui.jpg" mode="aspectFill" class="ad_img" @tap="ad_redirect">
 				</image>
 			</view> -->
 			<view class="title">消费记录</view>
@@ -433,24 +433,24 @@ export default {
 			try {
 				// 获取学号
 				this.stu_number = this.$store.state.userInfo.card_number
+				const u = uni.getStorageSync('userinfo_storage_key')
+				if (typeof u === undefined || u == '') {
+					uni.navigateTo({
+						url: '../../pages/index/index?from=' + options.from
+					})
 
-				if (this.stu_number == '' || typeof this.stu_number == 'undefined') {
-					const userinfo = uni.getStorageSync('userinfo_storage_key')
-					if (userinfo) {
-						this.stu_number = userinfo.card_number
-					} else {
-						uni.navigateTo({
-							url: '../../pages/index/index?from=' + options.from
-						})
+					uni.showToast({
+						icon: 'none',
+						title: '学号为空，请进行授权',
+						duration: 3000
+					})
 
-						uni.showToast({
-							icon: 'none',
-							title: '学号为空，请进行授权',
-							duration: 3000
-						})
+					return
+				}
 
-						return
-					}
+				if (this.stu_number == '' || typeof this.stu_number == 'undefined') {
+					const userinfo = uni.getStorageSync('userinfo_storage_key')
+					this.stu_number = userinfo.card_number
 				}
 			} catch (e) {
 				console.log('获取基本信息：' + e.message)