diff --git a/src/App.vue b/src/App.vue
index f73b740..f0312f7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index 64a472c..0ad4f28 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -63,7 +63,9 @@ const tabList = ref([
{
name: '任务审核',
apiUrl: '/workflow',
- params: {},
+ params: {
+ // aaa:111
+ },
},
])
diff --git a/src/pages/task/task_hygienes_submit.vue b/src/pages/task/task_hygienes_submit.vue
index 2abdc04..e53130c 100644
--- a/src/pages/task/task_hygienes_submit.vue
+++ b/src/pages/task/task_hygienes_submit.vue
@@ -87,19 +87,28 @@ const onSubmit = async () => {
if (loading.value) return
loading.value = true
try {
- const resData = await http.post(`/tasks/${id.value}/submit`, {
- id: id.value,
- description: form.description,
- photos: form.photos.map((item) => item.url),
+ await http.request({
+ url: `/tasks/${id.value}/submit`,
+ method: 'POST',
+ header: {
+ Accept: 'application/json',
+ },
+ data: {
+ task_hygiene: {
+ description: form.description,
+ photos: form.photos.map((item) => item.url),
+ },
+ },
})
uni.showToast({
title: '提交成功',
icon: 'none',
})
formRef.value.resetFields()
- uni.$emit('ex:submit', resData)
+ uni.$emit('task:submit', resData)
uni.navigateBack()
} catch (error) {
+ console.log(error)
} finally {
loading.value = false
}
diff --git a/src/pages/task/task_ledgers_submit.vue b/src/pages/task/task_ledgers_submit.vue
new file mode 100644
index 0000000..b974213
--- /dev/null
+++ b/src/pages/task/task_ledgers_submit.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b254698..6683039 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,7 +6,8 @@ export const useUserStore = defineStore({
id: 'app-user',
state: () => ({
userInfo: null,
- token: null,
+ token: '22|ua3STGluZFzDeV1nOs4I3S9s2UCDtQp9AtVLT2jN0535e0a5',
+ roles: []
}),
getters: {
getUserInfo(state) {
@@ -35,6 +36,7 @@ export const useUserStore = defineStore({
return new Promise((resolve, reject) => {
http.get('/auth/profile').then(async (res) => {
this.userInfo = res
+ this.roles = res.role
resolve(res);
}).catch(err => {
reject(err);
diff --git a/src/utils/request.js b/src/utils/request.js
index cc2ad4b..eca3777 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -47,7 +47,7 @@ http.interceptors.response.use(async (response) => {
// 处理响应结果
const { statusCode, data } = response
- if (statusCode !== 200 && statusCode !== 201) {
+ if (statusCode >= 400) {
uni.showToast({
title: data.message || '服务器错误',
icon: 'none'