Commit 6d14de9b authored by 韦燕's avatar 韦燕

Merge branch 'master' of gitlab2.dui88.com:sparkprojects/KWW-520NumberGuessingGame-20250409

parents 80006086 6c69d8e9
import MD from 'spark-utils/out/md/index.js'; import MD from "spark-utils/out/md/index.js";
import { logClick } from "@spark/utils/src-js/md";
import { logClick, logExposure } from "@spark/utils/src-js/md"; import { jsonp } from "@spark/api-base";
let appId = CFG.appID; let appId = CFG.appID;
const dcm = '202.' + CFG.projectId + '.0.0'; const dcm = "202." + CFG.projectId + ".0.0";
const domain = '//embedlog.duiba.com.cn'; const domain = "";
let MDList = [ let MDList = new Array(5).fill("").map((v, i) => {
{ return {
ele: `.test-md1`, ele: `.md${i + 1}`,
data: { data: {
dpm: `${appId}.110.5.1`, dpm: `${appId}.110.${i + 1}.1`,
dcm, dcm,
domain, domain,
appId appId,
}, },
once: false once: false,
} };
]; });
export default () => export default () =>
MD({ MD({
show: MDList, // 曝光 show: MDList, // 曝光
click: MDList // 点击 click: MDList, // 点击
}); });
export function logExposure(params) {
jsonp("/exposure/standard", params);
}
export function handleLogExposure(id, id2 = 1) { export function handleLogExposure(id, id2 = 1) {
logExposure({ logExposure({
dpm: `${appId}.110.${id}.${id2}`, dpm: `${appId}.110.${id}.${id2}`,
......
...@@ -14,6 +14,6 @@ function getUrlParam(name) { ...@@ -14,6 +14,6 @@ function getUrlParam(name) {
CFG.appID = '${APPID}'; CFG.appID = '${APPID}';
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/1744773522639/styles/main.590a43d05532c8cac37e.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/1744796078099/styles/main.d823c0dd4762273e54fc.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___ = 'weiyan%3Bmaster%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2FKWW-520NumberGuessingGame-20250409.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2FKWW-520NumberGuessingGame-20250409.git%20(push)%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744773522639/js/runtime-main.c3c22ae0.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744773522639/js/vendors.5e30bdcb.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744773522639/js/main.c886b954.js" crossorigin="anonymous"></script></body></html> CFG.___G___ = 'origin%09http%3A%2F%2Fgitlab2.dui88.com%2Fsparkprojects%2FKWW-520NumberGuessingGame-20250409%20(fetch)%3Borigin%09http%3A%2F%2Fgitlab2.dui88.com%2Fsparkprojects%2FKWW-520NumberGuessingGame-20250409%20(push)%3Bmaster%3Bwangzhujun%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744796078099/js/runtime-main.94f49d08.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744796078099/js/vendors.4a95563e.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744796078099/js/main.e561297d.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1744773522639/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]); !function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1744796078099/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.c3c22ae0.js.map //# sourceMappingURL=runtime-main.94f49d08.js.map
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
This diff is collapsed.
{"numOfComponents":2451,"numOfProject":2158} {"numOfComponents":5048,"numOfProject":2174}
\ No newline at end of file \ No newline at end of file
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
"version": "3.6.8", "version": "3.6.8",
"dependencies": { "dependencies": {
"@spark/api-base": "^2.0.7", "@spark/api-base": "^2.0.7",
"@spark/dbdomain": "^1.0.25",
"@spark/share": "^2.0.340",
"@spark/svgaplayer": "^2.0.5", "@spark/svgaplayer": "^2.0.5",
"@spark/ui": "^2.0.8", "@spark/ui": "^2.0.8",
"@spark/utils": "^2.0.17", "@spark/utils": "^2.0.17",
...@@ -2592,6 +2594,17 @@ ...@@ -2592,6 +2594,17 @@
"@spark/utils": "^2.0.81" "@spark/utils": "^2.0.81"
} }
}, },
"node_modules/@spark/api-common": {
"version": "2.0.22",
"resolved": "http://npm.dui88.com:80/@spark%2fapi-common/-/api-common-2.0.22.tgz",
"integrity": "sha512-lKTdfDhS38NrgEJaNagk1zgVX69hH8ZAi9vdpD3+G20EI5S+4W7bB/L+G9BpwsltJpeKAhOxnK0d31DGgD2zRg==",
"dependencies": {
"@spark/api-base": "^2.0.7",
"@spark/common-helpers": "^1.0.16",
"@spark/utils": "^2.0.22",
"duiba-utils": "^1.0.6"
}
},
"node_modules/@spark/code-comment": { "node_modules/@spark/code-comment": {
"version": "0.0.1-beta.5", "version": "0.0.1-beta.5",
"resolved": "http://npm.dui88.com:80/@spark%2fcode-comment/-/code-comment-0.0.1-beta.5.tgz", "resolved": "http://npm.dui88.com:80/@spark%2fcode-comment/-/code-comment-0.0.1-beta.5.tgz",
...@@ -2701,6 +2714,12 @@ ...@@ -2701,6 +2714,12 @@
"duiba-utils": "^1.0.6" "duiba-utils": "^1.0.6"
} }
}, },
"node_modules/@spark/dbdomain": {
"version": "1.0.25",
"resolved": "http://npm.dui88.com:80/@spark%2fdbdomain/-/dbdomain-1.0.25.tgz",
"integrity": "sha512-sOiwm3ihBJYpv97SFFfc2EHMCWws8xAxxAx5Q5yTteokvJMQKfoCzWXEm2q42zeITgzEjcoT5BjljnKb/qayGA==",
"license": "MIT"
},
"node_modules/@spark/eslint-plugin-best-practices": { "node_modules/@spark/eslint-plugin-best-practices": {
"version": "0.0.1-beta.3", "version": "0.0.1-beta.3",
"resolved": "http://npm.dui88.com:80/@spark%2feslint-plugin-best-practices/-/eslint-plugin-best-practices-0.0.1-beta.3.tgz", "resolved": "http://npm.dui88.com:80/@spark%2feslint-plugin-best-practices/-/eslint-plugin-best-practices-0.0.1-beta.3.tgz",
...@@ -2754,6 +2773,19 @@ ...@@ -2754,6 +2773,19 @@
"@spark/utils": "^2.0.19" "@spark/utils": "^2.0.19"
} }
}, },
"node_modules/@spark/share": {
"version": "2.0.340",
"resolved": "http://npm.dui88.com:80/@spark%2fshare/-/share-2.0.340.tgz",
"integrity": "sha512-QcsKfi9PSmV9LI4WVCQjQ11FvVsGFp7AfvSw7P96VIiLLaAEzoKsVgpvMxa27iG4L3FYaLjkEUCsOgXLWxiR5Q==",
"license": "MIT",
"dependencies": {
"@spark/api-base": "^2.0.2",
"@spark/api-common": "^2.0.17",
"@spark/utils": "^2.0.63",
"duiba-utils": "^1.0.11",
"light-sdk": "^2.0.24"
}
},
"node_modules/@spark/svgaplayer": { "node_modules/@spark/svgaplayer": {
"version": "2.0.5", "version": "2.0.5",
"resolved": "http://npm.dui88.com:80/@spark%2fsvgaplayer/-/svgaplayer-2.0.5.tgz", "resolved": "http://npm.dui88.com:80/@spark%2fsvgaplayer/-/svgaplayer-2.0.5.tgz",
...@@ -11400,6 +11432,11 @@ ...@@ -11400,6 +11432,11 @@
"resolved": "http://npm.dui88.com:80/libphonenumber-js/-/libphonenumber-js-1.12.6.tgz", "resolved": "http://npm.dui88.com:80/libphonenumber-js/-/libphonenumber-js-1.12.6.tgz",
"integrity": "sha512-PJiS4ETaUfCOFLpmtKzAbqZQjCCKVu2OhTV4SVNNE7c2nu/dACvtCqj4L0i/KWNnIgRv7yrILvBj5Lonv5Ncxw==" "integrity": "sha512-PJiS4ETaUfCOFLpmtKzAbqZQjCCKVu2OhTV4SVNNE7c2nu/dACvtCqj4L0i/KWNnIgRv7yrILvBj5Lonv5Ncxw=="
}, },
"node_modules/light-sdk": {
"version": "2.0.36",
"resolved": "http://npm.dui88.com:80/light-sdk/-/light-sdk-2.0.36.tgz",
"integrity": "sha512-r4OPZbYH9MEMUYXFd+gACyZLI41Jg+7OAwrh2jysKm3QayJqI5xOztJPrT7m1I+LHW56NVGSPpHvLd7wAXgbnw=="
},
"node_modules/lines-and-columns": { "node_modules/lines-and-columns": {
"version": "1.2.4", "version": "1.2.4",
"resolved": "http://npm.dui88.com:80/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "resolved": "http://npm.dui88.com:80/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
}, },
"dependencies": { "dependencies": {
"@spark/api-base": "^2.0.7", "@spark/api-base": "^2.0.7",
"@spark/dbdomain": "^1.0.25",
"@spark/share": "^2.0.340",
"@spark/svgaplayer": "^2.0.5", "@spark/svgaplayer": "^2.0.5",
"@spark/ui": "^2.0.8", "@spark/ui": "^2.0.8",
"@spark/utils": "^2.0.17", "@spark/utils": "^2.0.17",
......
...@@ -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/1744685571710", "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1744795350969",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1744773522639/js" "JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1744796078099/js"
} }
\ No newline at end of file
...@@ -34,7 +34,8 @@ const pageMap = { ...@@ -34,7 +34,8 @@ const pageMap = {
class App extends Component { class App extends Component {
async componentDidMount() { async componentDidMount() {
// 获取前端开发配置,依据项目需要,酌情添加 !!! // 获取前端开发配置,依据项目需要,酌情添加 !!!
// await store.getFrontVariable(); await store.getFrontVariable();
await store.doShare()
} }
render() { render() {
......
...@@ -24,7 +24,7 @@ class Failpop extends React.Component { ...@@ -24,7 +24,7 @@ class Failpop extends React.Component {
} }
render() { render() {
return ( return (
<div className="failpop modal_center"> <div className="failpop modal_center md4">
<span className="bg"></span> <span className="bg"></span>
<Button className="close" onClick={this.closePop}></Button> <Button className="close" onClick={this.closePop}></Button>
<span className="lab">本次我赚了{this.props.popData.score}</span> <span className="lab">本次我赚了{this.props.popData.score}</span>
......
...@@ -33,7 +33,7 @@ class Successpop extends React.Component { ...@@ -33,7 +33,7 @@ class Successpop extends React.Component {
} }
render() { render() {
return ( return (
<div className="successpop modal_center"> <div className="successpop modal_center md3">
<Button className="close" onClick={this.closePop}></Button> <Button className="close" onClick={this.closePop}></Button>
<span className="bg"></span> <span className="bg"></span>
<div className="barbox"> <div className="barbox">
......
...@@ -11,6 +11,7 @@ import { Toast } from '@spark/ui'; ...@@ -11,6 +11,7 @@ import { Toast } from '@spark/ui';
import BarItem from '@src/components/barItem/barItem'; import BarItem from '@src/components/barItem/barItem';
import { RES_PATH } from '../../../sparkrc'; import { RES_PATH } from '../../../sparkrc';
import { SvgaPlayer } from '@spark/svgaplayer'; import { SvgaPlayer } from '@spark/svgaplayer';
import { _asyncThrottle } from '@src/utils/utils';
@observer @observer
class Homepahe extends React.Component { class Homepahe extends React.Component {
...@@ -45,7 +46,7 @@ class Homepahe extends React.Component { ...@@ -45,7 +46,7 @@ class Homepahe extends React.Component {
} }
store.changePage(PAGE_MAP.DETAIL_PAGE) store.changePage(PAGE_MAP.DETAIL_PAGE)
} }
click_StartBtn() { click_StartBtn = _asyncThrottle(() => {
if (!store.checkTime()) { if (!store.checkTime()) {
return return
} }
...@@ -55,7 +56,7 @@ class Homepahe extends React.Component { ...@@ -55,7 +56,7 @@ class Homepahe extends React.Component {
return return
} }
store.startGame() store.startGame()
} })
render() { render() {
return ( return (
<div className="homepahe modal_center"> <div className="homepahe modal_center">
...@@ -70,10 +71,10 @@ class Homepahe extends React.Component { ...@@ -70,10 +71,10 @@ class Homepahe extends React.Component {
} }
<span className="gamebarbg"></span> <span className="gamebarbg"></span>
<BarItem left={88} top={361} scaleNum={1} barInfo={store.homeInfo?.boxInfo} nowScore={store.homeInfo.todayMaxScore}></BarItem> <BarItem left={88} top={361} scaleNum={1} barInfo={store.homeInfo?.boxInfo} nowScore={store.homeInfo.todayMaxScore}></BarItem>
<SvgaPlayer className="startbtn" src={RES_PATH + "svga/1输出首页按钮.svga"} onClick={this.click_StartBtn}></SvgaPlayer> <SvgaPlayer className="startbtn md2" src={RES_PATH + "svga/1输出首页按钮.svga"} onClick={this.click_StartBtn}></SvgaPlayer>
{/* <span className="title"></span> */} {/* <span className="title"></span> */}
<Button className="rule" onClick={this.click_Rule}></Button> <Button className="rule" onClick={this.click_Rule}></Button>
<Button className="rank" onClick={this.click_Rank}></Button> <Button className="rank md1" onClick={this.click_Rank}></Button>
<Button className="detail" onClick={this.click_Detail}></Button> <Button className="detail" onClick={this.click_Detail}></Button>
</div> </div>
); );
......
...@@ -51,15 +51,12 @@ class Rankpage extends React.Component { ...@@ -51,15 +51,12 @@ class Rankpage extends React.Component {
<span className="ownbg"></span> <span className="ownbg"></span>
<span className="ownrank"> <span className="ownrank">
{myRank.index === -1 {myRank.index === -1
? '—' ? (myRank.score === 0 ? '—' : '100+')
: myRank.index > 100 : myRank.index}
? '100+'
: myRank.index
}
</span> </span>
<span className="ownname">{myRank.userName || '口味王用户'}</span> <span className="ownname">{myRank.userName || '口味王用户'}</span>
<span className="ownscore"> <span className="ownscore">
{myRank.index === -1 ? 0 : (myRank.score || 0)} {myRank.score || 0}
</span> </span>
</div> </div>
{hasRankData ? ( {hasRankData ? (
......
...@@ -5,6 +5,8 @@ import { GetCurrSkinId, getCustomShareId } from "@src/utils/utils"; ...@@ -5,6 +5,8 @@ import { GetCurrSkinId, getCustomShareId } from "@src/utils/utils";
import { Toast } from '@spark/ui'; import { Toast } from '@spark/ui';
import modalStore from './modal'; import modalStore from './modal';
import { AESDecrypt, AESEncrypt } from '@src/utils/Crypto'; import { AESDecrypt, AESEncrypt } from '@src/utils/Crypto';
import { getDomain } from '@spark/dbdomain';
import { miniDoShare } from '@src/utils/share';
const skinId = GetCurrSkinId() || getCustomShareId(); const skinId = GetCurrSkinId() || getCustomShareId();
...@@ -58,7 +60,7 @@ const store = makeAutoObservable({ ...@@ -58,7 +60,7 @@ const store = makeAutoObservable({
}, },
checkTime(checkEnd = true) { checkTime(checkEnd = true) {
if (store.homeInfo?.actStartTimestamp > store.timeStamp) { if (store.homeInfo?.actStartTimestamp > store.timeStamp) {
Toasts("活动未开始") Toast("活动未开始")
return false return false
} }
if (checkEnd && store.homeInfo?.actEndTimestamp < store.timeStamp) { if (checkEnd && store.homeInfo?.actEndTimestamp < store.timeStamp) {
...@@ -111,7 +113,23 @@ const store = makeAutoObservable({ ...@@ -111,7 +113,23 @@ const store = makeAutoObservable({
} }
// modalStore.pushPop("Successpop", data) // modalStore.pushPop("Successpop", data)
// modalStore.pushPop("Failpop", data) // modalStore.pushPop("Failpop", data)
},
/** 分享 */
async doShare() {
const { shareInfo } = store.frontVariable;
const domain = await getDomain(); //获取域名
let _url = `${domain}/projectx/${CFG.projectId}/index.html?appID=${CFG.appID}`;
const shareUrl = `${(domain || location.origin)}${CFG.loginMidUrl}${encodeURIComponent(_url)}`;
// 分享方法
console.info(shareInfo)
const _shareInfo = {
title: shareInfo?.title,
desc: shareInfo?.content,
imgUrl: shareInfo?.thumbnail,
link: shareUrl
} }
miniDoShare(_shareInfo)
},
}) })
export default store; export default store;
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