提交 f50d15b5 作者: wk

工地通对接

积分时间IOS不兼容修复
切换组织/岗位
父级 45561df4
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{ }, {
"path": "pages/login/joinOrg/joinOrg", "path": "pages/login/joinOrg/joinOrg",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
...@@ -427,6 +427,12 @@ ...@@ -427,6 +427,12 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, {
"path": "pages/questionAdd/questionAdd",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
} }
], ],
"globalStyle": { "globalStyle": {
......
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
this.projectId = curId this.projectId = curId
this.projectList.push({ this.projectList.push({
project_id: curId, project_id: curId,
project_name: this.projectName project_name: this.projectSelect
}) })
} else { } else {
this.projectList = result.data.list this.projectList = result.data.list
......
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
isComp = 1 isComp = 1
} }
uni.navigateTo({ uni.navigateTo({
url: `/pages/index/siteNewList/siteNewList?clientId=1&projectId=` + this.projecd_id + url: `/pages/index/siteNewList/siteNewList?clientId=1&projectId=` + this.project_id +
"&isComp=" + isComp "&isComp=" + isComp
}) })
}, },
......
...@@ -22,11 +22,7 @@ ...@@ -22,11 +22,7 @@
export default { export default {
data() { data() {
return { return {
list: [{ list: [],
title: "关于食堂发放免费午餐的消息通知息通知",
updateUserName: "张三",
articleTime: "2022/12/14 16:52:56"
}],
page: 1, page: 1,
pageSize: 20, pageSize: 20,
isHasMore: true, isHasMore: true,
...@@ -41,7 +37,7 @@ ...@@ -41,7 +37,7 @@
this.clientId = option.clientId this.clientId = option.clientId
this.projectId = option.projectId this.projectId = option.projectId
this.isComp = option.isComp this.isComp = option.isComp
console.log("是否企业级", this.isComp); console.log("是否企业级", this.projectId);
this.getNews() this.getNews()
if (this.clientId == 1) { if (this.clientId == 1) {
this.title = "新闻公告" this.title = "新闻公告"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<text class="text">当前版本:v1.0.0</text> <text class="text">当前版本:v1.0.0</text>
</view> </view>
<view class="btn-org" @click="linkTo('/pagesSub/mine/changeCompany/changeCompany')" v-if="role!='VISITOR'"> <view class="btn-org" @click="linkTo('/pagesSub/mine/changeCompany/changeCompany')" v-if="role!='VISITOR'">
<text class="text">切换组织</text> <text class="text">切换组织/岗位</text>
</view> </view>
<view class="btn-logout" @click="toLinkLogin"> <view class="btn-logout" @click="toLinkLogin">
<text class="text">退出登录</text> <text class="text">退出登录</text>
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
let year = date.getFullYear() let year = date.getFullYear()
let month = date.getMonth() + 1 let month = date.getMonth() + 1
let day = date.getDate() let day = date.getDate()
this.requestParam.time = year + '-' + month + '-' + day this.requestParam.time = year + '/' + month + '/' + day
this.requestParam.worker_id = this.userInfo.worker.workerId || '' this.requestParam.worker_id = this.userInfo.worker.workerId || ''
this.requestParam.project_id = this.project_id || '' this.requestParam.project_id = this.project_id || ''
this.getScoreDetail() this.getScoreDetail()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
Please register or to comment