xiaoning
/
yogaApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upbug

Browse Source
main
zouyanyan 3 weeks ago
parent dc8f3a905c
commit b42c72344c
7 changed files with 139 additions and 91 deletions
Show Stats Download Patch File Download Diff File

104
App.vue
Unescape View File

@ -4,6 +4,7 @@
//引进检查版本 //引进检查版本
// import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version'; // import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
import { mapState, mapActions } from 'vuex'
import { myCache } from '@/utils/utils.js'; import { myCache } from '@/utils/utils.js';
import * as wsApi from './common/wssocket'; import * as wsApi from './common/wssocket';
import chatStore from "./store/chatStore"; import chatStore from "./store/chatStore";
@ -26,6 +27,9 @@
} }
}, },
computed: {
...mapState('chatStore', ['chats'])
},
onLaunch() { onLaunch() {
// 判断版本更新 需要真机进行测试 // 判断版本更新 需要真机进行测试
//checkupdate(); //checkupdate();
@ -37,7 +41,7 @@
jpushModule.initJPushService() jpushModule.initJPushService()
jpushModule.addConnectEventListener(result=>{ jpushModule.addConnectEventListener(result=>{
let connectEnable = result.connectEnable let connectEnable = result.connectEnable
console.log("jpush连接", connectEnable) console.log("极光推送--jpush连接", connectEnable)
}); });
jpushModule.addTagAliasListener(result => { jpushModule.addTagAliasListener(result => {
@ -47,7 +51,7 @@
let tag = result.tag let tag = result.tag
let tagEnable = result.tagEnable let tagEnable = result.tagEnable
let alias = result.alias let alias = result.alias
console.log(alias, '别名') console.log('极光推送--别名',alias)
}); });
// 通知事件回调 // 通知事件回调
@ -57,14 +61,15 @@
let title = result.title let title = result.title
let content = result.content let content = result.content
let extras = result.extras let extras = result.extras
console.log("消息通知", result); console.log("极光推送--消息通知", result);
console.log("消息通知extras", extras) console.log("极光推送--消息通知extras", extras);
// 点击事件 // 点击事件
if (notificationEventType == 'notificationOpened') {
if(extras && extras.type && extras.type == 'bookCourses') { if(extras && extras.type && extras.type == 'bookCourses') {
var bookId=extras.bookId?extras.bookId:''; var bookId=extras.bookId?extras.bookId:'';
if(bookId){ if(bookId){
// 预约课程详情 // 预约课程详情
uni.reLaunch({ uni.navigateTo({
url: `/pages/book/bookinfo?id=${bookId}` url: `/pages/book/bookinfo?id=${bookId}`
}); });
} }
@ -77,67 +82,58 @@
} }
if(extras && extras.type && extras.type == 'groupMessage') { if(extras && extras.type && extras.type == 'groupMessage') {
// 群聊消息 // 群聊消息
// var pagePath=extras.pagePath; // let chat = {
// var groupId=extras.groupId; // type: 'GROUP',
// if(pagePath&&groupId){ // targetId: extras.groupId,
// uni.reLaunch({ // showName: '加载中...',
// url: `${pagePath}?chatIdx=${groupId}` // headImage: '/static/image/kf.png',
// }); // };
// } // this.$store.dispatch('chatStore/openChat', chat);
// else{ // let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat);
// uni.reLaunch({ // uni.reLaunch({
// url: `/pages/chatbox/chat` // url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
// }); // });
// } uni.reLaunch({
let chat = { url: `/pages/chatbox/chat`
type: 'GROUP', });
targetId: extras.groupId,
showName: '加载中...',
headImage: '/static/image/kf.png',
};
this.$store.dispatch('chatStore/openChat', chat);
let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat)
uni.reLaunch({url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`});
} }
if(extras && extras.type && extras.type == 'privateMessage') { if(extras && extras.type && extras.type == 'privateMessage') {
// 私信消息 // 私信消息
// var pagePath=extras.pagePath; // let chat = {
// var senderId=extras.senderId; // type: 'PRIVATE',
// if(pagePath&&senderId){ // targetId: extras.senderId,
// uni.reLaunch({ // showName: '加载中...',
// url: `${pagePath}?chatIdx=${senderId}` // headImage: '/static/image/kf.png',
// }); // };
// } // this.$store.dispatch('chatStore/openChat', chat);
// else{ // let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat)
// uni.reLaunch({ // uni.reLaunch({
// url: `/pages/chatbox/chat` // url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}`
// }); // });
// }
let chat = {
type: 'PRIVATE',
targetId: extras.senderId,
showName: '加载中...',
headImage: '/static/image/kf.png',
};
this.$store.dispatch('chatStore/openChat', chat);
let chatIdx = this.$store.getters['chatStore/findChatIdx'](chat)
uni.reLaunch({ uni.reLaunch({
url: `/pages/chatbox/chat-box?chatIdx=${chatIdx}` url: `/pages/chatbox/chat`
}); });
} }
})
if(!extras){
uni.reLaunch({
url: `/pages/chatbox/chat`
});
}
}
});
jpushModule.getRegistrationID(result => { jpushModule.getRegistrationID(result => {
console.log("注册ID", result.registerID) console.log("极光推送--注册ID", result.registerID)
if (result.registerID) { if (result.registerID) {
uni.setStorageSync("register_id", result.registerID) uni.setStorageSync("register_id", result.registerID)
} }
}) });
jpushModule.addCustomMessageListener(result => { jpushModule.addCustomMessageListener(result => {
let messageID = result.messageID let messageID = result.messageID
let content = result.content let content = result.content
let extras = result.extras let extras = result.extras
console.log("自定义消息", result) console.log("极光推送--自定义消息", result)
}) });
//#endif //#endif
// 极光推送end-------------- // 极光推送end--------------
@ -164,9 +160,21 @@
}) })
} }
// 未读消息总数（用于角标）
let count = 0
myCache("this.chats",this.chats);
this.chats.forEach(chat => {
if (!chat.delete) {
count += chat.unreadCount
}
});
myCache("massageCount",count);
console.log("massageCountmassageCount",count);
//--------------------------------------------------- //---------------------------------------------------
}, },
methods: { methods: {
...mapActions('chatStore'),
//--------------------------------------------------- //---------------------------------------------------
init(userId) { init(userId) {

7
manifest.json
Unescape View File

@ -2,8 +2,8 @@
"name" : "瑜伽汇", "name" : "瑜伽汇",
"appid" : "__UNI__B6E0086", "appid" : "__UNI__B6E0086",
"description" : "瑜伽汇", "description" : "瑜伽汇",
"versionName" : "1.0.20", "versionName" : "1.0.21",
"versionCode" : 1020, "versionCode" : 1021,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"flexible" : true, "flexible" : true,
@ -69,7 +69,8 @@
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
"minSdkVersion" : 21
}, },
"ios" : { "ios" : {
"privacyDescription" : { "privacyDescription" : {

19
pages/book/bookinfo.vue
Unescape View File

@ -168,6 +168,9 @@
this.id=options.id; this.id=options.id;
this.getinfo(); this.getinfo();
} }
// 设置app角标
this.setBadge();
}, },
onShow(){ onShow(){
this.openId = myCache('openId'); this.openId = myCache('openId');
@ -181,6 +184,22 @@
} }
}, },
methods: { methods: {
// 设置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
}
},
formatTime(timeStr) { formatTime(timeStr) {
// 假设 timeStr 格式为 "HH:MM:SS" // 假设 timeStr 格式为 "HH:MM:SS"
return timeStr.slice(0, 5); // 取前5位 "HH:MM" return timeStr.slice(0, 5); // 取前5位 "HH:MM"

15
pages/chatbox/chat.vue
Unescape View File

@ -115,15 +115,26 @@ export default {
// 设置底部角标 // 设置底部角标
setBadge(count) { setBadge(count) {
myCache("massageCount",count);
if (count > 0) { if (count > 0) {
uni.setTabBarBadge({ uni.setTabBarBadge({
index: 3, // 根据实际tabBar索引调整 index: 3, // 根据实际tabBar索引调整
text: count + '' text: count + ''
}) });
// app清除角标的数量
//#ifdef APP-PLUS
plus.runtime.setBadgeNumber(count);
//#endif
} else { } else {
uni.removeTabBarBadge({ uni.removeTabBarBadge({
index: 3 index: 3
}) });
// app清除角标的数量
//#ifdef APP-PLUS
plus.runtime.setBadgeNumber(-1);
//#endif
} }
}, },

2
pages/login/login.vue
Unescape View File

@ -309,7 +309,7 @@
uni.showLoading({ uni.showLoading({
title: '正在登录...' title: '正在登录...'
}); });
console.log("login--登录参数",this.form)
const {data: res} = await uni.$http.post('/api/login',this.form); const {data: res} = await uni.$http.post('/api/login',this.form);
if(res&&res.code=="200"){ if(res&&res.code=="200"){
uni.setStorageSync("loginindex", "1"); uni.setStorageSync("loginindex", "1");

5
pages/user/user.vue
Unescape View File

@ -592,6 +592,11 @@
}) })
} }
// app清除角标的数量
//#ifdef APP-PLUS
plus.runtime.setBadgeNumber(-1);
//#endif
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '已退出登录！', title: '已退出登录！',
type: 'warning', type: 'warning',

30
utils/utils.js
Unescape View File

@ -124,20 +124,24 @@ function getcartLoseNum() {
} }
return num return num
}; };
// function getmessageNum() {
// var user=myCache("user");
// var userid = user.userid? user.userid:'';
// var num=0;
// if(userid){
// var grouplist=myCache("chatlist-"+userid)?myCache("chatlist-"+userid):[];
// for(let i=0;i<grouplist.length;i++){
// num=num+1*(grouplist[i].sl?grouplist[i].sl:0);
// }
// return num
// }
// else{
// return num
// }
// };
function getmessageNum() { function getmessageNum() {
var user=myCache("user"); var num= myCache("massageCount")?myCache("massageCount"):0;
var userid = user.userid? user.userid:''; return num;
var num=0;
if(userid){
var grouplist=myCache("chatlist-"+userid)?myCache("chatlist-"+userid):[];
for(let i=0;i<grouplist.length;i++){
num=num+1*(grouplist[i].sl?grouplist[i].sl:0);
}
return num
}
else{
return num
}
}; };
export { export {
myCache, myCache,

Write Preview
Loading…
Cancel
Save