Commit 947530f427231d785e2510303b831e7973cfbc8f

Authored by zouyang0921
1 parent 8aadbf04

[年会抽奖]增加未开启签到提示

Showing 2 changed files with 62 additions and 26 deletions
mobile.html
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 * {padding: 0;margin: 0;} 26 * {padding: 0;margin: 0;}
27 html, body {padding: 0;margin: 0;min-height:100%;font-family: 'PingFangSC','PingFang','Microsoft Yahei','Hiragino Sans GB','WenQuanYi Micro Hei','Droidsansfallback','Droid Sans',STHeiti,'\534E\6587\7EC6\9ED1','Helvetica Neue',SimHei,Helvetica,Arial,sans-serif;} 27 html, body {padding: 0;margin: 0;min-height:100%;font-family: 'PingFangSC','PingFang','Microsoft Yahei','Hiragino Sans GB','WenQuanYi Micro Hei','Droidsansfallback','Droid Sans',STHeiti,'\534E\6587\7EC6\9ED1','Helvetica Neue',SimHei,Helvetica,Arial,sans-serif;}
28 img {display: block;} 28 img {display: block;}
29 - input {outline: none;border: none;-webkit-appearance: none;appearance: none;} 29 + input {outline: none;border: none;-webkit-appearance: none;}
30 .wrap {position: relative;width: 100%;min-height: 100%;box-sizing: border-box;} 30 .wrap {position: relative;width: 100%;min-height: 100%;box-sizing: border-box;}
31 .sign-in, .pic, .home, .seat {user-select: none;-webkit-user-select: none;-moz-user-select: none;} 31 .sign-in, .pic, .home, .seat {user-select: none;-webkit-user-select: none;-moz-user-select: none;}
32 .common-btn {position: relative;width: 5.9rem;height: 1.08rem;margin: 0 auto;} 32 .common-btn {position: relative;width: 5.9rem;height: 1.08rem;margin: 0 auto;}
@@ -241,6 +241,21 @@ @@ -241,6 +241,21 @@
241 <div class="bottom-btn" onclick="action.vote()">确认投票</div> 241 <div class="bottom-btn" onclick="action.vote()">确认投票</div>
242 </div> 242 </div>
243 243
  244 + <!-- 暂未开启签到 弹框 -->
  245 + <div class="dialog-wrap hide" id="stop_sign_dialog">
  246 + <div class="dialog-main">
  247 + <div class="dialog-title">
  248 + <i class="title-icon-left"></i>
  249 + <div class="title-text">温馨提示</div>
  250 + <i class="title-icon-right"></i>
  251 + </div>
  252 + <div class="dialog-content">
  253 + <p class="content-row">年会签到通道暂未开启</p>
  254 + </div>
  255 + <div class="dialog-btn-single" onclick="action.switchDialog('#stop_sign_dialog', false)">我知道了</div>
  256 + </div>
  257 + </div>
  258 +
244 <!-- 姓名不存在 弹框 --> 259 <!-- 姓名不存在 弹框 -->
245 <div class="dialog-wrap hide" id="sign_in_dialog"> 260 <div class="dialog-wrap hide" id="sign_in_dialog">
246 <div class="dialog-main"> 261 <div class="dialog-main">
mobile.js
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 // var baseURL = 'https://yq.vchangyi.com/party/phpapi'; 2 // var baseURL = 'https://yq.vchangyi.com/party/phpapi';
3 var baseURL = 'http://party.vchangyi.com/phpapi'; 3 var baseURL = 'http://party.vchangyi.com/phpapi';
4 var socketUrl = '//106.54.64.163:3000'; 4 var socketUrl = '//106.54.64.163:3000';
  5 +var defaultAvatar = './img/mobile/default_avatar.png';
