Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5

src/views/old_mini/modify_work/completedWork.vue

@@ -450,7 +450,13 @@ const onConfirmExecuteTime = (date) => {
 const handleUploadSuccess = () => {
     if (isGoBack.value) {
         isGoBack.value = false;
-        router.back();
+        if(showBack.value){
+            router.replace({
+                path: "/task_condition?active=1",
+            });
+        }else{
+            router.back();
+        }
     } else {
         getDetail(queryRecordId.value);
     }
@@ -465,7 +471,7 @@ const toList = (val) => {
 const handleClose = () => {
     if(showBack.value){
         router.replace({
-            path: "/task_condition",
+            path: "/task_condition?active=1",
         });
     }else{
         router.back();

src/views/old_mini/task_condition/index.vue

@@ -20,6 +20,9 @@ import { Tab, Tabs } from "vant";
 import interact from "./components/interact.vue";
 import systemReminder from "../farm_manage/components/systemReminder.vue";
 import task from "./components/task.vue"
+import { useRoute } from "vue-router";
+const route = useRoute();
+
 const active = ref(0);
 const getManagerList = async () => {
     const { data } = await VE_API.mine.listManagerList({ onlyExecutor: true });
@@ -30,6 +33,9 @@ const getManagerList = async () => {
     }
 };
 onMounted(() => {
+    if(route.query.active){
+        active.value = Number(route.query.active);
+    }
     getManagerList();
 });
 </script>