Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

App.vue

@@ -11,18 +11,18 @@ export default {
     	navigationBarHeight: 0, // 导航栏高度(标题栏高度)
 	},
 	onLaunch: function () {
-		wx.setInnerAudioOption({
- 		   mixWithOther: true,
- 		   obeyMuteSwitch: false,
- 		   success: function (e) {
- 		     console.log(e)
- 		     console.log('play success')
- 		   },
- 		   fail: function (e) {
- 		     console.log(e)
- 		     console.log('play fail')
- 		   }
- 		})
+		// wx.setInnerAudioOption({
+ 	// 	   mixWithOther: true,
+ 	// 	   obeyMuteSwitch: false,
+ 	// 	   success: function (e) {
+ 	// 	     console.log(e)
+ 	// 	     console.log('play success')
+ 	// 	   },
+ 	// 	   fail: function (e) {
+ 	// 	     console.log(e)
+ 	// 	     console.log('play fail')
+ 	// 	   }
+ 	// 	})
 		Store.commit('setAuthorization', uni.getStorageSync('Authorization'))
 		Store.commit('setUserInfo', uni.getStorageSync('userInfo'))
 		// uni.showLoading({

pages/home/home.vue

@@ -36,7 +36,7 @@ export default {
     },
     methods:{
         acceptIndex(e){
-            console.log(e,'hhhhhhhhhhhhhhh')
+            // console.log(e,'hhhhhhhhhhhhhhh')
             this.selectIndex = e
         }
     }