Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/sisMobilePhone

# Conflicts:
#	components/drawer/threeLineDrawer.vue

components/drawer/threeLineDrawer.vue

@@ -10,7 +10,7 @@
 					</view>
 					
 					<view v-for="(item,index) in drawerList" :class="[changeGary==index?'statusMonitoring':'item']" :key="index" @click="clickChangeColor(index)">
-						<div @click="goToIndex(item);closeDrawer();">
+						<div @click="goToIndex(item)">
 							{{item.name}}
 							</div>
 					
@@ -66,28 +66,7 @@
 			},
 			closeDrawer: function() {
 				this.drawerIsShow = false;
-				 switch(uni.getSystemInfoSync().platform){
-				
-				    case 'android':
-				
-				       console.log('运行Android上')
-				       this.$parent.leftbar();
-				       break;
-				
-				    case 'ios':
-				
-				       console.log('运行iOS上')
-				       this.$parent.leftbar();
-				       break;
-				
-				    default:
-				
-				       console.log('运行在开发者工具上')
-				
-				       break;
-				
-				}
-				
+				this.$parent.leftbar();
 			},
 			clickChangeColor: function(index) {
 				this.changeGary = index;