diff --git a/src/api/system/index.js b/src/api/system/index.js index f8a2a6b..9a5ce36 100644 --- a/src/api/system/index.js +++ b/src/api/system/index.js @@ -163,7 +163,7 @@ const system = { } else { return request({ method: MethodsENUM.POST, - url: "/task/getAllExchangeLog", + url: "/task/getNewExchangeLog", data: data, }); } @@ -439,6 +439,20 @@ const system = { data: {id} }); }, + setAccountStatus: async (data) => { + return request({ + method: MethodsENUM.POST, + url: "/user/setAccountStatus", + data: data + }); + }, + getPlatformImages: async (data) => { + return request({ + method: MethodsENUM.POST, + url: "/Task/getPlatformImages", + data: data + }); + }, } export default system; diff --git a/src/components/AcceptAssignmentModal.vue b/src/components/AcceptAssignmentModal.vue index bb125bf..ad4176c 100644 --- a/src/components/AcceptAssignmentModal.vue +++ b/src/components/AcceptAssignmentModal.vue @@ -77,11 +77,11 @@ const success = debounce(async () => { showToast('请选择帐号'); return; } - const {msg, data: {task_children_id, task_id}} = await Api.system.acceptTask({ + const {data: {task_children_id, task_id}} = await Api.system.acceptTask({ id: details.id, account: selected.value, }); - showToast(msg); + showToast('任务接受成功'); show.value = false; await toPage(`/pages/taskDetails/index?id=${task_id}&task_children_id=${task_children_id}&delta=999`) emits('success'); diff --git a/src/components/MessageCard.vue b/src/components/MessageCard.vue index 6666a42..99a926f 100644 --- a/src/components/MessageCard.vue +++ b/src/components/MessageCard.vue @@ -71,7 +71,7 @@ onMounted(() => { @success="selectActionsheet" :itemList="itemList"> diff --git a/src/components/SelectTimeAsync.vue b/src/components/SelectTimeAsync.vue new file mode 100644 index 0000000..d4c48fa --- /dev/null +++ b/src/components/SelectTimeAsync.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/components/XSelect.vue b/src/components/XSelect.vue index e55408c..680a75d 100644 --- a/src/components/XSelect.vue +++ b/src/components/XSelect.vue @@ -20,7 +20,7 @@ const modelValue = defineModel(); const change = ({detail: {value}}) => { modelValue.value = list.filter(v => !v.hidden)[value].id; - emits('change', modelValue.value); + emits('change', list.filter(v => !v.hidden)[value].id); } onMounted(() => { diff --git a/src/pages/accountManagement/index.vue b/src/pages/accountManagement/index.vue index 506cee4..5e4e684 100644 --- a/src/pages/accountManagement/index.vue +++ b/src/pages/accountManagement/index.vue @@ -10,12 +10,13 @@ import PLUSICON from "../../static/icons/plus.png"; import XNav from "../../components/XNav.vue"; import XNoticeBar from "../../components/XNoticeBar.vue"; import {showToast, toPage} from "../../utils/uils.js"; -import {reactive} from "vue"; +import {reactive, ref} from "vue"; import Api from "../../api/index.js"; import {onShow} from "@dcloudio/uni-app"; import {useSystemStore} from "../../pinia/SystemStore/index.js"; import XPrompt from "../../components/XPrompt.vue"; import XSelect from "../../components/XSelect.vue"; +import SelectTimeAsync from "../../components/SelectTimeAsync.vue"; const SystemStore = useSystemStore(); const BASE = [ @@ -45,6 +46,7 @@ const BASE = [ icon: TTICON, }, ]; +const SelectTimeAsyncRef = ref(); const list = reactive([]); const dataList = reactive([]); @@ -87,11 +89,20 @@ const deleteItem = async (id) => { } const changeStatus = async (value, item) => { - const {msg} = await Api.system.editAccount({ - ...item, - status: value, - }); - showToast(msg); + let abnormaltime = null; + if (value === 2) { + abnormaltime = await SelectTimeAsyncRef.value.open(); + } + try { + const {msg} = await Api.system.setAccountStatus({ + ...item, + status: value, + abnormaltime: abnormaltime, + }); + showToast(msg); + } finally { + await getData(); + } } @@ -99,6 +110,7 @@ const changeStatus = async (value, item) => { + {{ v.status_text }} - @@ -162,7 +181,8 @@ const changeStatus = async (value, item) => { {{ v.status_text }} - diff --git a/src/pages/addAccount/index.vue b/src/pages/addAccount/index.vue index 815d7bd..2dae718 100644 --- a/src/pages/addAccount/index.vue +++ b/src/pages/addAccount/index.vue @@ -11,6 +11,8 @@ import {backPage, showToast} from "../../utils/uils.js"; import {onLoad} from "@dcloudio/uni-app"; import XDateTime from "../../components/XDateTime.vue"; import {useSystemStore} from "../../pinia/SystemStore/index.js"; +import XImage from "../../components/XImage.vue"; +import XLink from "../../components/XLink.vue"; const SystemStore = useSystemStore(); @@ -60,6 +62,14 @@ const getSelect = async () => { data: data, } } +const ZYObj = reactive({ + images1: [], + images2: [], +}); +const changeP = async () => { + const {data} = await Api.system.getPlatformImages({id: form.pid}); + Object.assign(ZYObj, data); +}