mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uni-push' into bill

Browse Source 
# Conflicts:
#	App.vue
#	manifest.json
#	pages/users/login/login_copy.vue
This commit is contained in:
THK3121 2023-07-01 14:34:03 +08:00
commit fe2fe620a8
5 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
App.vue
View File

@ -20,6 +20,7 @@
history history
} from '@/api/public.js' } from '@/api/public.js'
import Routine from './libs/routine.js'; import Routine from './libs/routine.js';
var jpushModule = uni.requireNativePlugin("JG-JPush");
export default { export default {
globalData: { globalData: {
spid: 0, spid: 0,
@ -123,24 +124,24 @@
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.initJPushService();
// 设置别名 // 设置别名
jpushModule.setAlias({ // jpushModule.setAlias({
'alias': uni.getStorageSync('userId'), // 'alias': uni.getStorageSync('userId'),
'sequence': 1 // 'sequence': 1
}) // })
// //
jpushModule.addTagAliasListener(result => { // jpushModule.addTagAliasListener(result => {
let code = result.code // let code = result.code
let sequence = result.sequence // let sequence = result.sequence
let tags = result.tags // let tags = result.tags
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, '别名')
}) // })
// 通知事件回调 // 通知事件回调
jpushModule.addNotificationListener(result => { jpushModule.addNotificationListener(result => {
let notificationEventType = result.notificationEventType let notificationEventType = result.notificationEventType
@ -148,31 +149,27 @@
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.extras.userinfo)
console.log("通知", result)
// 点击事件 // 点击事件
if (notificationEventType == 'notificationOpened') { if (notificationEventType == 'notificationOpened') {
if(result.extras.userinfo){ uni.navigateTo({
uni.navigateTo({ url: result.extras.route
url: result.extras.userinfo })
})
}
} }
}) })
jpushModule.getRegistrationID(result => {
console.log("注册ID", result.registerID) // jpushModule.addCustomMessageListener(result => {
if (result.registerID) { // let messageID = result.messageID
uni.setStorageSync("register_id", result.registerID) // let content = result.content
} // let extras = result.extras
}) // console.log("自定义消息", result)
jpushModule.addCustomMessageListener(result => { // })
let messageID = result.messageID
let content = result.content
let extras = result.extras
console.log("自定义消息", result)
})
//#endif //#endif
}, },
onShow() { onShow() {
let that = this let that = this

10
api/public.js
View File

@ -74,6 +74,16 @@ export function bindMp(data) {
noAuth: true noAuth: true
}); });
} }
/**
* 绑定极光id
* @param data object 小程序用户登陆信息
*/
export function bindJG(data) {
return request.post("auth/bindJg", data, {
noAuth: true
});
}
/** /**
* 分享 * 分享
* @returns {*} * @returns {*}

3
manifest.json
View File

@ -284,6 +284,7 @@
} }
} }
} }
} }
} }
}, },
@ -305,6 +306,7 @@
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
"usingComponents" : true "usingComponents" : true
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
@ -333,5 +335,6 @@
}, },
"title" : "加载中...", "title" : "加载中...",
"template" : "template.h5.html" "template" : "template.h5.html"
} }
} }

11
pages/index/index.vue
View File

@ -108,6 +108,17 @@
this.getGoods() this.getGoods()
this.selfLocation() this.selfLocation()
this.Area() this.Area()
uni.$on('connectstatusChange',(connectstatus) =>{
var connectstr = ''
if (connectstatus == true) {
connectstr ='已连接'
this.getRegistrationID()
}else{
connectstr ='未连接'
}
this.connectstatus = connectStr
})
}, },
onShow() {}, onShow() {},
onReachBottom() { onReachBottom() {

16
pages/users/login/login_copy.vue
View File

@ -280,7 +280,8 @@
getLogo, getLogo,
getconfig, getconfig,
getVersion, getVersion,
bindMp bindMp,
bindJG
} from "@/api/public"; } from "@/api/public";
// import cookie from "@/utils/store/cookie"; // import cookie from "@/utils/store/cookie";
import { import {
@ -295,6 +296,7 @@
mapGetters mapGetters
} from "vuex"; } from "vuex";
import Verify from '@/components/verify/verify.vue'; import Verify from '@/components/verify/verify.vue';
var jpushModule = uni.requireNativePlugin("JG-JPush");
const BACK_URL = "login_back_url"; const BACK_URL = "login_back_url";
export default { export default {
@ -920,8 +922,7 @@
code: res.code, code: res.code,
iv: iv, iv: iv,
encryptedData: encryptedData, encryptedData: encryptedData,
phone: that phone: that.account
.account
}).then(res => { }).then(res => {
// console.log(res); // console.log(res);
}) })
@ -936,6 +937,15 @@
} }
}) })
} }
jpushModule.initJPushService()
jpushModule.getRegistrationID(result => {
if (result.registerID) {
bindJG({
phone: this.account,
jg_register_id: result.registerID
})
}
})
} }
} }
}; };