From 534adf126a159866317dd322700c89d95d2cb23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Mon, 23 Jun 2025 14:44:05 +0800
Subject: [PATCH] update

---
 src/components/AcceptAssignmentModal.vue |  7 ++++---
 src/components/XImage.vue                |  3 ++-
 src/components/XNav.vue                  |  8 ++++++--
 src/pages/taskDetails/index.vue          | 16 ++++++++++++----
 src/utils/uils.js                        |  6 ++++--
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/components/AcceptAssignmentModal.vue b/src/components/AcceptAssignmentModal.vue
index 1c3251f..1e5d882 100644
--- a/src/components/AcceptAssignmentModal.vue
+++ b/src/components/AcceptAssignmentModal.vue
@@ -4,7 +4,7 @@ import XModal from "./XModal.vue";
 import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from "vue";
 import PlatformENUM from "../enum/PlatformENUM";
 import Api from "../api/index";
-import {showToast} from "../utils/uils";
+import {showToast, toPage} from "../utils/uils";
 
 const emits = defineEmits(['success']);
 const {details} = defineProps({
@@ -76,12 +76,13 @@ const success = async () => {
         showToast('请选择帐号');
         return;
     }
-    const {msg} = await Api.system.acceptTask({
+    const {msg, data} = await Api.system.acceptTask({
         id: details.id,
         account: selected.value,
     });
     showToast(msg);
     show.value = false;
+    await toPage(`/pages/taskDetails/index?id=${data[1]}&task_children_id=${0}&delta=999`)
     emits('success');
 }
 </script>
@@ -134,7 +135,7 @@ const success = async () => {
                 <template v-else>
                     <view class="!flex flex-col items-center pb-[50rpx]">
                         <image class="!size-[260rpx]" :src="NULLICON"></image>
-                        <view class="test-28r">
+                        <view class="test-28r" v-if="po.status===0">
                             可在【我的】→【账号管理】中添加自媒体账号
                         </view>
                     </view>
diff --git a/src/components/XImage.vue b/src/components/XImage.vue
index 051bbda..0d23ec3 100644
--- a/src/components/XImage.vue
+++ b/src/components/XImage.vue
@@ -36,7 +36,6 @@ defineExpose({
 </script>
 
 <template>
-
     <template v-if="!$slots.default">
         <!-- #ifndef MP-WEIXIN -->
         <image @click="open" v-bind="$attrs" :src="src" mode="aspectFill"></image>
@@ -70,6 +69,8 @@ defineExpose({
             </template>
             <template v-else>
                 <image class="!size-full" :src="src" mode="aspectFit"></image>
+                <image v-if="sy" class="!size-full !absolute left-0 top-0" :src="SY_ICON"
+                       mode="aspectFit"></image>
             </template>
 
 
diff --git a/src/components/XNav.vue b/src/components/XNav.vue
index f8bbefd..22977d2 100644
--- a/src/components/XNav.vue
+++ b/src/components/XNav.vue
@@ -2,10 +2,14 @@
 import {ref} from 'vue';
 import {backPage, isWXWeb} from "../utils/uils.js";
 
-const {showBack} = defineProps({
+const {showBack, delta} = defineProps({
     showBack: {
         type: Boolean,
         default: true
+    },
+    delta: {
+        type: Number,
+        default: 1,
     }
 });
 
@@ -17,7 +21,7 @@ const title = ref(document.title);
         <view class="!flex justify-center items-center w-full h-[100rpx] bg-[#f9f9f9] fixed left-0 top-0 z-[1000]">
             <image
                 v-if="showBack"
-                @click="backPage()"
+                @click="backPage(delta)"
                 class="!w-[9px] !h-[17px] cursor-pointer !absolute left-[50rpx]"
                 src="/static/icons/back.png">
             </image>
diff --git a/src/pages/taskDetails/index.vue b/src/pages/taskDetails/index.vue
index d510b3d..8b00bf2 100644
--- a/src/pages/taskDetails/index.vue
+++ b/src/pages/taskDetails/index.vue
@@ -9,7 +9,7 @@ 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 {numberToCharacter, toPage} from "../../utils/uils.js";
 import AcceptAssignmentModal from "../../components/AcceptAssignmentModal.vue";
 import ICON from "../../static/icons/prompt.png";
 import XConfirmModal from "../../components/XConfirmModal.vue";
@@ -49,6 +49,7 @@ const tabs = computed(() => [
         isDot: details.value?.children.is_read > 0,
     },
 ]);
+const delta = ref(1);
 
 const getData = async (id, task_children_id) => {
     const {data} = await Api.system.getTaskinfo(id || details.value.id, task_children_id || details.value?.children?.id);
@@ -56,9 +57,10 @@ const getData = async (id, task_children_id) => {
 }
 
 onLoad((options) => {
-    const {id, home: _home, tab, task_children_id} = options;
+    const {id, home: _home, tab, task_children_id, delta: _delta} = options;
     home.value = _home === '1';
     if (tab) currentTabs.value = Number(tab);
+    if (delta) delta.value = _delta
     getData(id, task_children_id);
 });
 
@@ -73,13 +75,13 @@ onMounted(() => {
                 mainDetailWidth.value = result[0].width;
             })
     });
-    showInitModal.value = true;
+    if (home.value) showInitModal.value = true;
 })
 </script>
 
 <template>
     <!--任务详情-->
-    <XNav></XNav>
+    <XNav :delta="delta"></XNav>
     <x-notice-bar></x-notice-bar>
 
     <view class="!p-[20rpx] !flex flex-col gap-[20rpx] box-border" v-if="details">
@@ -243,6 +245,12 @@ onMounted(() => {
                             </view>
                         </view>
                     </view>
+                    <view class="block items-center">
+                        <view class="block-title">ip限制:</view>
+                        <view class="block-info">
+                            {{ details.choose_area_arr.join(',') }}
+                        </view>
+                    </view>
                 </view>
             </view>
 
diff --git a/src/utils/uils.js b/src/utils/uils.js
index 2e16012..0be77d8 100644
--- a/src/utils/uils.js
+++ b/src/utils/uils.js
@@ -34,8 +34,10 @@ export const clearObject = (obj) => {
     });
 };
 
-export const backPage = () => {
-    uni.navigateBack().then();
+export const backPage = (delta) => {
+    uni.navigateBack({
+        delta: delta || 1
+    }).then();
 }
 
 export const copy = (context) => {