Skip to content

L
LuzhouLaojiaoSnake_250428
Commit 9d7512e1 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	dist/index.html
parents d1c4e0cd 324a2709
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 69 deletions
dist/index.html
View file @ 9d7512e1
...@@ -32,18 +32,19 @@ ...@@ -32,18 +32,19 @@
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
} }
CFG.loginUrl = 'https://98570-activity.m.dexfu.cn/wechat/access?apk=2vujqg1MJ4A4vogq9e22RzTa7C8S&dbredirect='
</script> </script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747107297841/assets/index-BUsAfQuo.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747105965129/assets/index-BJpTdcF4.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747107297841/assets/vendor-4bkoQjuJ.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747105965129/assets/vendor-_c1K4Poo.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747107297841/assets/vendor-CWeaUrOh.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747105965129/assets/vendor-CWeaUrOh.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747107297841/assets/index-9pbU8r0z.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747105965129/assets/index-BHIjp2kF.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/1747107297841/assets/polyfills-legacy-C2MhNPfJ.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747105965129/assets/polyfills-legacy-C2MhNPfJ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747107297841/assets/index-legacy-BlaxOa_6.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/1747105965129/assets/index-legacy-BPLsTE7z.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body> </body>
</html> </html>
......
index.html
View file @ 9d7512e1
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
} }
CFG.loginUrl = 'https://98570-activity.m.dexfu.cn/wechat/access?apk=2vujqg1MJ4A4vogq9e22RzTa7C8S&dbredirect='
</script> </script>
</head> </head>
<body> <body>
......
project.settings.json
View file @ 9d7512e1
{"proSetting":{"projectxIDs":{"testId":[{"label":"test","value":"pf83a66bf"}],"prodId":[{"label":"线上测试","value":"p6f94589a"},{"label":"线上","value":"p70e6516f"}]},"skinVariables":[],"mockSetting":{"projectId":"","pageId":""}},"envSetting":{},"psdSetting":{"psdFSSetting":true,"psdCenterSetting":true}} {"proSetting":{"projectxIDs":{"testId":[{"label":"test","value":"pf83a66bf"}],"prodId":[{"label":"线上测试","value":"p016124b9"},{"label":"线上","value":"p70e6516f"}]},"skinVariables":[],"mockSetting":{"projectId":"","pageId":""}},"envSetting":{},"psdSetting":{"psdFSSetting":true,"psdCenterSetting":true}}
src/built-in/duiba-utils/utils.ts
View file @ 9d7512e1
...@@ -7,7 +7,7 @@ export function cleanNewUser() { ...@@ -7,7 +7,7 @@ export function cleanNewUser() {
localStorage.removeItem(key); localStorage.removeItem(key);
} }
export function accessLog(pageBizId: number, params?: { remain: number; }) { export function accessLog(pageBizId: number, params?: { remain?: number; join_type?: number }) {
let p = { let p = {
pageBizId, pageBizId,
...params, ...params,
......
src/components/inputinfomodal/inputinfomodal.tsx
View file @ 9d7512e1
...@@ -59,7 +59,7 @@ class Inputinfomodal extends React.Component<InputInfoModalProps, InputInfoModal ...@@ -59,7 +59,7 @@ class Inputinfomodal extends React.Component<InputInfoModalProps, InputInfoModal
return return
} }
let { name, phone, detail,province, city, area } = store let { name, phone, detail, province, city, area } = store
if (province == '北京市' || province == '上海市' || province == '天津市' || province == '重庆市') { if (province == '北京市' || province == '上海市' || province == '天津市' || province == '重庆市') {
city = province city = province
...@@ -74,7 +74,7 @@ class Inputinfomodal extends React.Component<InputInfoModalProps, InputInfoModal ...@@ -74,7 +74,7 @@ class Inputinfomodal extends React.Component<InputInfoModalProps, InputInfoModal
collectCounty: area, collectCounty: area,
collectPhone: phone collectPhone: phone
}) })
if (resp.success && resp.data) { if (resp.success) {
Toast.show("领取成功") Toast.show("领取成功")
ModalCtrl.closeModal() ModalCtrl.closeModal()
// this.props?.receiveSuc && this.props?.receiveSuc() // this.props?.receiveSuc && this.props?.receiveSuc()
......
src/components/posterpop/posterpop.tsx
View file @ 9d7512e1
...@@ -24,14 +24,17 @@ class Posterpop extends React.Component<{}, PosterpopState> { ...@@ -24,14 +24,17 @@ class Posterpop extends React.Component<{}, PosterpopState> {
async componentDidMount() { async componentDidMount() {
const { success, data } = await API.getInviteCode(); const { success, data } = await API.getInviteCode();
if (!success) { return } if (!success) { return }
alert('公众号免登还没拼上 要记得加上') // alert('公众号免登还没拼上 要记得加上')
//https%3A%2F%2F98570-activity.m.dexfu.cn%2Fprojectx%2Fp016124b9%2Findex.html%3FappID%3D98570
let url = location.origin + "/projectx/" + CFG.projectId + "/index.html?appID=" + CFG.appID + "&inviteCode=" + data.inviteCode; let url = location.origin + "/projectx/" + CFG.projectId + "/index.html?appID=" + CFG.appID + "&inviteCode=" + data.inviteCode;
url = CFG.loginUrl + encodeURIComponent(url);
console.info('分享链接', url);
const qrcodeSrc = await QRCode.toDataURL(url); const qrcodeSrc = await QRCode.toDataURL(url);
console.info(qrcodeSrc); console.info(qrcodeSrc);
this.setState({ codeImg: qrcodeSrc }); this.setState({ codeImg: qrcodeSrc });
} }
closePop(){ closePop() {
ModalCtrl.closeModal() ModalCtrl.closeModal()
} }
render() { render() {
...@@ -45,7 +48,7 @@ class Posterpop extends React.Component<{}, PosterpopState> { ...@@ -45,7 +48,7 @@ class Posterpop extends React.Component<{}, PosterpopState> {
// 开始截图 // 开始截图
html2canvas(document.querySelector(".poster"), { useCORS: true }).then(canvas => { html2canvas(document.querySelector(".poster"), { useCORS: true }).then(canvas => {
const base64 = canvas.toDataURL() const base64 = canvas.toDataURL()
console.info('html2canvas',base64) console.info('html2canvas', base64)
this.setState({ this.setState({
shareImg: base64 shareImg: base64
}) })
......
src/pages/HomePage/HomePage.less
View file @ 9d7512e1
...@@ -294,24 +294,24 @@ ...@@ -294,24 +294,24 @@
} }
.tasktit { .tasktit {
width: 260px; width: 260px;
height: 29px; height: 38px;
left: 168px; left: 168px;
top: 56px; top: 56px;
position: absolute; position: absolute;
font-size: 34px; font-size: 34px;
line-height: 29px; line-height: 34px;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
font-weight: bold; font-weight: bold;
.lineClamp1(); .lineClamp1();
} }
.tasksub { .tasksub {
width: 260px; width: 260px;
height: 21px; height: 22px;
left: 170px; left: 170px;
top: 95px; top: 95px;
position: absolute; position: absolute;
font-size: 22px; font-size: 22px;
line-height: 21px; line-height: 22px;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
} }
.taskicon { .taskicon {
......
src/pages/HomePage/HomePage.tsx
View file @ 9d7512e1
...@@ -23,6 +23,7 @@ import Rulepop from '@/components/rulepop/rulepop'; ...@@ -23,6 +23,7 @@ import Rulepop from '@/components/rulepop/rulepop';
import Prizepage from '../prizepage/prizepage'; import Prizepage from '../prizepage/prizepage';
import WxOpenModule from '@/components/wxOpenModule/wxOpenModule'; import WxOpenModule from '@/components/wxOpenModule/wxOpenModule';
import { handleLogClick } from '@/MD'; import { handleLogClick } from '@/MD';
import { accessLog } from '@/built-in/duiba-utils';
@observer @observer
class HomePage extends React.Component<any, any> { class HomePage extends React.Component<any, any> {
...@@ -45,6 +46,7 @@ class HomePage extends React.Component<any, any> { ...@@ -45,6 +46,7 @@ class HomePage extends React.Component<any, any> {
Toast.show("暂无游戏次数哦") Toast.show("暂无游戏次数哦")
return; return;
} }
accessLog(502, { join_type: 1 })
const suc = await gameStore.start(); const suc = await gameStore.start();
if (!suc) return; if (!suc) return;
}) })
...@@ -66,12 +68,14 @@ class HomePage extends React.Component<any, any> { ...@@ -66,12 +68,14 @@ class HomePage extends React.Component<any, any> {
Toast.show('暂无抽奖机会哦') Toast.show('暂无抽奖机会哦')
return; return;
} }
accessLog(502, { join_type: 3 })
ModalCtrl.showModal(Drawpop, {}); ModalCtrl.showModal(Drawpop, {});
}) })
clickShop = () => { clickShop = () => {
console.info('shop') console.info('shop')
// if (!store.judgeActTime()) return; // if (!store.judgeActTime()) return;
// miniGoUrl(store.frontVariable.shopUrl) accessLog(502, { join_type: 2 })
miniGoUrl('')
} }
doTask = _asyncThrottle((item: { code: string; }) => { doTask = _asyncThrottle((item: { code: string; }) => {
if (!store.judgeActTime()) return; if (!store.judgeActTime()) return;
...@@ -89,6 +93,7 @@ class HomePage extends React.Component<any, any> { ...@@ -89,6 +93,7 @@ class HomePage extends React.Component<any, any> {
getTaskPrize = _asyncThrottle(async (item) => { getTaskPrize = _asyncThrottle(async (item) => {
if (!store.judgeActTime()) return; if (!store.judgeActTime()) return;
accessLog(502, { join_type: 4 })
if (item.code == 'login') { if (item.code == 'login') {
handleLogClick(9) handleLogClick(9)
} else if (item.code == 'invite') { } else if (item.code == 'invite') {
...@@ -146,11 +151,11 @@ class HomePage extends React.Component<any, any> { ...@@ -146,11 +151,11 @@ class HomePage extends React.Component<any, any> {
</Button> </Button>
<Button className="shopbtn md6" onClick={this.clickShop}> <Button className="shopbtn md6" onClick={this.clickShop}>
<WxOpenModule <WxOpenModule
id={"sharewxbtn"} id={"shopbtn"}
appid={'wxb3b1041867218f81'} appid={'wxc911dd6c6bc128de'}
username={'gh_706a4c5cb211'} username={'gh_de562905dee7'}
envVersion={'release'} envVersion={'release'}
path={'/pages/unify/unify?orgId=200282401019674482&targetUrl=%2Fpages%2Fcoupon%2Fcoupons-list'}></WxOpenModule> path={'/pages/retail/festival-event/festival-act?id=859442452439264065&orgId=58929495997939712&programId=84796583983972352'}></WxOpenModule>
</Button> </Button>
<Button className="drawbtn md8" onClick={this.clickDraw}> <Button className="drawbtn md8" onClick={this.clickDraw}>
<span className="drawimg"></span> <span className="drawimg"></span>
......
src/pages/prizepage/prizepage.tsx
View file @ 9d7512e1
...@@ -4,11 +4,12 @@ import React from 'react'; ...@@ -4,11 +4,12 @@ import React from 'react';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import './prizepage.less'; import './prizepage.less';
import store from '@/store/store'; import store from '@/store/store';
import { _asyncThrottle } from '@/utils/utils'; import { _asyncThrottle, miniGoUrl } from '@/utils/utils';
import { ModalCtrl } from '@/core/ctrls/ModalCtrl'; import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
import Inputinfomodal from '@/components/inputinfomodal/inputinfomodal'; import Inputinfomodal from '@/components/inputinfomodal/inputinfomodal';
import { PageCtrl } from '@/core/ctrls/PageCtrl'; import { PageCtrl } from '@/core/ctrls/PageCtrl';
import { Button } from '@grace/ui'; import { Button } from '@grace/ui';
import WxOpenModule from '@/components/wxOpenModule/wxOpenModule';
@observer @observer
class Prizepage extends React.Component { class Prizepage extends React.Component {
...@@ -29,8 +30,9 @@ class Prizepage extends React.Component { ...@@ -29,8 +30,9 @@ class Prizepage extends React.Component {
} }
jumpUrl(item) { jumpUrl(item) {
console.log('jumpUrl',item) console.log('jumpUrl', item)
location.href = `/aaw/projectx/takePrize?projectOrderNo=${item.id}`; // location.href = `/aaw/projectx/takePrize?projectOrderNo=${item.id}`;
miniGoUrl('/pages/unify/unify?orgId=200282401019674482&targetUrl=%2Fpages%2Fcoupon%2Fcoupons-list')
} }
back = () => { back = () => {
PageCtrl.backPage() PageCtrl.backPage()
...@@ -47,9 +49,16 @@ class Prizepage extends React.Component { ...@@ -47,9 +49,16 @@ class Prizepage extends React.Component {
<div className="item" key={"prize" + index}> <div className="item" key={"prize" + index}>
<span className="itembg"></span> <span className="itembg"></span>
{ {
item.boolThirdObject ? item.needFillAddress ? <Button className='bindbtn' onClick={()=>this.receive(item)}></Button> item.boolThirdObject ? item.needFillAddress ? <Button className='bindbtn' onClick={() => this.receive(item)}></Button>
: <Button className='gotbtn' ></Button> : <Button className='gotbtn' ></Button>
: <Button className='checkbtn' onClick={()=>this.jumpUrl(item)}></Button> : <Button className='checkbtn' onClick={() => this.jumpUrl(item)}>
<WxOpenModule
id={"prizebtn"}
appid={'wxb3b1041867218f81'}
username={'gh_706a4c5cb211'}
envVersion={'release'}
path={'/pages/unify/unify?orgId=200282401019674482&targetUrl=%2Fpages%2Fcoupon%2Fcoupons-list'}></WxOpenModule>
</Button>
} }
<span className="name">{item.extra.name}</span> <span className="name">{item.extra.name}</span>
<span className="prizeimg"> <span className="prizeimg">
......
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