common/dataprocessing.js

@@ -230,6 +230,7 @@ class Dataprocessing {
 
 							for (let k = 0; k < gyeePermissionList.length; k++) {
 								var obj = {};
+								obj.id = gyeePermissionList[k].id;
 								obj.name = gyeePermissionList[k].permisssionname;
 								obj.remark1 = gyeePermissionList[k].remark1;
 								leftlist5.push(obj);

components/drawer/threeLineDrawer.vue

@@ -58,6 +58,33 @@
 		},
 		methods: {
 			openDrawer: function(width, drawerList, inconList,leftNavigationtitle) {
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
 				this.drawerIsShow = true;
 				this.drawerList = drawerList;
 				this.width = width;
@@ -67,23 +94,6 @@
 			closeDrawer: function() {
 
 				this.drawerIsShow = false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                 if(this.drawerList.length!=0){
 					//#ifdef H5
 					   if(this.drawerList[0].name=='手环管理'){
@@ -107,6 +117,7 @@
 			},
 			goToIndex:function(item){
 				console.log(item.remark1);
+				this.$parent.$root.toggleid = item.id;
 				if(item.remark1 == '/pages/index/Index'){
 					uni.switchTab({
 							url: item.remark1
@@ -121,11 +132,20 @@
 				else if(item.remark1 == '/components/weatherProphethomepage/WeatherProphethomepage'){
 					this.$parent.$root.toggleSwitch = true;
 				}
+				
+				else if(item.remark1 == '/components/weatherProphethomepage/WeatherProphethomepage'){
+					this.$parent.$root.toggleSwitch = true;
+				}
+
+				
+								
 				else{
+					
 					 uni.navigateTo({
 					 	url: item.remark1
 					 })
 				 }
+				 
 			}
 		}
 	}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "sis_phone",
-    "appid" : "__UNI__40A0AEB",
+    "appid" : "__UNI__D67B7BE",
     "description" : "sis_phone",
     "versionName" : "1.0.0",
     "versionCode" : 100,

pages/forecast/Forecast.vue

@@ -101,9 +101,12 @@
 		</view>
 		</scroll-view>
 		</view>
+		
 		<view v-if="toggleSwitch==true">
 			<WeatherProphethomepage ref="r1"></WeatherProphethomepage>
 		</view>
+
+
 		<!-- <view class="DrawerClose" :class="modalName == 'viewModal' ? 'show' : ''" @tap="hideModal"><text class="cuIcon-pullright"></text></view> -->
 	</view>
 </template>
@@ -522,7 +525,7 @@ export default {
 			if(this.$refs.drawer != undefined){
 				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
 			}else{
-				console.log('雷霆嘎巴');
+
 			}
 		},
 		closeDrawer: function() {

pages/mine/Mine.vue

@@ -26,10 +26,23 @@
 		<div class="plusDrawer" @tap="hideModal">
 			<plusDrawer ref="plusDrawer"></plusDrawer>
 		</div>
-		<view>
+<!-- 		<view>
 			<button class="cu-btn bg-red lg" @tap="falseLogin" type="" :style="{ 'height': buttonHeight}">注销账号</button>
+		</view> -->
+		
+		<view v-if="toggleid==12">
+			<mine ref="r1"></mine>
 		</view>
+		
+		<view v-if="toggleid==13">
+			<chatindex ref="r1"></chatindex>
+		</view>
+		
 	</view>
+	
+	
+	
+	
 </template>
 
 <script>
@@ -37,13 +50,19 @@
 	import drawer from '../../components/drawer/threeLineDrawer.vue'
 	import plusDrawer from '../../components/drawer/plusDrawer.vue';
 	
+	import mine from '../../components/mine/Mine.vue';
+	import chatindex from '../../components/mine/chat/Chatindex.vue';
+	
 	export default {
 		components: {
-			"drawer": drawer,
-			plusDrawer: plusDrawer
+			drawer: drawer,
+			plusDrawer: plusDrawer,
+			mine:mine,
+			chatindex:chatindex
 		},
 		data:function(){
 			return{
+				toggleid:12,//12我的主页，13聊天通讯，默认12
 				badge: 22,
 				inconList:["form","favor","question","edit"],
 				modalName:null,
@@ -60,6 +79,9 @@
 			this.address = this.dataprocessing.getWindPowerStationName();
 			this.FDC=this.dataprocessing.getWindPowerStationId();
 			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
+			this.plusDrawerList=uni.getStorageSync('plusList');
+			this.drawerList=uni.getStorageSync('leftlist5');
+			console.log(this.drawerList);
 		},
 		onHide() {
 			this.$refs.drawer.closeDrawer();
@@ -73,11 +95,21 @@
 			this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
 		},
 		methods:{
-			openDrawer:function(){
-				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
+			
+			
+			
+			
+			openDrawer: function() {
+
+				if(this.$refs.drawer != undefined){
+					this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
+				}else{
+			
+				}
 			},
-			closeDrawer:function(){
-				this.drawerIsShow=false;
+			closeDrawer: function() {				
+				this.drawerIsShow = false;
+				
 			},viewUserid: function() {
 				this.plusDrawerList=uni.getStorageSync('plusList');
 			},