Skip to content

W
walk_daka_h5
Commit 47579fa5 by 穆启卓
Options

Merge remote-tracking branch 'remotes/origin/dev_yijun' into mutou

parents f0f1c50c 4315661f
Showing with 416 additions and 117 deletions
package-lock.json
...@@ -1577,6 +1577,13 @@ ...@@ -1577,6 +1577,13 @@
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
"dev": true "dev": true
}, },
"asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
"dev": true,
"optional": true
},
"asn1": { "asn1": {
"version": "0.2.4", "version": "0.2.4",
"resolved": "http://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz", "resolved": "http://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz",
...@@ -3516,6 +3523,14 @@ ...@@ -3516,6 +3523,14 @@
"entities": "^1.1.1" "entities": "^1.1.1"
} }
}, },
"dom7": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
"requires": {
"ssr-window": "^1.0.1"
}
},
"domain-browser": { "domain-browser": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz", "resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz",
...@@ -4332,14 +4347,12 @@ ...@@ -4332,14 +4347,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -4354,20 +4367,17 @@ ...@@ -4354,20 +4367,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -4484,8 +4494,7 @@ ...@@ -4484,8 +4494,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -4497,7 +4506,6 @@ ...@@ -4497,7 +4506,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -4512,7 +4520,6 @@ ...@@ -4512,7 +4520,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -4520,14 +4527,12 @@ ...@@ -4520,14 +4527,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -4546,7 +4551,6 @@ ...@@ -4546,7 +4551,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -4627,8 +4631,7 @@ ...@@ -4627,8 +4631,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -4640,7 +4643,6 @@ ...@@ -4640,7 +4643,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4762,7 +4764,6 @@ ...@@ -4762,7 +4764,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5372,6 +5373,13 @@ ...@@ -5372,6 +5373,13 @@
"integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=", "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=",
"dev": true "dev": true
}, },
"image-size": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true,
"optional": true
},
"import-cwd": { "import-cwd": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", "resolved": "http://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
...@@ -5969,6 +5977,64 @@ ...@@ -5969,6 +5977,64 @@
"invert-kv": "^2.0.0" "invert-kv": "^2.0.0"
} }
}, },
"less": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
"dev": true,
"requires": {
"clone": "^2.1.2",
"errno": "^0.1.1",
"graceful-fs": "^4.1.2",
"image-size": "~0.5.0",
"mime": "^1.4.1",
"mkdirp": "^0.5.0",
"promise": "^7.1.1",
"request": "^2.83.0",
"source-map": "~0.6.0"
},
"dependencies": {
"clone": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true
},
"mime": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
"dev": true,
"optional": true
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"optional": true
}
}
},
"less-loader": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
"integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
"dev": true,
"requires": {
"clone": "^2.1.1",
"loader-utils": "^1.1.0",
"pify": "^3.0.0"
},
"dependencies": {
"clone": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true
}
}
},
"loader-runner": { "loader-runner": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz", "resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz",
...@@ -6599,8 +6665,7 @@ ...@@ -6599,8 +6665,7 @@
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz", "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
"dev": true
}, },
"object-copy": { "object-copy": {
"version": "0.1.0", "version": "0.1.0",
...@@ -7606,6 +7671,16 @@ ...@@ -7606,6 +7671,16 @@
"integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
"dev": true "dev": true
}, },
"promise": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"dev": true,
"optional": true,
"requires": {
"asap": "~2.0.3"
}
},
"promise-inflight": { "promise-inflight": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz", "resolved": "http://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz",
...@@ -8692,6 +8767,11 @@ ...@@ -8692,6 +8767,11 @@
"tweetnacl": "~0.14.0" "tweetnacl": "~0.14.0"
} }
}, },
"ssr-window": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
},
"ssri": { "ssri": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "http://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz", "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz",
...@@ -8981,6 +9061,15 @@ ...@@ -8981,6 +9061,15 @@
"util.promisify": "~1.0.0" "util.promisify": "~1.0.0"
} }
}, },
"swiper": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
"requires": {
"dom7": "^2.1.3",
"ssr-window": "^1.0.1"
}
},
"tapable": { "tapable": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz", "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz",
...@@ -9569,6 +9658,15 @@ ...@@ -9569,6 +9658,15 @@
"resolved": "http://registry.npm.taobao.org/vue/download/vue-2.6.8.tgz", "resolved": "http://registry.npm.taobao.org/vue/download/vue-2.6.8.tgz",
"integrity": "sha1-8hy8U2v8FPfR15KhN7sS9p5g6pE=" "integrity": "sha1-8hy8U2v8FPfR15KhN7sS9p5g6pE="
}, },
"vue-awesome-swiper": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz",
"integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==",
"requires": {
"object-assign": "^4.1.1",
"swiper": "^4.0.7"
}
},
"vue-calendar-component": { "vue-calendar-component": {
"version": "2.8.2", "version": "2.8.2",
"resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz", "resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
......
package.json
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"dependencies": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.18.0",
"vue": "^2.6.6", "vue": "^2.6.6",
"vue-awesome-swiper": "^3.1.3",
"vue-calendar-component": "^2.8.2", "vue-calendar-component": "^2.8.2",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.0.1", "vuex": "^3.0.1",
......
src/views/ChallengeDetail.vue
...@@ -34,23 +34,43 @@ ...@@ -34,23 +34,43 @@
</div> </div>
</div> </div>
</div> </div>
<div class="share-btn">邀请好友来参赛</div> <div class="share-btn" @click="inviteFriend">邀请好友来参赛</div>
<ShareModal
v-on:close="closeShareModal"
v-if="showShareModal"
></ShareModal>
</div> </div>
</template> </template>
<script> <script>
import Title from "@/components/Title.vue"; import Title from "@/components/Title.vue";
import ShareModal from "@/components/ShareModal.vue";
import {dakaPay, shareContent, track, liinShare} from "@/components/axios/api";
export default { export default {
name: "ChallengeDetail", name: "ChallengeDetail",
components: { components: {
Title Title,
ShareModal
}, },
data() { data() {
return { return {
pageData: JSON.parse(sessionStorage.getItem('ChallengeDetailData')) pageData: JSON.parse(sessionStorage.getItem('ChallengeDetailData')),
showShareModal: false,
userData: null
} }
}, },
created() { mounted() {
console.log("this.pageType", this.page_type);
if (window["userData"]) {
this.userData = window["userData"];
} else {
let localUserData = localStorage.getItem("bs_userData");
if (localUserData) {
window["userData"] = JSON.parse(localUserData);
this.userData = window["userData"];
}
}
console.log("userData", this.userData);
}, },
methods: { methods: {
goback() { goback() {
...@@ -59,12 +79,77 @@ ...@@ -59,12 +79,77 @@
goOtherPage(pageName) { goOtherPage(pageName) {
this.$router.push({name: pageName}); this.$router.push({name: pageName});
}, },
inviteFriend() {
console.log("inviteFriend");
this.showShareModal = true;
let id = this.userData.id;
// let id = 'yijun';
track("free_contract_share");
let links = `${
location.href.split("#")[0].split("?")[0]}?inviter=${id}&from_type=free_contract&`;
shareContent("free_contract").then(res => {
let result = res.data;
console.log("分享内容", result, links);
let option1 = {
title: result.title, // 分享标题
desc: result.desc, // 分享描述
link: links, // 分享链接
imgUrl: result.img_url, // 分享图标
success: function(res) {
track("free_contract_share_act");
console.log("option1Success", res);
}
};
wx.updateAppMessageShareData(option1);
//微信分享菜单测试
let option2 = {
title: result.title, // 分享标题
desc: result.desc, // 分享描述
link: links, // 分享链接
imgUrl: result.img_url, // 分享图标
success: function(res) {
console.log("option2Success", res);
}
};
let option3 = {
title: result.title, // 分享标题
desc: result.desc, // 分享描述
link: links, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: result.img_url, // 分享图标
success: function(res) {
// 用户点击了分享后执行的回调函数
track("free_contract_share_act");
console.log("option3Success", res);
},
fail: err => {
console.log("option3error", err);
} }
};
wx.onMenuShareAppMessage(option3);
let option4 = {
title: result.title, // 分享标题
link: links, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: result.img_url, // 分享图标
success: function(res) {
console.log("option4Success", res);
},
fail: err => {
console.log("option4error", err);
}
};
// wx.onMenuShareTimeline(option4);
console.log("option", option1, option2, option3, option4);
});
},
closeShareModal() {
this.showShareModal = false;
} }
}
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.partake-challenge-page { .partake-challenge-page {
width: 100%; width: 100%;
min-height: 100vh; min-height: 100vh;
background-color: rgb(70, 88, 149); background-color: rgb(70, 88, 149);
...@@ -86,63 +171,68 @@ ...@@ -86,63 +171,68 @@
display: flex; display: flex;
align-items: center; align-items: center;
position: absolute; position: absolute;
top: .3rem; top: 0.3rem;
right: .22rem; right: 0.22rem;
font-size: .26rem; font-size: 0.26rem;
line-height: 1; line-height: 1;
color: #465895; color: #465895;
img { img {
width: .3rem; width: 0.3rem;
height: .3rem; height: 0.3rem;
margin-right: .1rem; margin-right: 0.1rem;
} }
} }
.game-bonus-container { .game-bonus-container {
width: 6.4rem; width: 6.4rem;
padding: .3rem 0; padding: 0.3rem 0;
box-sizing: border-box; box-sizing: border-box;
background: linear-gradient(90deg, rgba(255, 255, 255, 0), #1A285A, rgba(255, 255, 255, 0)); background: linear-gradient(
90deg,
rgba(255, 255, 255, 0),
#1a285a,
rgba(255, 255, 255, 0)
);
margin-top: 2.38rem; margin-top: 2.38rem;
.bonus-title { .bonus-title {
font-size: .3rem; font-size: 0.3rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
} }
.bonus-amount { .bonus-amount {
font-size: .64rem; font-size: 0.64rem;
line-height: .8; line-height: 0.8;
color: #FFE253; color: #ffe253;
text-align: center; text-align: center;
margin-top: .26rem; margin-top: 0.26rem;
} }
} }
.game-title { .game-title {
font-size: .36rem; font-size: 0.36rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
margin-top: .4rem; margin-top: 0.4rem;
} }
.game-time { .game-time {
font-size: .24rem; font-size: 0.24rem;
line-height: 1; line-height: 1;
color: #D6DFFF; color: #d6dfff;
padding: .12rem .38rem; padding: 0.12rem 0.38rem;
border-radius: .48rem; border-radius: 0.48rem;
background: #556CB6; background: #556cb6;
margin-top: .14rem; margin-top: 0.14rem;
} }
.hr { .hr {
width: 3rem; width: 3rem;
height: .01rem; height: 0.01rem;
background: #6F82C3; background: #6f82c3;
margin-top: .5rem; margin-top: 0.5rem;
} }
.game-info-container { .game-info-container {
width: 6rem; width: 6rem;
background: #3D4F8F; background: #3d4f8f;
margin-top: .5rem; margin-top: 0.5rem;
.game-info-section { .game-info-section {
width: 100%; width: 100%;
height: 1.34rem; height: 1.34rem;
...@@ -152,41 +242,41 @@ ...@@ -152,41 +242,41 @@
flex: 1; flex: 1;
position: relative; position: relative;
&:last-child:after { &:last-child:after {
content: ''; content: "";
width: .02rem; width: 0.02rem;
height: .4rem; height: 0.4rem;
background: #A2B4EE; background: #a2b4ee;
position: absolute; position: absolute;
left: 0; left: 0;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }
.item-value { .item-value {
font-size: .4rem; font-size: 0.4rem;
line-height: .8; line-height: 0.8;
color: #fff; color: #fff;
text-align: center; text-align: center;
} }
.item-key { .item-key {
font-size: .26rem; font-size: 0.26rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
margin-top: .18rem; margin-top: 0.18rem;
} }
} }
} }
} }
.share-btn { .share-btn {
width: 5.6rem; width: 5.6rem;
border-radius: .92rem; border-radius: 0.92rem;
background: #1FDBB1; background: #1fdbb1;
font-size: .4rem; font-size: 0.4rem;
line-height: .92rem; line-height: 0.92rem;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
margin-top: 2.24rem; margin-top: 2.24rem;
} }
} }
</style> </style>
src/views/Rule.vue
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div class="rule-page"> <div class="rule-page">
<Title class="page-title" title="活动规则与协议" titleColor="#000" @goback="goback" show_back="true" arrowColor="black"></Title> <Title class="page-title" title="活动规则与协议" titleColor="#000" @goback="goback" show_back="true" arrowColor="black"></Title>
<div class="section-title">挑战玩法：</div> <div class="section-title">挑战玩法：</div>
<img class="game-way-img" src="../images/Rule/img_rule.png"> <img class="game-way-img" v-if="bushuType == 1" src="../images/Rule/img_rule_0.png">
<img class="game-way-img" v-if="bushuType == 2" src="../images/Rule/img_rule_1.png">
<img class="game-way-img" v-if="bushuType == 3" src="../images/Rule/img_rule_2.png">
<div class="section-title">参赛须知：</div> <div class="section-title">参赛须知：</div>
<div class="content1-container"> <div class="content1-container">
<div class="content1-item">• 为督促大家运动，每位用户报名均需提供契约金</div> <div class="content1-item">• 为督促大家运动，每位用户报名均需提供契约金</div>
...@@ -35,8 +37,15 @@ ...@@ -35,8 +37,15 @@
}, },
data() { data() {
return { return {
bushuType: 0
}; };
}, },
mounted(){
let LastLevel = Number(sessionStorage.getItem('bushuType'))
if(LastLevel){
this.bushuType = LastLevel
}
},
methods: { methods: {
goback() { goback() {
history.go(-1); history.go(-1);
......
src/views/SignUp.vue
...@@ -42,37 +42,54 @@ ...@@ -42,37 +42,54 @@
<script> <script>
import NoticeBonus from "@/components/NoticeBonus.vue"; import NoticeBonus from "@/components/NoticeBonus.vue";
import { import Free from "@/components/Free.vue";
track, import Modal from "@/components/Modal.vue";
userCards, import PayFailModal from "@/components/PayFailModal.vue";
daka_index import { dakaPay, track, userCards, daka_index } from "@/components/axios/api";
} from "@/components/axios/api";
export default { export default {
name: "SignUp", name: "SignUp",
components: { components: {
NoticeBonus NoticeBonus,
Modal,
Free,
PayFailModal
}, },
data() { data() {
return { return {
contract_data: {}, contract_data: {},
showFreeModal: false,
modalTitle: "",
modalDesc: "",
modalShown: false,
current_date: {}, current_date: {},
isShowPayFail: false,
isFollow: false, isFollow: false,
gameList: [], gameList: [],
choosedLevel: 2 choosedLevel: 1
} };
}, },
created() { created() {
this.getPageData(); this.getPageData();
}, },
mounted() {
//获取步数tab缓存
let LastLevel = Number(sessionStorage.getItem("bushuType"));
if (LastLevel) {
this.choosedLevel = LastLevel;
}else{
sessionStorage.setItem("bushuType", this.choosedLevel);
}
},
methods: { methods: {
chooseGameLevel(level) { chooseGameLevel(level) {
sessionStorage.setItem("bushuType", level);
this.choosedLevel = level; this.choosedLevel = level;
this.getPageData(level); this.getPageData(level);
}, },
goOtherPage(pageName) { goOtherPage(pageName) {
this.$router.push({name: pageName}); this.$router.push({ name: pageName });
}, },
goWhereDetail(item) { goWhereDetail(item) {
if (item.status===1&&item.already_join===1) { // 已报名 if (item.status===1&&item.already_join===1) { // 已报名
...@@ -100,8 +117,27 @@ ...@@ -100,8 +117,27 @@
daka_index(grade).then(res => { daka_index(grade).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.gameList = res.data; this.gameList = res.data;
console.log(this.gameList);
} }
}) });
},
togglePayFail() {
this.isShowPayFail = !this.isShowPayFail;
},
showSuccess() {
this.showModal("温馨提示", "报名成功", {
scb: () => {
if (this.isFollow == 1) {
this.$router.push({ name: "Read" });
} else {
this.$router.push({ name: "Success" });
}
}
});
},
confirmModal(scb) {
scb && scb();
this.modalShown = false;
}, },
showFree(e) { showFree(e) {
e.stopPropagation(); e.stopPropagation();
...@@ -113,7 +149,6 @@ ...@@ -113,7 +149,6 @@
this.canCheckShowFree = false; this.canCheckShowFree = false;
this.canShowFree = false; this.canShowFree = false;
} }
userCards().then(res => { userCards().then(res => {
console.log("获取免契约金数据", res); console.log("获取免契约金数据", res);
let data = { let data = {
...@@ -135,12 +170,78 @@ ...@@ -135,12 +170,78 @@
this.showFreeModal = true; this.showFreeModal = true;
}); });
}, },
closeFree() {
this.showFreeModal = false;
},
showModal(title, desc, option) {
this.modalTitle = title || "";
this.modalDesc = desc || "";
this.modalOption = option || {};
this.modalShown = true;
},
closeModal() {
this.modalShown = false;
},
payToSign() {
dakaPay().then(response => {
this.current_date = new Date(response.date);
if (response.code == 1) {
this.showModal("温馨提示", response.msg);
return;
}
let result = response.data;
console.log("请求打卡支付数据", result);
if (result) {
WeixinJSBridge.invoke(
"getBrandWCPayRequest",
{
appId: result.appId, //公众号名称，由商户传入
timeStamp: `${result.timeStamp}`, //时间戳，自1970年以来的秒数
nonceStr: result.nonceStr, //随机串
package: result.package,
signType: result.signType, //微信签名方式：
paySign: result.paySign //微信签名
},
// result,
res => {
console.log("支付调用结果", res);
if (res.err_msg == "get_brand_wcpay_request:ok") {
// 使用以上方式判断前端返回,微信团队郑重提示：
//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
// 支付成功后的回调函数
console.log("支付成功");
this.showModal("温馨提示", "报名成功", {
scb: () => {
if (this.isFollow == 1) {
this.$router.push({ name: "Read" });
} else {
this.$router.push({ name: "Success" });
}
}
});
// this.dateSelect(2);
// localStorage.setItem("is_every", 0)
// location.replace("#/Success");
} }
if (res.err_msg == "get_brand_wcpay_request:fail") {
// this.showModal("温馨提示", "支付服务繁忙，请稍后重试");
this.togglePayFail();
} }
if (res.err_msg == "get_brand_wcpay_request:cancel") {
// console.log("支付取消");
this.togglePayFail();
}
}
);
}
});
}
}
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.sign-up-page { .sign-up-page {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-y: scroll; overflow-y: scroll;
...@@ -155,27 +256,27 @@ ...@@ -155,27 +256,27 @@
align-items: center; align-items: center;
.top-nav-level { .top-nav-level {
flex-shrink: 0; flex-shrink: 0;
margin-top: .3rem; margin-top: 0.3rem;
border: .02rem solid #fff; border: 0.02rem solid #fff;
border-radius: .1rem; border-radius: 0.1rem;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
.level-item { .level-item {
width: 1.76rem; width: 1.76rem;
font-size: .3rem; font-size: 0.3rem;
line-height: .54rem; line-height: 0.54rem;
color: #465895; color: #465895;
text-align: center; text-align: center;
position: relative; position: relative;
&:after { &:after {
content: ''; content: "";
height: .26rem; height: 0.26rem;
width: .02rem; width: 0.02rem;
background: #465895; background: #465895;
position: absolute; position: absolute;
left: -.02rem; left: -0.02rem;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }
...@@ -185,7 +286,7 @@ ...@@ -185,7 +286,7 @@
&.active { &.active {
background: #465895; background: #465895;
color: #fff; color: #fff;
border-radius: .1rem; border-radius: 0.1rem;
font-weight: bold; font-weight: bold;
} }
&.active:after { &.active:after {
...@@ -196,7 +297,7 @@ ...@@ -196,7 +297,7 @@
.view-steps-btn { .view-steps-btn {
flex-shrink: 0; flex-shrink: 0;
width: 1.11rem; width: 1.11rem;
height: .84rem; height: 0.84rem;
display: block; display: block;
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -204,7 +305,7 @@ ...@@ -204,7 +305,7 @@
} }
.notice-broadcast { .notice-broadcast {
flex-shrink: 0; flex-shrink: 0;
margin: 3.68rem 0 .18rem; margin: 3.68rem 0 0.18rem;
} }
.challenge-card { .challenge-card {
flex-shrink: 0; flex-shrink: 0;
...@@ -212,7 +313,7 @@ ...@@ -212,7 +313,7 @@
height: 4.4rem; height: 4.4rem;
background-image: url(../images/SignUp/sy_dikuang.png); background-image: url(../images/SignUp/sy_dikuang.png);
background-size: 100% 100%; background-size: 100% 100%;
margin-bottom: .4rem; margin-bottom: 0.4rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -221,30 +322,30 @@ ...@@ -221,30 +322,30 @@
width: 1.39rem; width: 1.39rem;
height: 1.39rem; height: 1.39rem;
position: absolute; position: absolute;
top: -.02rem; top: -0.02rem;
right: -.02rem; right: -0.02rem;
} }
.card-title { .card-title {
font-size: .36rem; font-size: 0.36rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
margin-top: .28rem; margin-top: 0.28rem;
} }
.card-time { .card-time {
font-size: .22rem; font-size: 0.22rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
margin-top: .16rem; margin-top: 0.16rem;
} }
.card-info { .card-info {
width: 100%; width: 100%;
margin-top: .56rem; margin-top: 0.56rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.info-item { .info-item {
flex: 1; flex: 1;
border-left: .02rem solid #fff; border-left: 0.02rem solid #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -252,46 +353,46 @@ ...@@ -252,46 +353,46 @@
border-left: none; border-left: none;
} }
.item-title { .item-title {
font-size: .28rem; font-size: 0.28rem;
line-height: .8; line-height: 0.8;
color: #fff; color: #fff;
} }
.item-content { .item-content {
font-size: .48rem; font-size: 0.48rem;
line-height: .8; line-height: 0.8;
color: #fff; color: #fff;
margin-top: .12rem; margin-top: 0.12rem;
} }
.item-money { .item-money {
font-size: .48rem; font-size: 0.48rem;
line-height: .8; line-height: 0.8;
color: #fcf776; color: #fcf776;
margin-top: .12rem; margin-top: 0.12rem;
} }
} }
} }
.card-btn { .card-btn {
width: 4rem; width: 4rem;
height: .8rem; height: 0.8rem;
background: #fabd21; background: #fabd21;
border-radius: .74rem; border-radius: 0.74rem;
box-shadow: 0 .02rem .04rem 0 rgba(0, 0, 0, .2); box-shadow: 0 0.02rem 0.04rem 0 rgba(0, 0, 0, 0.2);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: .3rem; font-size: 0.3rem;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
position: absolute; position: absolute;
bottom: .38rem; bottom: 0.38rem;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
.card-btn-tip { .card-btn-tip {
font-size: .22rem; font-size: 0.22rem;
margin-top: .06rem; margin-top: 0.06rem;
}
} }
} }
} }
}
</style> </style>
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