diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index a461607e..a7cf3e92 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -19,7 +19,7 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" }, { diff --git a/App.vue b/App.vue index b93b3d22..fa658b5f 100644 --- a/App.vue +++ b/App.vue @@ -163,28 +163,31 @@ console.log('888====================', msg) console.log('777====================', payload) // let msgData = msg.payload; - setTimeout(() => { - // uni.navigateTo({ - // url: payload - // }) - // console.log(msgData) - // if(msgData.type == 10){ // 安全 - // uni.navigateTo({ - // url: '/pages/projectEnd/safeSame/details?id='+msgData.data.id+'&type=' + msgData.data.status - // }) - // } else if(msgData.type == 11){ // 质量 - // uni.navigateTo({ - // url: '/pages/projectEnd/qualityManage/details?id='+msgData.data.id+'&type=' + msgData.data.status - // }) - // } else if(msgData.type == 8){ // AI - // uni.navigateTo({ - // url: "/pages/alarmPage/disposition/disposition?item="+ encodeURIComponent(JSON.stringify(msgData.data)) - // }); - // } - uni.navigateTo({ - url: '/pages/messageCenter/messageCenter' - }) - }, 1000) + uni.navigateTo({ + url: '/pages/messageCenter/messageCenter' + }) + // setTimeout(() => { + // uni.navigateTo({ + // url: payload + // }) + // console.log(msgData) + // if(msgData.type == 10){ // 安全 + // uni.navigateTo({ + // url: '/pages/projectEnd/safeSame/details?id='+msgData.data.id+'&type=' + msgData.data.status + // }) + // } else if(msgData.type == 11){ // 质量 + // uni.navigateTo({ + // url: '/pages/projectEnd/qualityManage/details?id='+msgData.data.id+'&type=' + msgData.data.status + // }) + // } else if(msgData.type == 8){ // AI + // uni.navigateTo({ + // url: "/pages/alarmPage/disposition/disposition?item="+ encodeURIComponent(JSON.stringify(msgData.data)) + // }); + // } + // uni.navigateTo({ + // url: '/pages/messageCenter/messageCenter' + // }) + // }, 1000) }, false); // #endif }, diff --git a/main.js b/main.js index 9aa0bcbe..aa1fd996 100644 --- a/main.js +++ b/main.js @@ -37,16 +37,16 @@ if (process.env.NODE_ENV === 'development') { console.log('开发环境') // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 + Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 - Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 + // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 diff --git a/pages/login/login.vue b/pages/login/login.vue index f9c11b9d..399832ce 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -62,10 +62,14 @@ export default { plus.push.getClientInfoAsync((info) => { const clientid = info["clientid"]; console.log(clientid, "cidcidcidcidcid") - _this.clientid = clientid }); + plus.push.addEventListener('click', function(msg) { + uni.navigateTo({ + url: '/pages/messageCenter/messageCenter' + }) + }, false); // #endif if (uni.getStorageSync('userInfo')) { let userInfo = JSON.parse(uni.getStorageSync('userInfo'));