Merge branch 'dev'

src/views/QuestManage/_questList/config.js

@@ -3,6 +3,7 @@ export function statusFormatter(row) {
         case 0: return '未上线';
         case 1: return '已上线';
         case 2: return '已结束';
+        case 3: return '已结算';
         default: return '';
     }
 };

src/views/QuestManage/_transformResult/index.vue

@@ -28,6 +28,14 @@
                 <div class="title-style">总推荐数</div>
                 <div class="number-style">{{transformData.recommendNumSum}}</div>
             </div>
+            <div class="top-number-item">
+                <div class="title-style">已接受人数</div>
+                <div class="number-style">{{transformData.taskUserNum}}</div>
+            </div>
+            <div class="top-number-item">
+                <div class="title-style">未接受人数</div>
+                <div class="number-style">{{transformData.taskUserSum - transformData.taskUserNum}}</div>
+            </div>
         </div>
         <div class="bottom-list">
             <h3 class="top-title">传播数据</h3>
@@ -70,16 +78,22 @@ export default defineComponent({
             activeId
         }
     },
-    created() {
+    activated() {
         this.getApi();
     },
+    // created() {
+    //     this.getApi();
+    // },
     methods: {
         getApi() {
             if(this.$route.query.id) {
                 this.proxy.$post("/task/taskEffect", {id: this.$route.query.id}).then(res => {
                     const data = res.data;
-                    this.transformData = data.taskEffect;
+                    this.transformData = data;
-                    this.transformList = data.userEffectList;
+                }).catch(() => {});
+                this.proxy.$post("/task/taskEffectData", {id: this.$route.query.id}).then(res => {
+                    const data = res.data;
+                    this.transformList = data;
                 }).catch(() => {});
             };
         },

src/views/QuestManage/_transformResultDetail/index.vue

@@ -76,9 +76,9 @@ export default defineComponent({
     activated() {
         this.getApi();
     },
-    created() {
+    // created() {
-        this.getApi();
+    //     this.getApi();
-    },
+    // },
     methods: {
         getApi() {
             if(this.$route.query.id) {