5 var toastTimer = null; 6 var toastTimer = null;
6 var displayTimer = null; 7 var displayTimer = null;
7 8
@@ -11,7 +12,7 @@ var action = { @@ -11,7 +12,7 @@ var action = {
11 userInfo: null, // 用户信息 12 userInfo: null, // 用户信息
12 userAvatar: '', // 用户头像 13 userAvatar: '', // 用户头像
13 programList: [], // 节目列表 14 programList: [], // 节目列表
14 - init : function() { 15 + init: function() {
15 // 本地获取用户信息,判断跳转页面 16 // 本地获取用户信息,判断跳转页面
16 var userInfo = localStorage.getItem('userInfo'); 17 var userInfo = localStorage.getItem('userInfo');
17 if (userInfo) { 18 if (userInfo) {
@@ -26,22 +27,7 @@ var action = { @@ -26,22 +27,7 @@ var action = {
26 } else { 27 } else {
27 this.goSignIn(); 28 this.goSignIn();
28 } 29 }
29 - },  
30 - // 签到  
31 - signIn: function() {  
32 - var realname = $('.sign-input').val().replace( /^\s*/, '')  
33 - if (!realname) {  
34 - return;  
35 - }  
36 - var url = baseURL + '/apicp.SignIn.php';  
37 - var data = { realname: realname };  
38 - var callback = function(data) {  
39 - action.userInfo = data.data;  
40 - localStorage.setItem('userInfo', JSON.stringify(action.userInfo));  
41 - $('.sign-input').val('');  
42 - action.goPic();  
43 - };  
44 - baseRquest.post(url, data, callback); 30 + this.wechatJsSign(); // 微信 SDK config
45 }, 31 },
46 // 获取微信jsapi签名 32 // 获取微信jsapi签名
47 wechatJsSign: function() { 33 wechatJsSign: function() {
@@ -53,11 +39,47 @@ var action = { @@ -53,11 +39,47 @@ var action = {
53 timestamp: data.timestamp, // 必填,生成签名的时间戳 39 timestamp: data.timestamp, // 必填,生成签名的时间戳
54 nonceStr: data.nonceStr, // 必填,生成签名的随机串 40 nonceStr: data.nonceStr, // 必填,生成签名的随机串
55 signature: data.signature,// 必填,签名 41 signature: data.signature,// 必填,签名
56 - jsApiList: ['chooseImage','uploadImage','getLocalImgData','downloadImage'] // 必填,需要使用的JS接口列表 42 + jsApiList: ['chooseImage','uploadImage','getLocalImgData','downloadImage', 'hideAllNonBaseMenuItem'] // 必填,需要使用的JS接口列表
  43 + });
  44 + wx.ready(function() {
  45 + wx.hideAllNonBaseMenuItem(); // 隐藏所有非基础按钮
57 }); 46 });
58 }; 47 };
59 baseRquest.get(WECHAT_JS_SIGN_URL, {'url' : location.href}, sign); 48 baseRquest.get(WECHAT_JS_SIGN_URL, {'url' : location.href}, sign);
60 }, 49 },
  50 + // 获取年会开关设置
  51 + getSetting: function(callback) {
  52 + var url = baseURL + '/apicp.GetSetting.php';
  53 + baseRquest.get(url, '', callback);
  54 + },
  55 + // 判断是否可以签到
  56 + getSignInState: function() {
  57 + var callback = function(res) {
  58 + if (res.data.isStopSign == 2) { // 已开启签到
  59 + var url = baseURL + '/apicp.SignIn.php';
  60 + var realname = $('.sign-input').val().replace( /^\s*/, '');
  61 + var data = { realname: realname };
  62 + var callback = function(res) {
  63 + action.userInfo = res.data;
  64 + localStorage.setItem('userInfo', JSON.stringify(action.userInfo));
  65 + $('.sign-input').val('');
  66 + action.goPic();
  67 + };
  68 + baseRquest.post(url, data, callback);
  69 + } else { // 未开启签到
  70 + action.switchDialog('#stop_sign_dialog', true);
  71 + }
  72 + };
  73 + action.getSetting(callback);
  74 + },
  75 + // 签到
  76 + signIn: function() {
  77 + var realname = $('.sign-input').val().replace( /^\s*/, '');
  78 + if (!realname) {
  79 + return;
  80 + }
  81 + action.getSignInState();
  82 + },
61 // 进入签到页 83 // 进入签到页
62 goSignIn: function() { 84 goSignIn: function() {
63 $('.sign-in').show(); 85 $('.sign-in').show();
@@ -73,7 +95,6 @@ var action = { @@ -73,7 +95,6 @@ var action = {
73 $('.home').hide(); 95 $('.home').hide();
74 $('.vote').hide(); 96 $('.vote').hide();
75 $('.seat').hide(); 97 $('.seat').hide();
76 - this.wechatJsSign(); // 微信 SDK config  
77 }, 98 },
78 goHome: function() { 99 goHome: function() {
79 $('.home').show(); 100 $('.home').show();
@@ -82,7 +103,8 @@ var action = { @@ -82,7 +103,8 @@ var action = {
82 $('.vote').hide(); 103 $('.vote').hide();
83 $('.seat').hide(); 104 $('.seat').hide();
84 if (action.userInfo) { 105 if (action.userInfo) {
85 - $('#home_user_avatar').attr('src', action.userAvatar); 106 + var userAvatar = action.userAvatar || defaultAvatar;
  107 + $('#home_user_avatar').attr('src', userAvatar);
86 $('#home_user_name').html(action.userInfo.realname); 108 $('#home_user_name').html(action.userInfo.realname);
87 $('#home_prize_no').html(action.userInfo.prize_no); 109 $('#home_prize_no').html(action.userInfo.prize_no);
88 $('#home_table_no').html(action.userInfo.table_no); 110 $('#home_table_no').html(action.userInfo.table_no);
@@ -146,7 +168,7 @@ var action = { @@ -146,7 +168,7 @@ var action = {
146 }); 168 });
147 }, 169 },
148 // 展示选中的图片 170 // 展示选中的图片
149 - wxgetLocalImgData: function(localId, num) { 171 + wxgetLocalImgData: function(localId) {
150 console.log('wxgetLocalImgData--localId: ', localId); 172 console.log('wxgetLocalImgData--localId: ', localId);
151 if (window.__wxjs_is_wkwebview) { 173 if (window.__wxjs_is_wkwebview) {
152 wx.getLocalImgData({ 174 wx.getLocalImgData({
@@ -201,15 +223,14 @@ var action = { @@ -201,15 +223,14 @@ var action = {
201 }, 223 },
202 // 判断是否开启投票通道 224 // 判断是否开启投票通道
203 getVoteState: function() { 225 getVoteState: function() {
204 - var url = baseURL + '/apicp.GetSetting.php';  
205 - var callback = function(data) {  
206 - if (data.data.isStartVote == 1) { 226 + var callback = function(res) {
  227 + if (res.data.isStartVote == 1) {
207 action.getProgramList(); 228 action.getProgramList();
208 } else { 229 } else {
209 action.switchDialog('#home_dialog', true); 230 action.switchDialog('#home_dialog', true);
210 } 231 }
211 }; 232 };
212 - baseRquest.get(url, '', callback); 233 + action.getSetting(callback);
213 }, 234 },
214 // 获取节目列表 235 // 获取节目列表
215 getProgramList: function() { 236 getProgramList: function() {