Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/index.html # sparkrc.js

Merge remote-tracking branch 'origin/master'
# Conflicts: # dist/index.html # sparkrc.js
9753c719 · haiyoucuv · 468f3320 · 943636eb · 9753c719 · 9753c719
Commit 9753c719 authored Mar 31, 2025 by haiyoucuv
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 16 deletions

index.html dist/index.html +2 -2

sparkrc.js sparkrc.js +2 -2

task.js src/store/task.js +4 -12

No files found.
--- a/dist/index.html
+++ b/dist/index.html
@@ -63,6 +63,6 @@ if (CFG.env == "test") {
 }
 if (!getUrlParam("appID")) {
  // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
-}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1743436630289/styles/vendors.07ec7132684e7283ef1f.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1743436630289/styles/main.07ec7132684e7283ef1f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
+}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1743428492114/styles/vendors.68d25a527576aaeb9b8d.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1743428492114/styles/main.68d25a527576aaeb9b8d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
-CFG.___G___ = 'origin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(push)%3Bmaster%3Bhaiyoucuv%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743436630289/js/runtime-main.09b2def7.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743436630289/js/vendors.0d0d212b.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743436630289/js/main.53074f67.js" crossorigin="anonymous"></script></body></html>
+CFG.___G___ = 'yujiating%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(push)%3Bmaster%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743428492114/js/runtime-main.c74062e6.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743428492114/js/vendors.1dc2ff51.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1743428492114/js/main.cec4e77a.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
--- a/sparkrc.js
+++ b/sparkrc.js
@@ -9,6 +9,6 @@ module.exports ={
  "IMAGE_Q1": 0.6,
  "IMAGE_Q2": 0.8,
  "RES_PATH": "/src/assets/",
-  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1743436612107",
+  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1743401755492",
-  "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1743436630289/js"
+  "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1743428492114/js"
 }
\ No newline at end of file
--- a/src/store/task.js
+++ b/src/store/task.js
@@ -93,7 +93,7 @@ const taskStore = makeAutoObservable({
        } else {
          // app
          taskStore.setCurTask(item);
-          saveCookies();
+          await saveCookies();
          const thirdBrowseParams = {
            hyper_link: jumpUrl,
            is_back: "true",
@@ -170,17 +170,9 @@ const taskStore = makeAutoObservable({
    if(item?.jumpUrl && item?.jumpUrl !== '/' && code.indexOf(TASK_CODE.SY) > -1) {
+      setTimeout(() => {
        location.href = item?.jumpUrl;
-    }
+      }, 100);
-    if (code.indexOf(TASK_CODE.BROWSE_COMMON) > -1 && isWeChat()) {
-      setTimeout(async () => {
-        await this.getTaskList();
-        // await store.getSalesManIndex();
-      }, 1500);
-    } else {
-      await this.getTaskList();
-      // await store.getSalesManIndex();
    }
    return res;