Skip to content

太
太保-年鉴活动-20250625
Commit b0c75974 authored by 俞嘉婷's avatar 俞嘉婷
Browse files
Options

联调优化

parent d9b31488
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 26 deletions
dist/index.html
View file @ b0c75974
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
}; };
s(), e.addEventListener && i.addEventListener(m, s, !1); s(), e.addEventListener && i.addEventListener(m, s, !1);
})(document, window); })(document, window);
})</script><style></style><script type="module" crossorigin src="./assets/index-a8059815.js"></script><link rel="modulepreload" crossorigin href="./assets/api-55223e67.js"><link rel="stylesheet" href="./assets/api-5a972db1.css"><link rel="stylesheet" href="./assets/index-d54a2e41.css"><script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script><script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script></head><body><div id="root"></div><script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="./assets/js/duiba.js"></script><script>var CFG = {} })</script><style></style><script type="module" crossorigin src="./assets/index-6db85ebe.js"></script><link rel="modulepreload" crossorigin href="./assets/api-c914b43f.js"><link rel="stylesheet" href="./assets/api-5a972db1.css"><link rel="stylesheet" href="./assets/index-4682e55f.css"><script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script><script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script></head><body><div id="root"></div><script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="./assets/js/duiba.js"></script><script>var CFG = {}
function getUrlParam(name) { function getUrlParam(name) {
var search = window.location.search; var search = window.location.search;
...@@ -45,15 +45,19 @@ ...@@ -45,15 +45,19 @@
return search.length ? matched && matched[2] : null; return search.length ? matched && matched[2] : null;
} }
// CFG.activityName = "寻找剧中人活动"; CFG.activityName = "官微-25年活动图鉴";
CFG.channel = getUrlParam("sourceFrom") || sessionStorage.getItem("channel"); CFG.channel = getUrlParam("sourceFrom") || sessionStorage.getItem("channel");
CFG.channel && sessionStorage.setItem("channel", CFG.channel); CFG.channel && sessionStorage.setItem("channel", CFG.channel);
// 生产 // 生产
CFG.sensorUrl = 'https://xnjkfx.cpic.com.cn:8006/sa?project=SXGW'; CFG.sensorUrl = 'https://xnjkfx.cpic.com.cn:8006/sa?project=SXGW';
// 海报二维码
CFG.qrCodeImg = 'https://yun.duiba.com.cn/aurora/assets/86edddb7cb2ab51fc7234a3e62279b2c6bfbc2ff.png'; // TODO
if(location.href.indexOf("duibatest") > -1) { if(location.href.indexOf("duibatest") > -1) {
var vConsole = new VConsole(); var vConsole = new VConsole();
CFG.sensorUrl = 'https://xnjkfxsit.cpic.com.cn/sa?project=SXGW'; CFG.sensorUrl = 'https://xnjkfxsit.cpic.com.cn/sa?project=SXGW';
}</script><script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-79d904a2.js"></script><script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-b07044d6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script></body></html> // 海报二维码
\ No newline at end of file CFG.qrCodeImg = 'https://yun.duiba.com.cn/aurora/assets/86edddb7cb2ab51fc7234a3e62279b2c6bfbc2ff.png';
}</script><script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-45485735.js"></script><script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-dbb60464.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script></body></html>
\ No newline at end of file
mock/home.js
View file @ b0c75974
...@@ -2,7 +2,7 @@ import Mock from "mockjs" ...@@ -2,7 +2,7 @@ import Mock from "mockjs"
export const homeJs = [ export const homeJs = [
{ {
url: '/dbcpic-api/app/login/taibao', //请求地址 url: '/login/taibao', //请求地址
method: 'get', //请求方式 method: 'get', //请求方式
response: () => { response: () => {
return { return {
...@@ -21,7 +21,7 @@ export const homeJs = [ ...@@ -21,7 +21,7 @@ export const homeJs = [
}, },
}, },
{ {
url: '/dbcpic-nj-api/app/activity/index', //请求地址 url: '/activity/index', //请求地址
response: () => { response: () => {
const list = [ const list = [
"//yun.duiba.com.cn/polaris/medal1.c022287fcb0174d828077cb5cf9b9b299d128a6b.png", "//yun.duiba.com.cn/polaris/medal1.c022287fcb0174d828077cb5cf9b9b299d128a6b.png",
...@@ -71,7 +71,7 @@ export const homeJs = [ ...@@ -71,7 +71,7 @@ export const homeJs = [
} }
}, },
{ {
url: '/dbcpic-nj-api/app/activity/futureActivity', //请求地址 url: '/activity/futureActivity', //请求地址
response: () => { response: () => {
return { return {
"ok": true, "ok": true,
...@@ -91,7 +91,7 @@ export const homeJs = [ ...@@ -91,7 +91,7 @@ export const homeJs = [
}, },
}, },
{ {
url: '/dbcpic-api/app/activity/tabQuery', //请求地址 url: '/activity/tabQuery', //请求地址
response: () => { response: () => {
return { return {
"ok": true, "ok": true,
...@@ -126,7 +126,7 @@ export const homeJs = [ ...@@ -126,7 +126,7 @@ export const homeJs = [
} }
}, },
{ {
url: '/dbcpic-api/app/activity/prizeRecords', //请求地址 url: '/activity/prizeRecords', //请求地址
response: () => { response: () => {
return { return {
"ok": true, "ok": true,
...@@ -145,7 +145,7 @@ export const homeJs = [ ...@@ -145,7 +145,7 @@ export const homeJs = [
} }
}, },
{ {
url: '/dbcpic-nj-api/app/activity/userInfo', //请求地址 url: '/activity/userInfo', //请求地址
response: () => { response: () => {
return { return {
"ok": true, "ok": true,
......
src/api/api.js
View file @ b0c75974
...@@ -4,7 +4,7 @@ import request from './request' ...@@ -4,7 +4,7 @@ import request from './request'
export const loginApi = (data) => { export const loginApi = (data) => {
return request({ return request({
method: 'get', method: 'get',
url: '/dbcpic-api/app/login/taibao', url: '/login/taibao',
data data
}) })
} }
...@@ -13,7 +13,7 @@ export const loginApi = (data) => { ...@@ -13,7 +13,7 @@ export const loginApi = (data) => {
export const indexApi = (data) => { export const indexApi = (data) => {
return request({ return request({
method: 'get', method: 'get',
url: '/dbcpic-nj-api/app/activity/index', url: '/activity/index',
data data
}) })
} }
...@@ -21,8 +21,8 @@ export const indexApi = (data) => { ...@@ -21,8 +21,8 @@ export const indexApi = (data) => {
// 未来展品 // 未来展品
export const futureActivityApi = (data) => { export const futureActivityApi = (data) => {
return request({ return request({
method: 'post', method: 'get',
url: '/dbcpic-nj-api/app/activity/futureActivity', url: '/activity/futureActivity',
data data
}) })
} }
...@@ -31,7 +31,7 @@ export const futureActivityApi = (data) => { ...@@ -31,7 +31,7 @@ export const futureActivityApi = (data) => {
export const tabQueryApi = (data) => { export const tabQueryApi = (data) => {
return request({ return request({
method: 'get', method: 'get',
url: '/dbcpic-api/app/activity/tabQuery', url: '/activity/tabQuery',
data data
}) })
} }
...@@ -40,7 +40,7 @@ export const tabQueryApi = (data) => { ...@@ -40,7 +40,7 @@ export const tabQueryApi = (data) => {
export const prizeRecordsApi = (data) => { export const prizeRecordsApi = (data) => {
return request({ return request({
method: 'get', method: 'get',
url: '/dbcpic-api/app/activity/prizeRecords', url: '/activity/prizeRecords',
data data
}) })
} }
...@@ -49,7 +49,7 @@ export const prizeRecordsApi = (data) => { ...@@ -49,7 +49,7 @@ export const prizeRecordsApi = (data) => {
export const userInfoApi = (data) => { export const userInfoApi = (data) => {
return request({ return request({
method: 'get', method: 'get',
url: '/dbcpic-nj-api/app/activity/userInfo', url: '/activity/userInfo',
data data
}) })
} }
\ No newline at end of file
src/api/request.js
View file @ b0c75974
...@@ -16,8 +16,7 @@ import Toast from '../components/toast'; ...@@ -16,8 +16,7 @@ import Toast from '../components/toast';
const service = axios.create({ const service = axios.create({
// baseURL: import.meta.env.MODE != 'dev' ? '/dbcpic-nj-api/app' : '', // mockjs 模拟数据这里必须为空,否则请求报404 baseURL: import.meta.env.MODE != 'dev' ? '/dbcpic-nj-api/app' : '', // mockjs 模拟数据这里必须为空,否则请求报404
baseURL: '', // mockjs 模拟数据这里必须为空,否则请求报404
// baseURL: '/api', // mockjs 模拟数据这里必须为空,否则请求报404 // baseURL: '/api', // mockjs 模拟数据这里必须为空,否则请求报404
method: 'post', method: 'post',
timeout: 20000 timeout: 20000
......
src/assetList.json
View file @ b0c75974
{"preLoadImg":[],"asyncLoadImg":["./assets/common/back.png","./assets/common/close.png","./assets/common/sub_page_bg.png","./assets/common/sub_page_bg_cover.png","./assets/futurePage/btn.png","./assets/futurePage/item_bg.png","./assets/futurePage/prize_img_bg.png","./assets/futurePage/title.png","./assets/homePage/arrow_left.png","./assets/homePage/bg_type1.png","./assets/homePage/bg_type2.png","./assets/homePage/btn_future.png","./assets/homePage/btn_prize.png","./assets/homePage/btn_rule.png","./assets/homePage/btn_share.png","./assets/homePage/mainbtn.png","./assets/homePage/mainbtn_bg.png","./assets/homePage/mainbtn_popover.png","./assets/homePage/tab1.png","./assets/homePage/tab2.png","./assets/homePage/title.png","./assets/lightEndPop/bg.png","./assets/lightEndPop/know_btn.png","./assets/lightGreyPop/bg.png","./assets/lightGreyPop/deng.png","./assets/lightGreyPop/join_btn.png","./assets/lightNewPop/bg.png","./assets/lightNewPop/draw_btn.png","./assets/lightNewPop/prize_box.png","./assets/lightedPop/bg.png","./assets/lightedPop/deng.png","./assets/lightedPop/know_btn.png","./assets/prizePage/item_bg.png","./assets/prizePage/prize_img_bg.png","./assets/prizePage/tab_active_bg.png","./assets/prizePage/title.png","./assets/rulePop/bg.png","./assets/svga/4输出徽章紫色.svga","./assets/svga/6输出徽章绿色.svga","./assets/svga/box.svga","./assets/svga/home.svga","./assets/svga/huadong.svga","./assets/svga/light.svga","./assets/svga/pop.svga","./assets/svga/saoguang.svga"]} {"preLoadImg":[],"asyncLoadImg":["./assets/common/back.png","./assets/common/close.png","./assets/common/sub_page_bg.png","./assets/common/sub_page_bg_cover.png","./assets/futurePage/btn.png","./assets/futurePage/item_bg.png","./assets/futurePage/prize_img_bg.png","./assets/futurePage/title.png","./assets/homePage/arrow_left.png","./assets/homePage/bg_type1.png","./assets/homePage/bg_type2.png","./assets/homePage/btn_future.png","./assets/homePage/btn_prize.png","./assets/homePage/btn_rule.png","./assets/homePage/btn_share.png","./assets/homePage/mainbtn.png","./assets/homePage/mainbtn_bg.png","./assets/homePage/mainbtn_popover.png","./assets/homePage/tab1.png","./assets/homePage/tab2.png","./assets/homePage/title.png","./assets/lightEndPop/bg.png","./assets/lightEndPop/know_btn.png","./assets/lightGreyPop/bg.png","./assets/lightGreyPop/deng.png","./assets/lightGreyPop/join_btn.png","./assets/lightNewPop/bg.png","./assets/lightNewPop/draw_btn.png","./assets/lightNewPop/prize_box.png","./assets/lightedPop/bg.png","./assets/lightedPop/deng.png","./assets/lightedPop/know_btn.png","./assets/posterPop/bg.png","./assets/prizePage/item_bg.png","./assets/prizePage/prize_img_bg.png","./assets/prizePage/tab_active_bg.png","./assets/prizePage/title.png","./assets/rulePop/bg.png","./assets/svga/4输出徽章紫色.svga","./assets/svga/6输出徽章绿色.svga","./assets/svga/box.svga","./assets/svga/home.svga","./assets/svga/huadong.svga","./assets/svga/light.svga","./assets/svga/pop.svga","./assets/svga/saoguang.svga"]}
\ No newline at end of file \ No newline at end of file
src/components/lightEndPop/lightEndPop.jsx
View file @ b0c75974
...@@ -4,6 +4,7 @@ import { observer } from 'mobx-react'; ...@@ -4,6 +4,7 @@ import { observer } from 'mobx-react';
import modalStore from '../../store/modal'; import modalStore from '../../store/modal';
import { sensorMdClick, sensorMdExpouse } from '../../utils/sensorMd'; import { sensorMdClick, sensorMdExpouse } from '../../utils/sensorMd';
import skinStore from '../../store/newSkin'; import skinStore from '../../store/newSkin';
import { _asyncThrottle } from '../../utils/utils';
@observer @observer
class LightEndPop extends Component { class LightEndPop extends Component {
constructor(props) { constructor(props) {
......
src/pages/authPage/authPage.jsx
View file @ b0c75974
...@@ -19,7 +19,7 @@ const AuthPage = () => { ...@@ -19,7 +19,7 @@ const AuthPage = () => {
const res = await loginApi({ const res = await loginApi({
token: getUrlParam("token"), token: getUrlParam("token"),
src: "d8", src: "d8",
redirectUrl: encodeURIComponent(encodeURIComponent(url)), redirectUrl: encodeURIComponent(url),
}); });
if (res.ok) { if (res.ok) {
const { loginFlag, authBaseFlag, interestCollectionFlag, autoLoginUrl, token } = res.data || {}; const { loginFlag, authBaseFlag, interestCollectionFlag, autoLoginUrl, token } = res.data || {};
......
src/pages/homePage/homePage.jsx
View file @ b0c75974
...@@ -56,6 +56,8 @@ class HomePage extends Component { ...@@ -56,6 +56,8 @@ class HomePage extends Component {
// 分享 // 分享
shareHandle = _asyncThrottle(() => { shareHandle = _asyncThrottle(() => {
sensorMdClick("activityClick", { pageName: `年鉴活动首页`, buttonName: '分享' }) sensorMdClick("activityClick", { pageName: `年鉴活动首页`, buttonName: '分享' })
const flag = store.checkActivityStatus();
if (!flag) return;
modalStore.pushPop("PosterPop") modalStore.pushPop("PosterPop")
}) })
...@@ -68,6 +70,9 @@ class HomePage extends Component { ...@@ -68,6 +70,9 @@ class HomePage extends Component {
// 勋章点击 // 勋章点击
medalHandle = (item) => { medalHandle = (item) => {
sensorMdClick("activityClick", { pageName: `年鉴活动首页`, buttonName: item.name }) sensorMdClick("activityClick", { pageName: `年鉴活动首页`, buttonName: item.name })
const flag = store.checkActivityStatus();
if (!flag) return;
const { boolGet, endTime, medalType } = item; const { boolGet, endTime, medalType } = item;
// 勋章活动时间已过 此弹窗只在活动展区逻辑下会出现 // 勋章活动时间已过 此弹窗只在活动展区逻辑下会出现
if (medalType === MEDAL_TYPE.ACTIVITY && endTime < +new Date()) { if (medalType === MEDAL_TYPE.ACTIVITY && endTime < +new Date()) {
......
src/store/index.js
View file @ b0c75974
...@@ -63,18 +63,19 @@ const store = makeAutoObservable({ ...@@ -63,18 +63,19 @@ const store = makeAutoObservable({
const startTime = activityBaseInfo.startTime; const startTime = activityBaseInfo.startTime;
const endTime = activityBaseInfo.endTime; const endTime = activityBaseInfo.endTime;
const now = new Date().getTime(); const now = new Date().getTime();
if (now >= startTime && now <= endTime) {
return true;
}
if (brakeStart && now < startTime) { if (brakeStart && now < startTime) {
Toast('活动暂未开始') Toast('活动暂未开始')
return false;
} }
if (brakeEnd && now > endTime) { if (brakeEnd && now > endTime) {
Toast('活动已经结束') Toast('活动已经结束')
return false;
} }
} else {
Toast('活动异常~')
return false;
} }
Toast('活动异常~') return true;
return false;
}, },
// 跳转至【官微大转盘】 // 跳转至【官微大转盘】
...@@ -83,7 +84,7 @@ const store = makeAutoObservable({ ...@@ -83,7 +84,7 @@ const store = makeAutoObservable({
url: ' /packageTbzy/pages/lottery/lottery?activityCode=DRAWFARM&source_channel=nianjianhuodong' url: ' /packageTbzy/pages/lottery/lottery?activityCode=DRAWFARM&source_channel=nianjianhuodong'
}) })
}, },
userInfo: {}, userInfo: {},
setUserInfo(userInfo) { setUserInfo(userInfo) {
......
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