diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 2176901..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/api/system/index.js b/src/api/system/index.js
index 8029b45..33d1d9b 100644
--- a/src/api/system/index.js
+++ b/src/api/system/index.js
@@ -327,6 +327,20 @@ const system = {
data: data
});
},
+ getExchangeLog: async (data) => {
+ return request({
+ method: MethodsENUM.POST,
+ url: "/task/getExchangeLog",
+ data: data
+ });
+ },
+ addExchangeLog: async (data) => {
+ return request({
+ method: MethodsENUM.POST,
+ url: "/task/addExchangeLog",
+ data: data
+ });
+ },
}
export default system;
diff --git a/src/components/XDropdownList.vue b/src/components/XDropdownList.vue
index 7a77a03..fe7b640 100644
--- a/src/components/XDropdownList.vue
+++ b/src/components/XDropdownList.vue
@@ -15,6 +15,7 @@ const {option} = defineProps({
const change = (id) => {
modelValue.value = id;
emits('change');
+ show.value = false;
}
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index b394bc5..e622d6f 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -105,7 +105,7 @@ onMounted(() => {
{
- console.log('触发')
+ pagination.page++;
}"
class="h-[calc(100vh-200rpx)]"
scroll-y>
diff --git a/src/pages/taskDetails/components/ReviewCommunication.vue b/src/pages/taskDetails/components/ReviewCommunication.vue
index 509304b..d2e4ae1 100644
--- a/src/pages/taskDetails/components/ReviewCommunication.vue
+++ b/src/pages/taskDetails/components/ReviewCommunication.vue
@@ -1,59 +1,71 @@
-
+
-
-
-
-
- 07月21日 13:42
-
- 123
-
-
- 未读
+ {
+ pagination.page++;
+ }"
+ class="max-h-[900rpx]"
+ scroll-y>
+
+
+
+
+
+ {{ dayjs(v.createtime).format('MM月DD日 HH:mm') }}
+
+
+
+
+
+ {{ v.is_read === 1 ? '已读' : '未读' }}
+
+
-
-
-
-
- 提示:点击下方按钮,快速回复
-
-
- 我已重新回填
-
-
- 拒绝修改并放弃任务
-
- 商家将根据约定扣钱或不结算
-
-
-
- 发起申诉
-
-
-
+
发起申述
-
-
- 发起申述
-
+
@@ -88,6 +100,17 @@ import rback from "../../../static/icons/rout-back.png";
gap: 18rpx;
}
+.content {
+ @apply items-start;
+}
+
+.right-box {
+ @apply flex-row-reverse;
+ .content {
+ @apply items-end;
+ }
+}
+
.status {
margin-top: 8rpx;
color: rgb(29, 33, 41);
@@ -117,7 +140,8 @@ import rback from "../../../static/icons/rout-back.png";
.unread {
&::before {
- background-color: var(--warning-color);
+ border: 4rpx solid rgb(229, 230, 235);
+ background-color: #fff;
}
}
diff --git a/src/pages/taskDetails/components/replyMessageModal.vue b/src/pages/taskDetails/components/replyMessageModal.vue
new file mode 100644
index 0000000..a910e48
--- /dev/null
+++ b/src/pages/taskDetails/components/replyMessageModal.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+ 回复
+
+
+
+
+
+
+ 添加图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示:请确认内容无误后提交,提交虚假回复会封号
+
+
+
+ 提交
+
+
+
+
+
diff --git a/src/utils/uils.js b/src/utils/uils.js
index a014bd2..946db09 100644
--- a/src/utils/uils.js
+++ b/src/utils/uils.js
@@ -143,22 +143,28 @@ export const uploadFile = ({count}) => {
uni.chooseImage({
count: count,
success: ({tempFilePaths}) => {
- const file = tempFilePaths[0];
- uni.uploadFile({
- url: BASEURL + '/upload/upload',
- filePath: file,
- name: "file",
- header: {
- token: UserStore.token
- },
- success: ({data}) => {
- resolve(JSON.parse(data));
- },
- fail: (err) => {
- showToast(err.errMsg);
- reject(err);
- }
- });
+ const all = tempFilePaths.map(v => new Promise((res, rej) => {
+ uni.uploadFile({
+ url: BASEURL + '/upload/upload',
+ filePath: v,
+ name: "file",
+ header: {
+ token: UserStore.token
+ },
+ success: ({data}) => {
+ res(JSON.parse(data).data);
+ },
+ fail: (err) => {
+ showToast(err.errMsg);
+ rej(err);
+ }
+ });
+ }));
+ Promise.all(all).then((res) => {
+ resolve(res);
+ }).catch(err => {
+ reject(err);
+ })
},
fail: (err) => {
showToast(err.errMsg);