Commit 612a66b2 authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents 6aa6bca7 061df709
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<link rel="dns-prefetch" href="//yun.duiba.com.cn" /> <link rel="dns-prefetch" href="//yun.duiba.com.cn" />
<link rel="preconnect" href="//embedlog.duiba.com.cn"> <link rel="preconnect" href="//embedlog.duiba.com.cn">
<title>模拟理财 月度争霸赛</title> <title>模拟理财 月度争霸赛</title>
<script type="text/javascript"> <script type="text/javascript">
if (localStorage && localStorage.isWebp) { if (localStorage && localStorage.isWebp) {
document document
.getElementsByTagName('html')[0] .getElementsByTagName('html')[0]
.setAttribute('duiba-webp', 'true'); .setAttribute('duiba-webp', 'true');
} }
</script> </script>
<script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script> <script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- 华夏银行app文件 --> <!-- 华夏银行app文件 -->
<script src="//yun.duiba.com.cn/polaris/hxbExtLib.min.f2e3022c5ce5dd92689bff0a5b6c5cb0e9193cd1.js"></script> <script src="//yun.duiba.com.cn/polaris/hxbExtLib.min.f2e3022c5ce5dd92689bff0a5b6c5cb0e9193cd1.js"></script>
<script> <script>
var CFG = CFG || {}; var CFG = CFG || {};
CFG.projectId = location.pathname.split('/')[2] || '1'; CFG.projectId = location.pathname.split('/')[2] || '1';
function getUrlParam(name) { function getUrlParam(name) {
var search = window.location.search; var search = window.location.search;
var matched = search var matched = search
.slice(1) .slice(1)
.match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')); .match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
return search.length ? matched && matched[2] : null; return search.length ? matched && matched[2] : null;
} }
CFG.appID = '${APPID}'; CFG.appID = '${APPID}';
CFG.domain = location.origin CFG.domain = location.origin
// 渠道 // 渠道
CFG.channel = getUrlParam("channel"); CFG.channel = getUrlParam("channel");
// 首页 // 首页
CFG.index = '/projectx/' + CFG.projectId + '/index.html?appID=' + CFG.appID + '&channel=' + CFG.channel; CFG.index = '/projectx/' + CFG.projectId + '/index.html?appID=' + CFG.appID + '&channel=' + CFG.channel;
// 提示弹窗二维码短链链接(目的页是 首页xx/index.html?off=1) 线上正式 TODO 域名记得改为dexfu的 // 提示弹窗二维码短链链接(目的页是 首页xx/index.html?off=1) 线上正式 TODO 域名记得改为dexfu的
CFG.prizePageQrcodeUrl = CFG.domain + CFG.index + "&off=1"; CFG.prizePageQrcodeUrl = CFG.domain + CFG.index + "&off=1";
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
} }
</script> </script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/index-CWIEhytt.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/index-BkjzDsT0.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/vendor-Cw84r4Fx.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/vendor-pyrxJLW_.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/vendor-BQh5NVNk.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/index-BUyZeZc_.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/index-kht3jH5r.css">
<script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script> <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();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> <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> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<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>!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="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/polyfills-legacy-D0AVcSo7.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/polyfills-legacy-D0AVcSo7.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1752054953710/assets/index-legacy-C16yZ2_Q.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script> <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1752113737338/assets/index-legacy-BsFR41Zb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body> </body>
</html> </html>
...@@ -137,7 +137,7 @@ export default [ ...@@ -137,7 +137,7 @@ export default [
return { return {
"code": "magna laborum amet", "code": "magna laborum amet",
"data": { "data": {
"code": 0, // 状态码(0 表示成功 0100 短信验证码发送失败) "resCode": "0000",
"errorMsg": '错误信息', // 错误信息 "errorMsg": '错误信息', // 错误信息
}, },
"message": "nostrud aliqua irure dolore mollit", "message": "nostrud aliqua irure dolore mollit",
......
...@@ -1686,7 +1686,7 @@ packages: ...@@ -1686,7 +1686,7 @@ packages:
resolution: {integrity: sha512-QcsKfi9PSmV9LI4WVCQjQ11FvVsGFp7AfvSw7P96VIiLLaAEzoKsVgpvMxa27iG4L3FYaLjkEUCsOgXLWxiR5Q==} resolution: {integrity: sha512-QcsKfi9PSmV9LI4WVCQjQ11FvVsGFp7AfvSw7P96VIiLLaAEzoKsVgpvMxa27iG4L3FYaLjkEUCsOgXLWxiR5Q==}
'@spark/utils@2.0.88': '@spark/utils@2.0.88':
resolution: {integrity: sha512-+wxYTWja1p1ndOr/Ui+AdnlcGMhWYckm9Ona2wBaw56M71EHMQ/8oU0fWT0QKiOYO8NEiOhM7UiORvQldg5hTQ==, tarball: http://npm.dui88.com:80/@spark%2futils/-/utils-2.0.88.tgz} resolution: {integrity: sha512-+wxYTWja1p1ndOr/Ui+AdnlcGMhWYckm9Ona2wBaw56M71EHMQ/8oU0fWT0QKiOYO8NEiOhM7UiORvQldg5hTQ==}
'@swc/helpers@0.3.17': '@swc/helpers@0.3.17':
resolution: {integrity: sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==} resolution: {integrity: sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==}
...@@ -2526,7 +2526,7 @@ packages: ...@@ -2526,7 +2526,7 @@ packages:
engines: {node: '>=12'} engines: {node: '>=12'}
duiba-utils@1.0.13: duiba-utils@1.0.13:
resolution: {integrity: sha512-VEFzmfiujSZcl40jgRhkuv1lAsvLxhfArENFbI1NXxAz9iihdGOH1SdTektWaH5hrwsWvy/6kB088KzxJ+QvtA==, tarball: http://npm.dui88.com:80/duiba-utils/-/duiba-utils-1.0.13.tgz} resolution: {integrity: sha512-VEFzmfiujSZcl40jgRhkuv1lAsvLxhfArENFbI1NXxAz9iihdGOH1SdTektWaH5hrwsWvy/6kB088KzxJ+QvtA==}
duiba-utils@2.0.2: duiba-utils@2.0.2:
resolution: {integrity: sha512-xik6sEQfyiUBYhJZV96AYzy6/p7bYZAzHUBCPfHOFe6iHHUIibvBW2bA/NgSpvRdQ3+Sb5oWtOoLPGPH5+dtzQ==} resolution: {integrity: sha512-xik6sEQfyiUBYhJZV96AYzy6/p7bYZAzHUBCPfHOFe6iHHUIibvBW2bA/NgSpvRdQ3+Sb5oWtOoLPGPH5+dtzQ==}
...@@ -2949,10 +2949,10 @@ packages: ...@@ -2949,10 +2949,10 @@ packages:
resolution: {integrity: sha512-iARIBPgcQrwtEr+tALF+rapJ8qSc+Set2GJQl7xT1MQzWaVkFebdJhR3alVlSiUf5U7nAANKuj3aWpwerocD5w==} resolution: {integrity: sha512-iARIBPgcQrwtEr+tALF+rapJ8qSc+Set2GJQl7xT1MQzWaVkFebdJhR3alVlSiUf5U7nAANKuj3aWpwerocD5w==}
html-observer@1.0.5: html-observer@1.0.5:
resolution: {integrity: sha512-mAEB5Pu/AxJl0cRrK2HB37h7U98FHy7vungNJSFvczNjx6Rd81YUkDLT6aAGLaX37+ulDwwLqJmY1r01A22aQQ==, tarball: http://npm.dui88.com:80/html-observer/-/html-observer-1.0.5.tgz} resolution: {integrity: sha512-mAEB5Pu/AxJl0cRrK2HB37h7U98FHy7vungNJSFvczNjx6Rd81YUkDLT6aAGLaX37+ulDwwLqJmY1r01A22aQQ==}
html-shot@1.0.32: html-shot@1.0.32:
resolution: {integrity: sha512-to8GOLqWSskBLd1b7AMGIyK/KWNi+b+fWpYsL3xfZiLtVqVp4o7a8MhNIsVgDTLL0MnUphyS+3eaRi+fY2jt2w==, tarball: http://npm.dui88.com:80/html-shot/-/html-shot-1.0.32.tgz} resolution: {integrity: sha512-to8GOLqWSskBLd1b7AMGIyK/KWNi+b+fWpYsL3xfZiLtVqVp4o7a8MhNIsVgDTLL0MnUphyS+3eaRi+fY2jt2w==}
html2canvas@1.4.1: html2canvas@1.4.1:
resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==} resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
...@@ -3181,7 +3181,7 @@ packages: ...@@ -3181,7 +3181,7 @@ packages:
resolution: {integrity: sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=} resolution: {integrity: sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=}
js-md5@0.7.3: js-md5@0.7.3:
resolution: {integrity: sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=, tarball: http://npm.dui88.com:80/js-md5/-/js-md5-0.7.3.tgz} resolution: {integrity: sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=}
js-tokens@4.0.0: js-tokens@4.0.0:
resolution: {integrity: sha1-GSA/tZmR35jjoocFDUZHzerzJJk=} resolution: {integrity: sha1-GSA/tZmR35jjoocFDUZHzerzJJk=}
...@@ -4672,7 +4672,7 @@ packages: ...@@ -4672,7 +4672,7 @@ packages:
engines: {node: '>=8'} engines: {node: '>=8'}
wrap-ansi@7.0.0: wrap-ansi@7.0.0:
resolution: {integrity: sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM=, tarball: http://npm.dui88.com:80/wrap-ansi/-/wrap-ansi-7.0.0.tgz} resolution: {integrity: sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM=}
engines: {node: '>=10'} engines: {node: '>=10'}
wrap-ansi@8.1.0: wrap-ansi@8.1.0:
......
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
box-sizing: border-box; box-sizing: border-box;
.bg { .bg {
width: 750px; width: 750px;
height: 3040px; height: 1624px;
left: 0px; left: 0px;
top: 0px; top: 0px;
position: absolute; position: absolute;
.sparkBg("homePage/bg.png"); .sparkBg("homePage/bg.png");
background-size: 750px 3040px;
} }
.title { .title {
width: 469px; width: 469px;
......
...@@ -100,7 +100,7 @@ class Loginpop extends React.Component { ...@@ -100,7 +100,7 @@ class Loginpop extends React.Component {
} }
const { success, data } = await API.coop_sendCode(params) const { success, data } = await API.coop_sendCode(params)
if (success) { if (success) {
if (data?.code == 0) { if (data?.resCode == "0000") {
Toast.show("验证码已发送"); Toast.show("验证码已发送");
this.setState({ this.setState({
showSend: false, showSend: false,
...@@ -161,12 +161,11 @@ class Loginpop extends React.Component { ...@@ -161,12 +161,11 @@ class Loginpop extends React.Component {
"phoneNumber": loginPhone, "phoneNumber": loginPhone,
"smsCode": loginCode, "smsCode": loginCode,
"origenUid": uid || '', // 华夏理财渠道才拿得到 其他渠道不用传 "origenUid": uid || '', // 华夏理财渠道才拿得到 其他渠道不用传
"redirectUrl": encodeURIComponent(window.location.href) "redirectUrl": CFG.domain + CFG.index
} }
const { success, data } = await API.coop_checkCode(params) const { success, data } = await API.coop_checkCode(params)
if (success) { if (success) {
console.info("华夏理财 绑定手机号 结果>>>>>>>>>>>>>>>>", data) location.replace(data);
// location.replace(data);
} }
} }
......
...@@ -111,10 +111,6 @@ ...@@ -111,10 +111,6 @@
text-align: center; text-align: center;
background-image: linear-gradient(90deg, rgb(240, 87, 68) 0%, rgb(221, 42, 42) 100%); background-image: linear-gradient(90deg, rgb(240, 87, 68) 0%, rgb(221, 42, 42) 100%);
border-radius: 17px; border-radius: 17px;
&.resend {
text-decoration: underline;
}
} }
} }
...@@ -122,13 +118,15 @@ ...@@ -122,13 +118,15 @@
position: absolute; position: absolute;
left: 159px; left: 159px;
top: 857px; top: 857px;
height: 35px; width: 450px;
max-height: 70px;
line-height: 35px; line-height: 35px;
font-size: 24px; font-size: 24px;
color: rgb(155, 155, 155); color: rgb(155, 155, 155);
margin-bottom: 28px; margin-bottom: 28px;
padding-left: 45px; padding-left: 45px;
font-weight: bold; font-weight: bold;
.lineClampN(2);
.check_icon { .check_icon {
position: absolute; position: absolute;
......
...@@ -8,6 +8,7 @@ import { ModalCtrl } from '@/core/ctrls/ModalCtrl'; ...@@ -8,6 +8,7 @@ import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
import { Button } from '@grace/ui'; import { Button } from '@grace/ui';
import store from '@/store/store'; import store from '@/store/store';
import { dateFormatter } from '@/utils/utils'; import { dateFormatter } from '@/utils/utils';
import QRCode from 'qrcode';
@observer @observer
class Tipspop extends React.Component { class Tipspop extends React.Component {
...@@ -25,17 +26,18 @@ class Tipspop extends React.Component { ...@@ -25,17 +26,18 @@ class Tipspop extends React.Component {
/** 获取二维码 */ /** 获取二维码 */
async getCode() { async getCode() {
const { success, data } = await API.getQrcode({ const data = await QRCode.toDataURL(CFG.prizePageQrcodeUrl);
content: CFG.prizePageQrcodeUrl, // const { success, data } = await API.getQrcode({
width: 150, // content: CFG.prizePageQrcodeUrl,
height: 150, // width: 150,
domain: encodeURIComponent('https://hxlc90548-activity.dexfu.cn'), // height: 150,
}) // domain: encodeURIComponent('https://90548-activity.dexfu.cn'),
if (success) { // })
// if (success) {
this.setState({ this.setState({
qrcode: data || '' qrcode: data || ''
}) })
} // }
} }
/** 关闭 */ /** 关闭 */
......
...@@ -121,7 +121,7 @@ class Store { ...@@ -121,7 +121,7 @@ class Store {
async judgeIsWhiteUser() { async judgeIsWhiteUser() {
const { success, data, code, message } = await API.isWhiteUser({ const { success, data, code, message } = await API.isWhiteUser({
"redirectUrl": encodeURIComponent(window.location.href) "redirectUrl": CFG.domain + CFG.index
}); });
if (success) { if (success) {
if (data) { if (data) {
...@@ -346,7 +346,6 @@ class Store { ...@@ -346,7 +346,6 @@ class Store {
const res = await API.getInviteCode({ taskCode: taskCode }) const res = await API.getInviteCode({ taskCode: taskCode })
url += `&inviteCode=${res.data.inviteCode}`; url += `&inviteCode=${res.data.inviteCode}`;
option.link = (domain || location.origin) + CFG.loginMidUrl + encodeURIComponent(url);
initWx(option); initWx(option);
} }
......
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