Merge branch 'master' of ssh://git.xingtongworld.com:10022/xioayue/guaguale_uniapp

# Conflicts:
#	pages/home/home.vue

pages/home/home.vue

@@ -183,11 +183,11 @@
 			}, 500)
 			
 		},
-		onHide() {
+		onHide() {
 			if(this.userType=='user' && this.isPlay){
 				this.isPlay = false;
 				this.innerAudioContext.pause();
-			}
+			}
 		},
 		created() {
 			this.userType = uni.getStorageSync('userType');