diff --git a/pages.json b/pages.json index fcd7ce3..10a1186 100644 --- a/pages.json +++ b/pages.json @@ -56,17 +56,17 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTextStyle": "white" } - }, - { - "path": "pages/approve/index", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "审批", - // 开启下拉刷新 - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "white" - } + }, + { + "path": "pages/approve/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "审批", + // 开启下拉刷新 + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "white" + } }, { "path": "pages/investigation/complete", @@ -78,17 +78,17 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTextStyle": "black" } - }, - { - "path": "pages/investigation/task", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "排查", - // 开启下拉刷新 - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" - } + }, + { + "path": "pages/investigation/task", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "排查", + // 开启下拉刷新 + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" + } }, { "path": "pages/governance/index", @@ -143,15 +143,15 @@ "navigationBarBackgroundColor": "#F6F8FA", "navigationBarTextStyle": "black" } - }, - { - "path": "pages/mine/password", - "style": { - "navigationBarTitleText": "修改密码", - // "navigationStyle": "default", - "navigationBarBackgroundColor": "#F6F8FA", - "navigationBarTextStyle": "black" - } + }, + { + "path": "pages/mine/password", + "style": { + "navigationBarTitleText": "修改密码", + // "navigationStyle": "default", + "navigationBarBackgroundColor": "#F6F8FA", + "navigationBarTextStyle": "black" + } }, { "path": "pages/knowledge/index", @@ -171,7 +171,7 @@ } } ], - "tabBar": { + "tabBar": { // "custom": true, "color": "#7A7E83", // tab 上的文字默认颜色 @@ -192,19 +192,19 @@ // // 选中时的图片路径 // "text": "首页" // tab 上按钮文字 - }, - { - "pagePath": "pages/approve/index" - // "iconPath": "static/nav/jobfind.png", - // "selectedIconPath": "static/nav/jobfind_active.png", - // "text": "审批" + }, + { + "pagePath": "pages/approve/index" + // "iconPath": "static/nav/jobfind.png", + // "selectedIconPath": "static/nav/jobfind_active.png", + // "text": "审批" }, { "pagePath": "pages/investigation/index" // "iconPath": "static/nav/job.png", // "selectedIconPath": "static/nav/job_active.png", // "text": "排查" - }, + }, { "pagePath": "pages/governance/index" diff --git a/pages/index/detail.vue b/pages/index/detail.vue index 2beabba..d9aeddc 100644 --- a/pages/index/detail.vue +++ b/pages/index/detail.vue @@ -93,7 +93,7 @@ > 确认 清空 @@ -643,10 +643,10 @@ console.log({ handleGroup(item) { console.log(item) let text = ""; - if (this.optionType) { - } else { + if (item.optionType) { text = item.checkboxValue1.join(","); - // text = item; + } else { + text = item; } this.handleSend(text); },