diff --git a/.env b/.env
index ace939f..3da923a 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-VITE_API_URL=http://admin.ceshi.guo123.cn/api
+VITE_API_URL=https://admin.ceshi.guo123.cn/api
VITE_TINYMCE_KEY=agmu6i1c6k7bcp36oenzyz7yi1yplptq7goyx88y1g6ofnqu
VITE_AES_KEY=st123456654321st
VITE_APP_ID=wxa4dd2d036c8156a4
diff --git a/src/components/AcceptAssignmentModal.vue b/src/components/AcceptAssignmentModal.vue
index 1e5d882..906f3f2 100644
--- a/src/components/AcceptAssignmentModal.vue
+++ b/src/components/AcceptAssignmentModal.vue
@@ -1,4 +1,4 @@
-
diff --git a/src/pages/addAccount/index.vue b/src/pages/addAccount/index.vue
index 40b98fe..9a1faf1 100644
--- a/src/pages/addAccount/index.vue
+++ b/src/pages/addAccount/index.vue
@@ -76,10 +76,10 @@ onLoad((options) => {
-
+
-
+
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 55d6f72..b7d0fec 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,10 +1,9 @@
diff --git a/src/pages/taskDetails/components/CollectMaterials.vue b/src/pages/taskDetails/components/CollectMaterials.vue
index 149b73d..d1a5814 100644
--- a/src/pages/taskDetails/components/CollectMaterials.vue
+++ b/src/pages/taskDetails/components/CollectMaterials.vue
@@ -31,7 +31,7 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
-
+
标题:
@@ -39,7 +39,7 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
{{ data.children.material[current].title }}
-
+
话题:
@@ -47,7 +47,7 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
{{ data.children.material[current].tags_arr.map(item => `#${item}`).join(' ') }}
-
+
正文:
@@ -88,7 +88,7 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
-
+
一键下载
diff --git a/src/pages/taskDetails/components/MyBackfill.vue b/src/pages/taskDetails/components/MyBackfill.vue
index de59830..8c4e3e1 100644
--- a/src/pages/taskDetails/components/MyBackfill.vue
+++ b/src/pages/taskDetails/components/MyBackfill.vue
@@ -109,52 +109,18 @@ onMounted(() => {
-
+
-
-
- {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交,审核通过
-
-
-
- {{
- dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm')
- }}已提交,审核拒绝
-
- 请请点击审核沟通,查看修改建议
-
- 并于{{ dayjs(data.children.back[current].end_time * 1000).format('YYYY-MM-DD HH:mm') }}前点击下方重新提交本次回填
-
-
-
- {{
- dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm')
- }}已提交,审核拒绝
-
- 请请点击审核沟通,查看修改建议
-
- 并于{{
- dayjs(data.children.back[current].end_time * 1000).format('YYYY-MM-DD HH:mm')
- }}前点击下方回复,按照要求进行回复
-
-
-
-
- {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交,审核中
-
-
- {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交,审核失败
-
-
+
+
diff --git a/src/pages/taskDetails/components/QuickOperation.vue b/src/pages/taskDetails/components/QuickOperation.vue
index 468193b..64ee536 100644
--- a/src/pages/taskDetails/components/QuickOperation.vue
+++ b/src/pages/taskDetails/components/QuickOperation.vue
@@ -42,7 +42,7 @@ const confirmTask = async () => {
提示:点击下方按钮,快速回复
去重新回填
@@ -53,7 +53,7 @@ const confirmTask = async () => {
商家将根据约定扣钱或不结算
-
+
发起申诉
@@ -69,6 +69,7 @@ const confirmTask = async () => {
@@ -84,7 +85,7 @@ const confirmTask = async () => {
商家将根据约定扣钱或不结算
-
+
发起申诉
@@ -97,7 +98,7 @@ const confirmTask = async () => {
提示:点击下方按钮,快速回复
-
+
发起申诉
@@ -119,7 +120,7 @@ const confirmTask = async () => {
将在12时00分00秒后自动同意
-
+
发起申诉
diff --git a/src/pages/taskDetails/components/TaskDetails.vue b/src/pages/taskDetails/components/TaskDetails.vue
index 3ea6051..04bb588 100644
--- a/src/pages/taskDetails/components/TaskDetails.vue
+++ b/src/pages/taskDetails/components/TaskDetails.vue
@@ -4,6 +4,7 @@ import linkIcon from '../../../static/icons/link.png';
import XImage from "../../../components/XImage.vue";
import XSquareCarouselImage from "../../../components/XSquareCarouselImage.vue";
import HF_ICON from "../../../static/icons/icon-wrapper.png";
+import {copy} from "../../../utils/uils.js";
const {data, home} = defineProps({
data: {
@@ -31,7 +32,8 @@ const {data, home} = defineProps({
{{ data.case_url }}
-
复制
@@ -44,7 +46,7 @@ const {data, home} = defineProps({
+ :show-s-y="true">
diff --git a/src/pages/taskDetails/components/replyMessageModal.vue b/src/pages/taskDetails/components/replyMessageModal.vue
index 4be1ac8..4635316 100644
--- a/src/pages/taskDetails/components/replyMessageModal.vue
+++ b/src/pages/taskDetails/components/replyMessageModal.vue
@@ -7,7 +7,7 @@ import {showToast, uploadFile} from "../../../utils/uils.js";
import Api from "../../../api/index.js";
const emits = defineEmits(['success']);
-const {data, backId, intervention, pattern} = defineProps({
+const {data, backId, intervention, pattern, logId} = defineProps({
data: {
type: Object,
default: {},
@@ -16,6 +16,10 @@ const {data, backId, intervention, pattern} = defineProps({
type: Number,
default: null,
},
+ logId: {
+ type: Number,
+ default: null,
+ },
pattern: {
type: Number,
default: null,
@@ -33,16 +37,16 @@ const form = reactive({
});
const upload = async () => {
- const [res] = await uploadFile({
+ const res = await uploadFile({
count: 9,
});
- const {data} = res;
- form.images.push(data);
+ const data = res.map(v => v.data);
+ form.images.push(...data);
}
const success = async () => {
- const api = intervention ? Api.system.intervention : Api.system.addExchangeLog
- const {msg} = await api({...form, backfill_id: backId, pattern: pattern});
+ const api = intervention ? Api.system.intervention : Api.system.addExchangeLog;
+ const {msg} = await api({...form, backfill_id: backId, pattern: pattern, log_id: logId});
showToast(msg);
form.images.length = 0;
form.content = null;
diff --git a/src/pages/taskDetails/index.vue b/src/pages/taskDetails/index.vue
index 476cc70..859f7bd 100644
--- a/src/pages/taskDetails/index.vue
+++ b/src/pages/taskDetails/index.vue
@@ -9,12 +9,13 @@ import XImage from "../../components/XImage.vue";
import Api from "../../api/index.js";
import dayjs from "dayjs";
import XPrompt from "../../components/XPrompt.vue";
-import {numberToCharacter} from "../../utils/uils.js";
+import {copy, numberToCharacter} from "../../utils/uils.js";
import AcceptAssignmentModal from "../../components/AcceptAssignmentModal.vue";
import ICON from "../../static/icons/prompt.png";
import XConfirmModal from "../../components/XConfirmModal.vue";
import LeftMenu from "../../components/LeftMenu.vue";
import {v4} from "uuid";
+import {debounce} from "lodash";
// #ifdef APP-PLUS
// #endif
@@ -144,13 +145,18 @@ const setScroll = (value) => {
scrollState.top = value;
});
}
+
+const hiddenMenu = debounce(() => {
+ showMenu.value = false;
+}, 1200);
+
const scroll = ({detail: {scrollTop}}) => {
const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight;
- console.log('屏幕高度:', screenHeight);
if (scrollTop > screenHeight) {
showMenu.value = true;
+ hiddenMenu();
} else {
showMenu.value = false;
}
@@ -169,7 +175,7 @@ const scroll = ({detail: {scrollTop}}) => {
-
+
{
任务编号:{{ !home && details.is_use === 0 ? details.code : details.children.uid }}
- 复制
+ 复制
diff --git a/src/utils/request.js b/src/utils/request.js
index 1c2ffde..5d8ed8b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ export {BASEURL};
const request = axios.create({
baseURL: BASEURL,
- timeout: '6000',
+ timeout: '60000',
adapter: UniAdapter,
});
diff --git a/src/utils/uils.js b/src/utils/uils.js
index 0be77d8..a2ec48e 100644
--- a/src/utils/uils.js
+++ b/src/utils/uils.js
@@ -134,9 +134,9 @@ export const numberToCharacter = (number) => {
return ['一', '二', '三', '四', '五'][number];
}
-export const toWXMiniApp = (id) => {
+export const toWXMiniApp = (id, task_children_id) => {
const {token} = useUserStore();
- window.open(`weixin://dl/business/?appid=${import.meta.env.VITE_APP_ID}&path=pages/index/index&env_version=${import.meta.env.VITE_APP_VERSION}&query=${encodeURIComponent(`id=${id}&token=${token}`)}`);
+ window.open(`weixin://dl/business/?appid=${import.meta.env.VITE_APP_ID}&path=pages/index/index&env_version=${import.meta.env.VITE_APP_VERSION}&query=${encodeURIComponent(`id=${id}&task_children_id=${task_children_id}&token=${token}`)}`);
}
export const uploadFile = ({count}) => {