Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/waterElectricityMinApp

# Conflicts:
#	pages/reshui/reshui.vue

pages/reshui/reshui.vue

@@ -1009,7 +1009,15 @@
 						}
 					})
 
+<<<<<<< HEAD
 					// console.log(res)
+=======
+<<<<<<< HEAD
+					// console.log(res)
+=======
+					console.log(res)
+>>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
+>>>>>>> 3aae76fbef288891c62c32f6824323d94dcfeeb2
 					if (res.data.mess == "支付成功") {
 						uni.showToast({
 							icon: 'success',