Skip to content

G
game-h5
Commit 4c581e2d by 曾经
Options

Merge branch 'dev' into test 

* dev:
  分页不触发问题解决
  no message
  no message
  no message
  编译文件
parents 83ec91ec ae68e3a8
Showing with 94 additions and 77 deletions
.gitignore
.DS_Store
node_modules
/dist
# local env files
......
dist/index.html
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>game-h5</title><link rel="stylesheet" href="//at.alicdn.com/t/font_2844902_uelk5f2sikk.css"><link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"><link href="css/chunk-02699ff0.f474007f.css" rel="prefetch"><link href="css/chunk-02af9ba3.9efe9e40.css" rel="prefetch"><link href="css/chunk-06020bd3.6d53863a.css" rel="prefetch"><link href="css/chunk-109d5dec.85b8a6a4.css" rel="prefetch"><link href="css/chunk-27dfcc10.23ca7775.css" rel="prefetch"><link href="css/chunk-33b673b0.767bbfee.css" rel="prefetch"><link href="css/chunk-3608022b.668360ed.css" rel="prefetch"><link href="css/chunk-497026b0.fd6bba20.css" rel="prefetch"><link href="css/chunk-5a091a97.7055b0a4.css" rel="prefetch"><link href="css/chunk-71639305.f21c9ef5.css" rel="prefetch"><link href="css/chunk-7e981379.0ef9b4f4.css" rel="prefetch"><link href="css/chunk-978cfcd0.d87b1781.css" rel="prefetch"><link href="css/chunk-9ddcb942.b38eca06.css" rel="prefetch"><link href="js/chunk-02699ff0.0768b11d.js" rel="prefetch"><link href="js/chunk-02af9ba3.9a46014f.js" rel="prefetch"><link href="js/chunk-06020bd3.cf757ae2.js" rel="prefetch"><link href="js/chunk-109d5dec.cad95bb7.js" rel="prefetch"><link href="js/chunk-27dfcc10.5795e126.js" rel="prefetch"><link href="js/chunk-33b673b0.26d66f23.js" rel="prefetch"><link href="js/chunk-3566c97c.576fe036.js" rel="prefetch"><link href="js/chunk-3608022b.10d4d5ea.js" rel="prefetch"><link href="js/chunk-497026b0.1a121b49.js" rel="prefetch"><link href="js/chunk-4aa552e1.0bdef039.js" rel="prefetch"><link href="js/chunk-5a091a97.8dcc58e7.js" rel="prefetch"><link href="js/chunk-71639305.6c3118a7.js" rel="prefetch"><link href="js/chunk-72be1171.dce6850f.js" rel="prefetch"><link href="js/chunk-7e981379.9dc3793a.js" rel="prefetch"><link href="js/chunk-978cfcd0.1aa29d89.js" rel="prefetch"><link href="js/chunk-9ddcb942.934ea7b5.js" rel="prefetch"><link href="js/app.a3bf01ee.js" rel="preload" as="script"><link href="js/chunk-vendors.37f2d3ab.js" rel="preload" as="script"></head><body><noscript><strong>We're sorry but game-h5 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script><script src="//web-1251519181.file.myqcloud.com/lib/axios/0.18.0/index.min.js"></script><script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script><script src="https://unpkg.com/element-ui/lib/index.js"></script><script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script><script src="js/chunk-vendors.37f2d3ab.js"></script><script src="js/app.a3bf01ee.js"></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>game-h5</title><link rel="stylesheet" href="//at.alicdn.com/t/font_2844902_uelk5f2sikk.css"><link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"><link href="css/chunk-02699ff0.f474007f.css" rel="prefetch"><link href="css/chunk-04dfa5b5.43e9f3d4.css" rel="prefetch"><link href="css/chunk-109d5dec.85b8a6a4.css" rel="prefetch"><link href="css/chunk-2e3c75da.c14680c7.css" rel="prefetch"><link href="css/chunk-33b673b0.767bbfee.css" rel="prefetch"><link href="css/chunk-49090878.4d0b7ae4.css" rel="prefetch"><link href="css/chunk-497026b0.fd6bba20.css" rel="prefetch"><link href="css/chunk-4c0d014c.f4f4b6d1.css" rel="prefetch"><link href="css/chunk-5a091a97.7055b0a4.css" rel="prefetch"><link href="css/chunk-71639305.f21c9ef5.css" rel="prefetch"><link href="css/chunk-86597c4a.a072c5e0.css" rel="prefetch"><link href="css/chunk-8e4483ca.ec8b44d0.css" rel="prefetch"><link href="css/chunk-978cfcd0.d87b1781.css" rel="prefetch"><link href="js/chunk-02699ff0.0914cf16.js" rel="prefetch"><link href="js/chunk-04dfa5b5.8a773ddb.js" rel="prefetch"><link href="js/chunk-109d5dec.9dce40ca.js" rel="prefetch"><link href="js/chunk-2e3c75da.2ad61f1c.js" rel="prefetch"><link href="js/chunk-33b673b0.26d66f23.js" rel="prefetch"><link href="js/chunk-3566c97c.576fe036.js" rel="prefetch"><link href="js/chunk-49090878.b2184e7d.js" rel="prefetch"><link href="js/chunk-497026b0.1a121b49.js" rel="prefetch"><link href="js/chunk-4aa552e1.0bdef039.js" rel="prefetch"><link href="js/chunk-4c0d014c.4b3a949e.js" rel="prefetch"><link href="js/chunk-5a091a97.70b9e4b3.js" rel="prefetch"><link href="js/chunk-71639305.96b53304.js" rel="prefetch"><link href="js/chunk-72be1171.dce6850f.js" rel="prefetch"><link href="js/chunk-86597c4a.6ca6c9ba.js" rel="prefetch"><link href="js/chunk-8e4483ca.d023450c.js" rel="prefetch"><link href="js/chunk-978cfcd0.1aa29d89.js" rel="prefetch"><link href="js/app.dad69869.js" rel="preload" as="script"><link href="js/chunk-vendors.37f2d3ab.js" rel="preload" as="script"></head><body><noscript><strong>We're sorry but game-h5 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script><script src="//web-1251519181.file.myqcloud.com/lib/axios/0.18.0/index.min.js"></script><script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script><script src="https://unpkg.com/element-ui/lib/index.js"></script><script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script><script src="js/chunk-vendors.37f2d3ab.js"></script><script src="js/app.dad69869.js"></script></body></html>
\ No newline at end of file
dist/js/chunk-71639305.6c3118a7.js → dist/js/chunk-71639305.96b53304.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/cmh/theme-1/components/share-img-dialog.vue
......@@ -50,7 +50,7 @@ export default {
myImage2.crossOrigin = "Anonymous";
myImage2.onload = function () {
context.drawImage(myImage2, 400, 824, 120, 120);
context.drawImage(myImage2, 371, 793, 136, 136);
var base64 = canvas.toDataURL("image/png"); //"image/png" 这里注意一下
var img = document.getElementById("shareImage");
img.src = base64;
......
src/components/cmh/theme-1/components/share-select-dialog.vue
......@@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData">
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData" infinite-scroll-distance="10">
<div class="iconfont icon-duobianxing"></div>
<div class="info">
<div class="title">助力成功记录</div>
......
src/components/cmh/theme-1/index.vue
......@@ -71,7 +71,7 @@
class="text-box"
v-if="playNumberObj && playNumberObj.playNumberFlag"
>
<div class="text">{{ playNumberObj.playNumber }}</div>
<div class="text number">{{ playNumberObj.playNumber }}</div>
<img class="text-shadow" src="./images/circle_bg.png" />
<img class="title-image" src="./images/剩余次数.png" />
</div>
......@@ -183,39 +183,39 @@ export default {
boxList: [
{
left: "calc(51% - 47px)",
top: "214px",
top: "204px",
},
{
left: "calc(33% - 47px)",
top: "262px",
top: "252px",
},
{
left: "calc(66% - 47px)",
top: "258px",
top: "248px",
},
{
left: "calc(16% - 47px)",
top: "307px",
top: "297px",
},
{
left: "calc(52% - 47px)",
top: "306px",
top: "296px",
},
{
left: "calc(84% - 47px)",
top: "307px",
top: "297px",
},
{
left: "calc(35% - 47px)",
top: "351px",
top: "341px",
},
{
left: "calc(68% - 47px)",
top: "355px",
top: "345px",
},
{
left: "calc(53% - 47px)",
top: "400px",
top: "390px",
},
],
swiperOptions: {
......@@ -439,7 +439,7 @@ export default {
<style scoped>
.bg-image {
position: fixed;
position: absolute;
left: 0;
top: 0;
width: 100%;
......@@ -455,7 +455,7 @@ export default {
height: 30px;
line-height: 30px;
border-radius: 50%;
position: absolute;
position: fixed;
top: 20px;
left: 20px;
z-index: 10;
......@@ -561,7 +561,7 @@ export default {
}
.box-box {
height: 531px;
height: 501px;
width: 100%;
position: relative;
}
......@@ -633,7 +633,10 @@ export default {
position: relative;
z-index: 2;
}
.text-box .text.number{
font-size: 40px;
line-height: 20px;
}
.text-box .text-shadow {
position: absolute;
left: 50%;
......
src/components/cmh/theme-1/my-reward.vue
......@@ -14,6 +14,7 @@
<div
class="infinite-list"
v-infinite-scroll="loadData"
infinite-scroll-distance="10"
:style="{ height: windowHeight - 50 - 20 - 34 - 10 + 'px' }"
v-if="list && list.length"
>
......
src/components/cmh/theme-2/components/share-img-dialog.vue
......@@ -50,7 +50,7 @@ export default {
myImage2.crossOrigin = "Anonymous";
myImage2.onload = function () {
context.drawImage(myImage2, 400, 824, 120, 120);
context.drawImage(myImage2, 371, 793, 136, 136);
var base64 = canvas.toDataURL("image/png"); //"image/png" 这里注意一下
var img = document.getElementById("shareImage");
img.src = base64;
......
src/components/cmh/theme-2/components/share-select-dialog.vue
......@@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData">
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData" infinite-scroll-distance="10">
<div class="iconfont icon-duobianxing"></div>
<div class="info">
<div class="title">助力成功记录</div>
......
src/components/cmh/theme-2/index.vue
......@@ -71,7 +71,7 @@
class="text-box"
v-if="playNumberObj && playNumberObj.playNumberFlag"
>
<div class="text">{{ playNumberObj.playNumber }}</div>
<div class="text number">{{ playNumberObj.playNumber }}</div>
<img class="text-shadow" src="./images/circle_bg.png" />
<img class="title-image" src="./images/剩余次数.png" />
</div>
......@@ -437,7 +437,7 @@ export default {
<style scoped>
.bg-image {
position: fixed;
position: absolute;
left: 0;
top: 0;
width: 100%;
......@@ -453,7 +453,7 @@ export default {
height: 30px;
line-height: 30px;
border-radius: 50%;
position: absolute;
position: fixed;
top: 20px;
left: 20px;
z-index: 10;
......@@ -559,7 +559,7 @@ export default {
}
.box-box {
height: 531px;
height: 511px;
width: 100%;
position: relative;
}
......@@ -631,7 +631,10 @@ export default {
position: relative;
z-index: 2;
}
.text-box .text.number{
font-size: 40px;
line-height: 20px;
}
.text-box .text-shadow {
position: absolute;
left: 50%;
......
src/components/cmh/theme-2/my-reward.vue
......@@ -17,6 +17,7 @@
<div
class="infinite-list"
infinite-scroll-distance="10"
v-infinite-scroll="loadData" :style="{height:(windowHeight - 50 - 20 - 34 - 10)+'px'}" v-if="list && list.length">
<div class="reward-item-box" v-for="item in list" :key="item">
<div class="reward-item" @click="toRewardDetail(item)">
......
src/components/cmh/theme-3/components/share-img-dialog.vue
......@@ -50,7 +50,7 @@ export default {
myImage2.crossOrigin = "Anonymous";
myImage2.onload = function () {
context.drawImage(myImage2, 400, 824, 120, 120);
context.drawImage(myImage2, 371, 793, 136, 136);
var base64 = canvas.toDataURL("image/png"); //"image/png" 这里注意一下
var img = document.getElementById("shareImage");
img.src = base64;
......
src/components/cmh/theme-3/components/share-select-dialog.vue
......@@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData">
<div class="cell" v-if="list && list.length" v-infinite-scroll="loadData" infinite-scroll-distance="10">
<div class="iconfont icon-duobianxing"></div>
<div class="info">
<div class="title">助力成功记录</div>
......
src/components/cmh/theme-3/index.vue
......@@ -71,7 +71,7 @@
class="text-box"
v-if="playNumberObj && playNumberObj.playNumberFlag"
>
<div class="text">{{ playNumberObj.playNumber }}</div>
<div class="text number">{{ playNumberObj.playNumber }}</div>
<img class="text-shadow" src="./images/circle_bg.png" />
<img class="title-image" src="./images/剩余次数.png" />
</div>
......@@ -182,41 +182,29 @@ export default {
],
boxList: [
{
left: "calc(51% - 47px)",
top: "214px",
left: "calc(24% - 50px)",
top: "202px",
},
{
left: "calc(33% - 47px)",
top: "262px",
left: "calc(50% - 50px)",
top: "266px",
},
{
left: "calc(66% - 47px)",
top: "258px",
left: "calc(77% - 50px)",
top: "202px",
},
{
left: "calc(16% - 47px)",
top: "307px",
left: "calc(24% - 50px)",
top: "338px",
},
{
left: "calc(52% - 47px)",
top: "306px",
left: "calc(50% - 50px)",
top: "393px",
},
{
left: "calc(84% - 47px)",
top: "307px",
},
{
left: "calc(35% - 47px)",
top: "351px",
},
{
left: "calc(68% - 47px)",
top: "355px",
},
{
left: "calc(53% - 47px)",
top: "400px",
},
left: "calc(77% - 50px)",
top: "338px",
}
],
swiperOptions: {
direction: "vertical",
......@@ -437,7 +425,7 @@ export default {
<style scoped>
.bg-image {
position: fixed;
position: absolute;
left: 0;
top: 0;
width: 100%;
......@@ -453,7 +441,7 @@ export default {
height: 30px;
line-height: 30px;
border-radius: 50%;
position: absolute;
position: fixed;
top: 20px;
left: 20px;
z-index: 10;
......@@ -559,7 +547,7 @@ export default {
}
.box-box {
height: 531px;
height: 501px;
width: 100%;
position: relative;
}
......@@ -632,6 +620,11 @@ export default {
z-index: 2;
}
.text-box .text.number{
font-size: 40px;
line-height: 20px;
}
.text-box .text-shadow {
position: absolute;
left: 50%;
......
src/components/cmh/theme-3/my-reward.vue
......@@ -17,6 +17,7 @@
<div
class="infinite-list"
infinite-scroll-distance="10"
v-infinite-scroll="loadData" :style="{height:(windowHeight - 50 - 20 - 34 - 10)+'px'}" v-if="list && list.length">
<div class="reward-item-box" v-for="item in list" :key="item">
<div class="reward-item" @click="toRewardDetail(item)">
......
src/components/index.vue
......@@ -14,7 +14,6 @@ export default {
};
},
created() {
document.title = "游戏";
this.loadData();
},
methods: {
......
src/components/manager.js
......@@ -154,7 +154,7 @@ export function Manager(component) {
text: "查看规则",
click: () => {
hiddenAlert();
this.toGameRule();
_component.toGameRule();
},
},
],
......@@ -314,18 +314,50 @@ export function Manager(component) {
this.support = async () => {
let query = _component.$route.query;
let conditionObj;
let rule = await getGameRule({
gameId: query.gameId,
enterpriseId: query.enterpriseId,
})
let gameRuleConditionList = rule.gameRuleConditionList || [];
gameRuleConditionList.map((item) => {
let obj = JSON.parse(item.conditionJson);
if (+obj.type == 11 || +obj.type == 12) {
conditionObj = obj;
}
})
if(_component.helpDetail.helpStatus == 3){
showAlert({
show: true,
title: '仅差一步',
content: `很遗憾你已${ conditionObj.type == 12?'关注服务号':'认证' }，无法助力好友 可立即参与游戏，赢取好礼`,
buttonList: [
{
text: "参与游戏赢好礼",
click: () => {
hiddenAlert();
_component.toPlayGame();
},
},
],
cancel: () => {
hiddenAlert();
},
});
return;
}
if(_component.helpDetail.helpStatus == 2){
showAlert({
show: true,
content: "您已助力",
content: `已助力`,
buttonList: [
{
text: "参与游戏赢好礼",
click: () => {
hiddenAlert();
// window.wx.miniProgram
// TODO
_component.toPlayGame();
},
},
......@@ -358,21 +390,6 @@ export function Manager(component) {
});
return;
}
let conditionObj;
let rule = await getGameRule({
gameId: query.gameId,
enterpriseId: query.enterpriseId,
})
let gameRuleConditionList = rule.gameRuleConditionList || [];
gameRuleConditionList.map((item) => {
let obj = JSON.parse(item.conditionJson);
if (+obj.type == 11 || +obj.type == 12) {
conditionObj = obj;
}
})
if (conditionObj.type == 11) {
// 认证
if (+query.isAttest) {
......
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