diff --git a/App.vue b/App.vue index 0c5a12b..560e0bc 100644 --- a/App.vue +++ b/App.vue @@ -21,11 +21,16 @@ // uni.showModal({ // content: info.referrerInfo.extraData // }) - +// console.log('App Launch:',info); if (info.referrerInfo?.extraData?.uniMP) { //监听宿主App通讯数据 uni.onHostEventReceive((event, data) => { if(event=='getLocation') uni.$emit('uniMP_getLocation', data); + else if(event=='im'){ + uni.navigateTo({ + url:'/subpkg/chatMang/index' + }) + } }); uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); @@ -64,10 +69,25 @@ } }, onShow: function() { + // uni.onHostEventReceive((event, data) => { + // // if(event=='getLocation') uni.$emit('uniMP_getLocation', data); + // }); // const audioContext = uni.createInnerAudioContext() // // 设置音频文件地址 // audioContext.src = '/static/mp3/order.mp3' // 播放音频 + uni.onHostEventReceive((event,data)=>{ + if(event=='im'){ + uni.navigateTo({ + url:'/subpkg/chatMang/index' + }) + }else if(event=='re_id'){ + uni.setStorageSync("re_id",data) + } + // console.log('Receive event('+event+') from HOST: '+JSON.stringify(data)); + + + }); //#ifdef APP-PLUS jpushModule.initJPushService() jpushModule.addNotificationListener(res => { diff --git a/config/app.js b/config/app.js index dfa40af..c573f3d 100644 --- a/config/app.js +++ b/config/app.js @@ -3,8 +3,8 @@ let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 let httpApiTest -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 switch (env) { @@ -22,7 +22,7 @@ switch (env) { httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 - httpApiTest = 'http://192.168.1.13:8081' //测试环境 + httpApiTest = 'http://192.168.1.11:8081' //测试环境 } diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index d7f7181..2053cfe 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -119,8 +119,8 @@ - - 99 + + {{managerInfo.msg_num}} @@ -131,7 +131,7 @@ - 工作管理 + 工作管理 @@ -45,7 +50,15 @@ - {{item.content}} + + + + {{item.content}} + + + {{item.content}} + + 选择该车辆为监管车辆 - + + + + @@ -66,12 +74,24 @@ a:"https://tse3-mm.cn.bing.net/th/id/OIP-C.0xzWZj1_A-nzJiUBxrk8XQHaEo?w=298&h=186&c=7&r=0&o=5&pid=1.7", carList:[1,1,1,1,1,1,,1,1,], showPop:false, - checkList:[1,1,1,1,1,1,1,1] + checkList:[1,1,1,1,1,1,1,1], + checkboxValue1:[], + arr:[] } } ,methods:{ + checkboxChange(i){ + if(this.arr.includes(i)){ + // this.arr + }else{ + + this.arr.push(i) + } + + console.log(this.arr) + }, close() { this.showPop=false }, diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index 4a3f178..fb31876 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -11,6 +11,10 @@ + + + +