diff --git a/components/footers/footers.vue b/components/footers/footers.vue index 4518ab76..db8ba6ac 100644 --- a/components/footers/footers.vue +++ b/components/footers/footers.vue @@ -28,7 +28,15 @@ mounted() { this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) if (this.userInfo.accountType == 5 || this.userInfo.accountType == 6 || this.userInfo.accountType == 10) { - this.tabList.push({ + this.tabList.push( + { + appName: '消息', + moduleIcon2: 'footerIcon1', + moduleIcon: 'footerIcon2', + plugin: 'mssage', + appShow: 1 + }, + { appName: '首页', moduleIcon2: 'tabIcon-index', moduleIcon: 'tabIcon-index-active', @@ -163,6 +171,11 @@ url: '/pages/projectEnd/projectIndex/projectIndex' }) break; + case 'mssage': + uni.redirectTo({ + url: '/pages/messageCenter/messageCenter' + }) + break; case 'deviceManage': uni.redirectTo({ url: '../../pages/deviceManage/deviceManage' diff --git a/main.js b/main.js index d199927b..34a2de07 100644 --- a/main.js +++ b/main.js @@ -36,11 +36,11 @@ 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:9809/' // 鞍钢正式地址 // Vue.prototype.url_config = 'http://47.93.215.234: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:9111/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // 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' // 工作流线上地址 diff --git a/pages.json b/pages.json index 6e6f6fb4..61ec577e 100644 --- a/pages.json +++ b/pages.json @@ -51,6 +51,18 @@ "path": "pages/messageCenter/messageCenter", "style": {} }, + { + "path": "pages/messageTask/messageList", + "style": {} + }, + { + "path": "pages/messageTask/messageTask", + "style": {} + }, + { + "path": "pages/messageTask/messageDetail", + "style": {} + }, { "path": "pages/videoManage/playVideo", "style": {} diff --git a/pages/login/login.vue b/pages/login/login.vue index 88bf1bb9..f9c11b9d 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -10,8 +10,9 @@ 智慧工地服务平台 - 我是用户 - 我是供应商 + 用户登录 + + + + + + + + + + + 标题：{{ item.title }} + 内容：{{ item.msg }} + 发送时间：{{item.sendTime}} + + + + + + + 暂无数据 + + + + + + + + + diff --git a/pages/messageCenter/messageCenter.vue b/pages/messageCenter/messageCenter.vue index 0fdbbf28..06e13ea5 100644 --- a/pages/messageCenter/messageCenter.vue +++ b/pages/messageCenter/messageCenter.vue @@ -1,10 +1,16 @@ \ No newline at end of file diff --git a/pages/messageTask/messageList.vue b/pages/messageTask/messageList.vue new file mode 100644 index 00000000..52ed4235 --- /dev/null +++ b/pages/messageTask/messageList.vue @@ -0,0 +1,166 @@ + + + + + \ No newline at end of file diff --git a/pages/messageTask/messageTask.vue b/pages/messageTask/messageTask.vue new file mode 100644 index 00000000..b68ca7b9 --- /dev/null +++ b/pages/messageTask/messageTask.vue @@ -0,0 +1,133 @@ + + + + + \ No newline at end of file diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 9ece5e0e..ba26368e 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -268,7 +268,6 @@ console.log('userInfo===========', userInfo) this.userInfo = userInfo this.accountType = userInfo.accountType - this.accountType = userInfo.accountType this.styType = userInfo.styleType this.systemInfo = uni.getStorageSync('systemInfo') this.getSystemLogoConfig() diff --git a/pages/projectEnd/qualityManage/list.vue b/pages/projectEnd/qualityManage/list.vue index a059c5a7..188d89ca 100644 --- a/pages/projectEnd/qualityManage/list.vue +++ b/pages/projectEnd/qualityManage/list.vue @@ -26,7 +26,7 @@ + @click="goDetails(item)"> 质量问题 @@ -942,10 +942,13 @@ } }) }, - goDetails(id) { - uni.navigateTo({ - url: './details?id=' + id + '&type=' + this.checkedTab - }) + goDetails(obj) { + // uni.navigateTo({ + // url: './details?id=' + id + '&type=' + this.checkedTab + // }) + uni.navigateTo({ + url: './details?id=' + obj.id + '&type=' + obj.status + }) } } } diff --git a/pages/projectEnd/safeSame/list.vue b/pages/projectEnd/safeSame/list.vue index 6fae8ab0..b83e13b6 100644 --- a/pages/projectEnd/safeSame/list.vue +++ b/pages/projectEnd/safeSame/list.vue @@ -26,7 +26,7 @@ + @click="goDetails(item)"> 安全问题 @@ -942,9 +942,12 @@ } }) }, - goDetails(id) { + goDetails(obj) { + // uni.navigateTo({ + // url: './details?id=' + id + '&type=' + this.checkedTab + // }) uni.navigateTo({ - url: './details?id=' + id + '&type=' + this.checkedTab + url: './details?id=' + obj.id + '&type=' + obj.status }) } }