Commit 00569f688b4b814dc9dd79283946c947dfebef2a
1 parent
f56ad8f9
[年会抽奖]修改细节
Showing
3 changed files
with
9 additions
and
6 deletions
lottery.js
@@ -53,7 +53,7 @@ let action = { | @@ -53,7 +53,7 @@ let action = { | ||
53 | getPrizeList: function() { | 53 | getPrizeList: function() { |
54 | let url = '/apicp.PrizeList.php'; | 54 | let url = '/apicp.PrizeList.php'; |
55 | let callback = function(res) { | 55 | let callback = function(res) { |
56 | - action.prizeList = res.data; | 56 | + action.prizeList = res.data.reverse(); |
57 | let html = template('prizeTmpl', { | 57 | let html = template('prizeTmpl', { |
58 | list: action.prizeList | 58 | list: action.prizeList |
59 | }); | 59 | }); |
mobile.html
@@ -62,8 +62,8 @@ | @@ -62,8 +62,8 @@ | ||
62 | .pic-img-wrap {position: relative;width: 4.78rem;height: 4.78rem;margin: .5rem auto 0;box-sizing: border-box;padding: .96rem .92rem .98rem 1.02rem;} | 62 | .pic-img-wrap {position: relative;width: 4.78rem;height: 4.78rem;margin: .5rem auto 0;box-sizing: border-box;padding: .96rem .92rem .98rem 1.02rem;} |
63 | .pic-img-bg {position: absolute;top: 0;left: 0;z-index: 1;width: 100%;height: 100%;background: url('./img/mobile/pic_avatar_bg.png') no-repeat;background-size: 100% 100%;} | 63 | .pic-img-bg {position: absolute;top: 0;left: 0;z-index: 1;width: 100%;height: 100%;background: url('./img/mobile/pic_avatar_bg.png') no-repeat;background-size: 100% 100%;} |
64 | .pic-avatar {width: 2.84rem;height: 2.84rem;border-radius: 50%;} | 64 | .pic-avatar {width: 2.84rem;height: 2.84rem;border-radius: 50%;} |
65 | - .pic-btn-wrap {position: absolute;bottom: 1.2rem;left: 50%;transform: translateX(-50%);width: 6.82rem;} | ||
66 | - .pic-btn-album {width: 3rem;margin: .3rem auto 0; display: flex;align-items: center;justify-content: center;} | 65 | + .pic-btn-wrap {position: absolute;bottom: 1.2rem;left: 50%;transform: translateX(-50%);width: 6.82rem;padding-bottom: .72rem;} |
66 | + .pic-btn-album {position: absolute;bottom: 0;left: 50%;transform: translateX(-50%);width: 3rem;display: flex;align-items: center;justify-content: center;} | ||
67 | .pic-btn-album .album-text {font-size: .28rem;color: #fff;margin-right: .1rem;} | 67 | .pic-btn-album .album-text {font-size: .28rem;color: #fff;margin-right: .1rem;} |
68 | .pic-btn-album .pic-arrow {width: .32rem;height: .32rem;background: url('./img/mobile/pic_arrow.png') no-repeat;background-size: contain;} | 68 | .pic-btn-album .pic-arrow {width: .32rem;height: .32rem;background: url('./img/mobile/pic_arrow.png') no-repeat;background-size: contain;} |
69 | 69 | ||
@@ -135,7 +135,7 @@ | @@ -135,7 +135,7 @@ | ||
135 | </head> | 135 | </head> |
136 | <body> | 136 | <body> |
137 | <!--签到--> | 137 | <!--签到--> |
138 | - <div class="sign-in wrap" id="signIn"> | 138 | + <div class="sign-in wrap hide" id="signIn"> |
139 | <div class="sign-in-title"></div> | 139 | <div class="sign-in-title"></div> |
140 | <input class="sign-input" type="text" placeholder="请输入你的姓名" maxlength="15" onblur="action.resetPosition()"> | 140 | <input class="sign-input" type="text" placeholder="请输入你的姓名" maxlength="15" onblur="action.resetPosition()"> |
141 | <div class="common-btn"> | 141 | <div class="common-btn"> |
@@ -153,7 +153,7 @@ | @@ -153,7 +153,7 @@ | ||
153 | <div class="pic-img-bg"></div> | 153 | <div class="pic-img-bg"></div> |
154 | <input type="hidden" class="data-img" /> | 154 | <input type="hidden" class="data-img" /> |
155 | </div> | 155 | </div> |
156 | - <div class="pic-btn-wrap" id="upload_unavailable"> | 156 | + <div class="pic-btn-wrap hide" id="upload_unavailable"> |
157 | <!-- 自拍出境 --> | 157 | <!-- 自拍出境 --> |
158 | <div class="common-btn"> | 158 | <div class="common-btn"> |
159 | <img class="common-btn-bg" src="./img/mobile/pic_btn1.png"> | 159 | <img class="common-btn-bg" src="./img/mobile/pic_btn1.png"> |
@@ -164,7 +164,7 @@ | @@ -164,7 +164,7 @@ | ||
164 | <i class="pic-arrow"></i> | 164 | <i class="pic-arrow"></i> |
165 | </div> | 165 | </div> |
166 | </div> | 166 | </div> |
167 | - <div class="pic-btn-wrap hide" id="upload_available"> | 167 | + <div class="pic-btn-wrap" id="upload_available"> |
168 | <!-- 完美提交 --> | 168 | <!-- 完美提交 --> |
169 | <div class="common-btn"> | 169 | <div class="common-btn"> |
170 | <img class="common-btn-bg" src="./img/mobile/pic_btn2.png"> | 170 | <img class="common-btn-bg" src="./img/mobile/pic_btn2.png"> |
mobile.js
@@ -23,6 +23,8 @@ var action = { | @@ -23,6 +23,8 @@ var action = { | ||
23 | } else { | 23 | } else { |
24 | this.goPic(); | 24 | this.goPic(); |
25 | } | 25 | } |
26 | + } else { | ||
27 | + this.goSignIn(); | ||
26 | } | 28 | } |
27 | }, | 29 | }, |
28 | // 签到 | 30 | // 签到 |
@@ -279,6 +281,7 @@ var action = { | @@ -279,6 +281,7 @@ var action = { | ||
279 | if ($('.barrage-input').val() != '') { | 281 | if ($('.barrage-input').val() != '') { |
280 | socket.emit('barrage', $('.barrage-input').val()); | 282 | socket.emit('barrage', $('.barrage-input').val()); |
281 | $('.barrage-input').val(''); | 283 | $('.barrage-input').val(''); |
284 | + $('.send-btn').removeClass('active'); | ||
282 | } | 285 | } |
283 | }); | 286 | }); |
284 | }, | 287 | }, |