Commit 9753c719 authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/index.html
#	sparkrc.js
parents 468f3320 943636eb
...@@ -63,6 +63,6 @@ if (CFG.env == "test") { ...@@ -63,6 +63,6 @@ if (CFG.env == "test") {
} }
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // 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 \ No newline at end of file
...@@ -9,6 +9,6 @@ module.exports ={ ...@@ -9,6 +9,6 @@ module.exports ={
"IMAGE_Q1": 0.6, "IMAGE_Q1": 0.6,
"IMAGE_Q2": 0.8, "IMAGE_Q2": 0.8,
"RES_PATH": "/src/assets/", "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
...@@ -93,7 +93,7 @@ const taskStore = makeAutoObservable({ ...@@ -93,7 +93,7 @@ const taskStore = makeAutoObservable({
} else { } else {
// app // app
taskStore.setCurTask(item); taskStore.setCurTask(item);
saveCookies(); await saveCookies();
const thirdBrowseParams = { const thirdBrowseParams = {
hyper_link: jumpUrl, hyper_link: jumpUrl,
is_back: "true", is_back: "true",
...@@ -170,17 +170,9 @@ const taskStore = makeAutoObservable({ ...@@ -170,17 +170,9 @@ const taskStore = makeAutoObservable({
if(item?.jumpUrl && item?.jumpUrl !== '/' && code.indexOf(TASK_CODE.SY) > -1) { if(item?.jumpUrl && item?.jumpUrl !== '/' && code.indexOf(TASK_CODE.SY) > -1) {
setTimeout(() => {
location.href = item?.jumpUrl; 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; return res;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment