diff --git a/public/index.html b/public/index.html index 91c6ed6..0114146 100644 --- a/public/index.html +++ b/public/index.html @@ -6,12 +6,19 @@ <%= htmlWebpackPlugin.options.title %> + -
+
diff --git a/src/api/index.js b/src/api/index.js index 690b6f0..c146cb0 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -44,6 +44,7 @@ const getRuleTip = param => { const drawRecord = param => { return ajax.get(`${HOST}/drawRecord`, param); }; + export { queryPrizeInfo, queryTicketNum, diff --git a/src/api/rank.js b/src/api/rank.js new file mode 100644 index 0000000..9cff9ce --- /dev/null +++ b/src/api/rank.js @@ -0,0 +1,18 @@ +import ajax from "@/lib/ajax"; +import config from "@/config"; +import { stringify } from "qs"; + +// host +const HOST = config.host("/api", "/act/rank"); + +// 冒险家排行榜 +const ticketList = param => { + return ajax.post(`${HOST}/ticketList`, stringify(param), "form"); +}; + +// 幸运星排行榜 +const giftList = param => { + return ajax.post(`${HOST}/giftList`, stringify(param), "form"); +}; + +export { ticketList, giftList }; diff --git a/src/assets/images/avatar.jpg b/src/assets/images/avatar.jpg deleted file mode 100644 index 7fb863f..0000000 Binary files a/src/assets/images/avatar.jpg and /dev/null differ diff --git a/src/assets/images/ball_01.png b/src/assets/images/ball_01.png index 0720c31..c4c1e51 100644 Binary files a/src/assets/images/ball_01.png and b/src/assets/images/ball_01.png differ diff --git a/src/assets/images/ball_01_g.png b/src/assets/images/ball_01_g.png index 8df503f..b9bbd14 100644 Binary files a/src/assets/images/ball_01_g.png and b/src/assets/images/ball_01_g.png differ diff --git a/src/assets/images/ball_02.png b/src/assets/images/ball_02.png index 3fc0fdd..8573dcf 100644 Binary files a/src/assets/images/ball_02.png and b/src/assets/images/ball_02.png differ diff --git a/src/assets/images/ball_02_g.png b/src/assets/images/ball_02_g.png index f8350fa..6c55788 100644 Binary files a/src/assets/images/ball_02_g.png and b/src/assets/images/ball_02_g.png differ diff --git a/src/assets/images/bg.png b/src/assets/images/bg.png index f4c081f..023e669 100644 Binary files a/src/assets/images/bg.png and b/src/assets/images/bg.png differ diff --git a/src/assets/images/bottom_bg.png b/src/assets/images/bottom_bg.png index 0b77eb6..f793f4b 100644 Binary files a/src/assets/images/bottom_bg.png and b/src/assets/images/bottom_bg.png differ diff --git a/src/assets/images/bottom_bg_g.png b/src/assets/images/bottom_bg_g.png index e0ea373..a0fc02d 100644 Binary files a/src/assets/images/bottom_bg_g.png and b/src/assets/images/bottom_bg_g.png differ diff --git a/src/assets/images/cj_btn.png b/src/assets/images/cj_btn.png index c488b69..88557d9 100644 Binary files a/src/assets/images/cj_btn.png and b/src/assets/images/cj_btn.png differ diff --git a/src/assets/images/cj_btn_a.png b/src/assets/images/cj_btn_a.png index a51753d..9c08df1 100644 Binary files a/src/assets/images/cj_btn_a.png and b/src/assets/images/cj_btn_a.png differ diff --git a/src/assets/images/cj_btn_g.png b/src/assets/images/cj_btn_g.png index 964eb7e..7c731fa 100644 Binary files a/src/assets/images/cj_btn_g.png and b/src/assets/images/cj_btn_g.png differ diff --git a/src/assets/images/cj_btn_g_a.png b/src/assets/images/cj_btn_g_a.png index e3569cf..3803c94 100644 Binary files a/src/assets/images/cj_btn_g_a.png and b/src/assets/images/cj_btn_g_a.png differ diff --git a/src/assets/images/cz_bth.png b/src/assets/images/cz_bth.png index 5d163e3..d478d4c 100644 Binary files a/src/assets/images/cz_bth.png and b/src/assets/images/cz_bth.png differ diff --git a/src/assets/images/cz_bth_a.png b/src/assets/images/cz_bth_a.png index fe2656c..fcf2536 100644 Binary files a/src/assets/images/cz_bth_a.png and b/src/assets/images/cz_bth_a.png differ diff --git a/src/assets/images/enter_bg.png b/src/assets/images/enter_bg.png index ab08119..03ba9bf 100644 Binary files a/src/assets/images/enter_bg.png and b/src/assets/images/enter_bg.png differ diff --git a/src/assets/images/enter_bg_g.png b/src/assets/images/enter_bg_g.png index ab769ee..3bf1e5d 100644 Binary files a/src/assets/images/enter_bg_g.png and b/src/assets/images/enter_bg_g.png differ diff --git a/src/assets/images/enter_btn_bg.png b/src/assets/images/enter_btn_bg.png index 61258ef..8aeb127 100644 Binary files a/src/assets/images/enter_btn_bg.png and b/src/assets/images/enter_btn_bg.png differ diff --git a/src/assets/images/enter_btn_bg_a.png b/src/assets/images/enter_btn_bg_a.png index 39511f8..024941b 100644 Binary files a/src/assets/images/enter_btn_bg_a.png and b/src/assets/images/enter_btn_bg_a.png differ diff --git a/src/assets/images/enter_btn_bg_g.png b/src/assets/images/enter_btn_bg_g.png index b462119..8403fd8 100644 Binary files a/src/assets/images/enter_btn_bg_g.png and b/src/assets/images/enter_btn_bg_g.png differ diff --git a/src/assets/images/enter_btn_bg_g_a.png b/src/assets/images/enter_btn_bg_g_a.png index 91fdbcf..536ae52 100644 Binary files a/src/assets/images/enter_btn_bg_g_a.png and b/src/assets/images/enter_btn_bg_g_a.png differ diff --git a/src/assets/images/giftbox.png b/src/assets/images/giftbox.png index 4125a21..aa73f14 100644 Binary files a/src/assets/images/giftbox.png and b/src/assets/images/giftbox.png differ diff --git a/src/assets/images/giftbox_g.png b/src/assets/images/giftbox_g.png index 0150319..27951b0 100644 Binary files a/src/assets/images/giftbox_g.png and b/src/assets/images/giftbox_g.png differ diff --git a/src/assets/images/hg.png b/src/assets/images/hg.png new file mode 100644 index 0000000..b495327 Binary files /dev/null and b/src/assets/images/hg.png differ diff --git a/src/assets/images/hh_btn.png b/src/assets/images/hh_btn.png index df2edb7..0b06fca 100644 Binary files a/src/assets/images/hh_btn.png and b/src/assets/images/hh_btn.png differ diff --git a/src/assets/images/hh_btn_g.png b/src/assets/images/hh_btn_g.png index 5622ee5..a27949b 100644 Binary files a/src/assets/images/hh_btn_g.png and b/src/assets/images/hh_btn_g.png differ diff --git a/src/assets/images/hig.png b/src/assets/images/hig.png index b9bc369..24a2dc5 100644 Binary files a/src/assets/images/hig.png and b/src/assets/images/hig.png differ diff --git a/src/assets/images/hig_p.png b/src/assets/images/hig_p.png index 379d1f9..d34560c 100644 Binary files a/src/assets/images/hig_p.png and b/src/assets/images/hig_p.png differ diff --git a/src/assets/images/icon_no1.png b/src/assets/images/icon_no1.png new file mode 100644 index 0000000..929dd9c Binary files /dev/null and b/src/assets/images/icon_no1.png differ diff --git a/src/assets/images/icon_no2.png b/src/assets/images/icon_no2.png new file mode 100644 index 0000000..f32d8bd Binary files /dev/null and b/src/assets/images/icon_no2.png differ diff --git a/src/assets/images/icon_no3.png b/src/assets/images/icon_no3.png new file mode 100644 index 0000000..8a59a36 Binary files /dev/null and b/src/assets/images/icon_no3.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index f3d2503..24b4e65 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/pcw_zr_bg.png b/src/assets/images/pcw_zr_bg.png new file mode 100644 index 0000000..2612eb3 Binary files /dev/null and b/src/assets/images/pcw_zr_bg.png differ diff --git a/src/assets/images/pcw_zr_bg2.png b/src/assets/images/pcw_zr_bg2.png new file mode 100644 index 0000000..79022b6 Binary files /dev/null and b/src/assets/images/pcw_zr_bg2.png differ diff --git a/src/assets/images/tikect_bg_active.png b/src/assets/images/tikect_bg_active.png index f2b8105..b368781 100644 Binary files a/src/assets/images/tikect_bg_active.png and b/src/assets/images/tikect_bg_active.png differ diff --git a/src/assets/images/tikect_bg_active_g.png b/src/assets/images/tikect_bg_active_g.png index 744ce37..b6b790f 100644 Binary files a/src/assets/images/tikect_bg_active_g.png and b/src/assets/images/tikect_bg_active_g.png differ diff --git a/src/assets/images/tikect_bg_nomal.png b/src/assets/images/tikect_bg_nomal.png index 2a2a48e..ca63cfb 100644 Binary files a/src/assets/images/tikect_bg_nomal.png and b/src/assets/images/tikect_bg_nomal.png differ diff --git a/src/assets/images/tikect_bg_nomal_g.png b/src/assets/images/tikect_bg_nomal_g.png index 15f1436..4387a7c 100644 Binary files a/src/assets/images/tikect_bg_nomal_g.png and b/src/assets/images/tikect_bg_nomal_g.png differ diff --git a/src/assets/images/tz_bg.png b/src/assets/images/tz_bg.png index bfa7ca7..1e4332a 100644 Binary files a/src/assets/images/tz_bg.png and b/src/assets/images/tz_bg.png differ diff --git a/src/assets/images/tz_bg_g.png b/src/assets/images/tz_bg_g.png index 4549b28..54c3a7c 100644 Binary files a/src/assets/images/tz_bg_g.png and b/src/assets/images/tz_bg_g.png differ diff --git a/src/assets/images/xy_btn.png b/src/assets/images/xy_btn.png index 50b50ba..0e79aa8 100644 Binary files a/src/assets/images/xy_btn.png and b/src/assets/images/xy_btn.png differ diff --git a/src/assets/images/xy_btn_g.png b/src/assets/images/xy_btn_g.png index df69c85..995fdab 100644 Binary files a/src/assets/images/xy_btn_g.png and b/src/assets/images/xy_btn_g.png differ diff --git a/src/assets/images/yue_bg.png b/src/assets/images/yue_bg.png index 410275a..0ff326a 100644 Binary files a/src/assets/images/yue_bg.png and b/src/assets/images/yue_bg.png differ diff --git a/src/assets/images/yue_bg_g.png b/src/assets/images/yue_bg_g.png index 579099d..bf09d08 100644 Binary files a/src/assets/images/yue_bg_g.png and b/src/assets/images/yue_bg_g.png differ diff --git a/src/components/luckyGridView/main.vue b/src/components/luckyGridView/main.vue index bcd223e..295a41b 100644 --- a/src/components/luckyGridView/main.vue +++ b/src/components/luckyGridView/main.vue @@ -310,7 +310,7 @@ export default { } .lucky-grid-prize { display: flex; - align-items: center; + // align-items: center; justify-content: center; padding: 30px; &-item { diff --git a/src/components/prizesList/main.vue b/src/components/prizesList/main.vue index e3980e4..6dcabcf 100644 --- a/src/components/prizesList/main.vue +++ b/src/components/prizesList/main.vue @@ -2,7 +2,12 @@
- +
{{ item.prizeName }} diff --git a/src/components/rankList/index.js b/src/components/rankList/index.js new file mode 100644 index 0000000..8131a40 --- /dev/null +++ b/src/components/rankList/index.js @@ -0,0 +1,7 @@ +import RankList from "./main"; + +RankList.install = function(Vue) { + Vue.component(RankList.name, RankList); +}; + +export default RankList; diff --git a/src/components/rankList/main.vue b/src/components/rankList/main.vue new file mode 100644 index 0000000..c3d7910 --- /dev/null +++ b/src/components/rankList/main.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/components/rankList/rankListItem.vue b/src/components/rankList/rankListItem.vue new file mode 100644 index 0000000..85ca3f1 --- /dev/null +++ b/src/components/rankList/rankListItem.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/components/rankPane/index.js b/src/components/rankPane/index.js new file mode 100644 index 0000000..c5cfe85 --- /dev/null +++ b/src/components/rankPane/index.js @@ -0,0 +1,7 @@ +import RankPane from "./main"; + +RankPane.install = function(Vue) { + Vue.component(RankPane.name, RankPane); +}; + +export default RankPane; diff --git a/src/components/rankPane/main.vue b/src/components/rankPane/main.vue new file mode 100644 index 0000000..2a0d0a6 --- /dev/null +++ b/src/components/rankPane/main.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/src/components/recordList/recordItem.vue b/src/components/recordList/recordItem.vue index a80f520..500c6d8 100644 --- a/src/components/recordList/recordItem.vue +++ b/src/components/recordList/recordItem.vue @@ -2,7 +2,7 @@
- +
{{ name }} diff --git a/src/main.js b/src/main.js index 85af654..79e5607 100644 --- a/src/main.js +++ b/src/main.js @@ -2,7 +2,16 @@ import Vue from "vue"; import App from "./App.vue"; import router from "./router"; import store from "./store"; -import { Toast, Dialog, Tab, Tabs, Popup, Image as VanImage, List } from "vant"; +import { + Toast, + Dialog, + Tab, + Tabs, + Popup, + Image as VanImage, + List, + Empty +} from "vant"; Vue.config.productionTip = false; @@ -13,6 +22,7 @@ Vue.use(Tabs); Vue.use(Popup); Vue.use(VanImage); Vue.use(List); +Vue.use(Empty); new Vue({ router, diff --git a/src/styles/cover.less b/src/styles/cover.less index d82f621..1ef7a76 100644 --- a/src/styles/cover.less +++ b/src/styles/cover.less @@ -1,4 +1,7 @@ @tab-text-color: #AFAAFF; @tab-active-text-color: #DBCFFF; @tabs-nav-background-color: none; -@tabs-bottom-bar-color: #DBCFFF; \ No newline at end of file +@tabs-bottom-bar-color: #DBCFFF; + + +@empty-description-color: #AFAAFF; \ No newline at end of file diff --git a/src/views/Home.vue b/src/views/Home.vue index 8caff69..515d368 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -55,7 +55,8 @@ export default { // prizesView prizesView: resolve => require(["./prizesView.vue"], resolve), ruleView: resolve => require(["./ruleView.vue"], resolve), - recordView: resolve => require(["./recordView.vue"], resolve) + recordView: resolve => require(["./recordView.vue"], resolve), + rankView: resolve => require(["./rankView.vue"], resolve) }, data() { return { @@ -64,7 +65,7 @@ export default { componentsName: { 规则: "rule-view", 奖品: "prizes-view", - 排行: "record-view", + 排行: "rank-view", 记录: "record-view" } }; diff --git a/src/views/prizesView.vue b/src/views/prizesView.vue index 2f1a809..894a56e 100644 --- a/src/views/prizesView.vue +++ b/src/views/prizesView.vue @@ -48,6 +48,7 @@ export default { padding-top: 10px; &-pane { margin: 20px; + height: calc(100vh - 10px - 20px - 20px - 11.734vw); overflow-x: hidden; overflow-y: auto; } diff --git a/src/views/rankView.vue b/src/views/rankView.vue new file mode 100644 index 0000000..3f8d1a4 --- /dev/null +++ b/src/views/rankView.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/views/ruleView.vue b/src/views/ruleView.vue index 8adf07e..67ef4f5 100644 --- a/src/views/ruleView.vue +++ b/src/views/ruleView.vue @@ -48,7 +48,7 @@ export default { background-color: #150832; color: #dbcfff; &-padding { - padding: 20px 30px; + height: 100%; } &-title { text-align: center; @@ -56,12 +56,23 @@ export default { font-weight: bold; font-size: 32px; line-height: 72px; + padding-top: 20px; } &-content { margin-top: 50px; line-height: 54px; font-size: 26px; font-weight: 400; + padding: 0 30px; + height: calc(100vh - 72px - 20px - 50px); + overflow-x: hidden; + overflow-y: auto; + & > p { + padding-bottom: 20px; + } + &:last-child { + padding-bottom: 0; + } } }