Merge branch 'main' of https://www.sanduolantoyoga.com/xiaoning/yogaApp

App.vue

@@ -75,44 +75,44 @@
 						}
 						else{
 							// 预约课程列表
-							uni.reLaunch({
+							uni.navigateTo({
 								url: `/pages/book/booklist`
 							});
 						}
 					}
 					if(extras && extras.type &&  extras.type == 'groupMessage') {
 						// 群聊消息
-						// let chat = {
+						let chat = {
-						//   type: 'GROUP',
+						  type: 'GROUP',
-						//   targetId: extras.groupId,
+						  targetId: extras.groupId,
-						//   showName: '加载中...',
+						  showName: '加载中...',
-						//   headImage: '/static/image/kf.png',
+						  headImage: '/static/image/kf.png',
-						// };
+						};
-						// this.$store.dispatch('chatStore/openChat', chat);
+						this.$store.dispatch('chatStore/openChat', chat);
-						// let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat);
+						let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat);
+						uni.navigateTo({
+							url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
+						});
 						// uni.reLaunch({
-						// 	url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
+						// 	url: `/pages/chatbox/chat`
 						// });
-						uni.reLaunch({
-							url: `/pages/chatbox/chat`
-						});
 					}
 					if(extras && extras.type &&  extras.type == 'privateMessage') {
 						// 私信消息
-						// let chat = {
+						let chat = {
-						//   type: 'PRIVATE',
+						  type: 'PRIVATE',
-						//   targetId: extras.senderId,
+						  targetId: extras.senderId,
-						//   showName: '加载中...',
+						  showName: '加载中...',
-						//   headImage: '/static/image/kf.png',
+						  headImage: '/static/image/kf.png',
-						// };
+						};
-						// this.$store.dispatch('chatStore/openChat', chat);
+						this.$store.dispatch('chatStore/openChat', chat);
-						// let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat)
+						let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat)
+						uni.navigateTo({
+							url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
+						});
 						// uni.reLaunch({
-						// 	url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
+						// 	url: `/pages/chatbox/chat`
 						// });
-						uni.reLaunch({
-							url: `/pages/chatbox/chat`
-						});
 					}
 					
 					if(!extras){
@@ -121,6 +121,12 @@
 						});
 					}
 				}
+				
+				// 消息推送事件
+				if (notificationEventType == 'notificationArrived') {
+					
+				}
+				
 			});
 			jpushModule.getRegistrationID(result => {
 				console.log("极光推送--注册ID", result.registerID)

pages/chatbox/chat-box.vue

@@ -205,7 +205,9 @@ export default {
       this.scrollToBottom();
       this.needScrollToBottom = false;
     }
+	this.setBadge();
   },
+  
   methods: {
     // 映射 Vuex actions
     ...mapActions('chatStore', [
@@ -222,7 +224,22 @@ export default {
     ]),
     ...mapActions('friendStore', ['updateFriend']),
     ...mapActions('groupStore', ['updateGroup']),
+	// 设置app角标
+	setBadge() {
+			 var count = myCache("massageCount")?myCache("massageCount"):-1;
+			  if (count > 0) { 
+				// app清除角标的数量
+				//#ifdef APP-PLUS
+				plus.runtime.setBadgeNumber(count);
+				//#endif
 				
+			  } else { 
+				// app清除角标的数量
+				//#ifdef APP-PLUS
+				plus.runtime.setBadgeNumber(-1);
+				//#endif
+			  }
+	},
     // 以下是原业务方法，只需将 `this.chatStore.xxx` 替换为映射后的方法名
     onRecorderInput() {
       this.showRecord = true;

pages/index/index.vue

@@ -303,11 +303,6 @@
 			checkupdate();
 
 		}, 
-		mounted() {
-			if(this.userid==""||this.userid=="0"){
-				this.$refs.loginId.open();
-			}
-		},
 		onPullDownRefresh() {
 			console.log('onPullDownRefresh');
 			setTimeout(()=>{