guangka / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
ce12bf74 1 parent ecd81ae6

更新本地SDK

Expand all
Inline Side-by-side
Showing 71 changed files with 442 additions and 25 deletions
No preview for this file type
No preview for this file type
No preview for this file type

7.05 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

81 KB | W: | H:

81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -34,7 +34,7 @@ function initMatching(){ ...@@ -34,7 +34,7 @@ function initMatching(){
34 Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 34 Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1;
35 var ratio = window.devicePixelRatio; 35 var ratio = window.devicePixelRatio;
36 Core.ratio = ratio; 36 Core.ratio = ratio;
37 - 37 + Core.isShowIdentity = true;
38 38
39 var lastServer = localStorage.getItem('last_server'); 39 var lastServer = localStorage.getItem('last_server');
40 if(lastServer && lastServer.indexOf('http:')==0){ 40 if(lastServer && lastServer.indexOf('http:')==0){
...@@ -89,10 +89,12 @@ function initMatching(){ ...@@ -89,10 +89,12 @@ function initMatching(){
89 if (!Core.sdk_w) Core.sdk_w = 600; 89 if (!Core.sdk_w) Core.sdk_w = 600;
90 _scale = 1; 90 _scale = 1;
91 if(ratio == 2){//5、6、6s(2.4) 91 if(ratio == 2){//5、6、6s(2.4)
92 - _scale = 2.4 / ratio; 92 + _scale = 2.2 / ratio;
93 if(userAgent.indexOf('iPad') != -1){ 93 if(userAgent.indexOf('iPad') != -1){
94 _scale = 2 / ratio; 94 _scale = 2 / ratio;
95 } 95 }
96 + }else if(ratio ==3){//iphoneX
97 + _scale = 3.1 / ratio;
96 }else if(ratio >2.5){//6s plus 98 }else if(ratio >2.5){//6s plus
97 _scale = 2.7 / ratio; 99 _scale = 2.7 / ratio;
98 }else if (ratio < 1) { 100 }else if (ratio < 1) {
......
This diff is collapsed. Click to expand it.
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
52 that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面 52 that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面
53 e.stopPropagation(); 53 e.stopPropagation();
54 Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！"); 54 Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
55 + Core.isShowIdentity = false;
55 }); 56 });
57 +
56 } 58 }
57 59
58 Home.prototype.logout_cb = function(data) { 60 Home.prototype.logout_cb = function(data) {
...@@ -1021,6 +1023,9 @@ ...@@ -1021,6 +1023,9 @@
1021 }); 1023 });
1022 } 1024 }
1023 IdentityCard.prototype.show_after = function(){ 1025 IdentityCard.prototype.show_after = function(){
1026 + if(!Core.isShowIdentity){
1027 + $(".js-return-game").attr("href","javascript:Core.finishLogin()");
1028 + }
1024 1029
1025 } 1030 }
1026 Core.registerMod('identityCard', IdentityCard); 1031 Core.registerMod('identityCard', IdentityCard);
...@@ -1208,7 +1213,7 @@ ...@@ -1208,7 +1213,7 @@
1208 if(Core.Data.is_guest == 1){ 1213 if(Core.Data.is_guest == 1){
1209 //游客帐号转正 1214 //游客帐号转正
1210 localStorage.removeItem('guest_n'); 1215 localStorage.removeItem('guest_n');
1211 - Core.showTips('升级账号成功！请妥善保管正式账号！', true); 1216 + Core.showTips('绑定账号成功！请妥善保管正式账号！', true);
1212 delete name_ary[Core.Data.nickname]; 1217 delete name_ary[Core.Data.nickname];
1213 localStorage.setItem('user_names', JSON.stringify(name_ary)); 1218 localStorage.setItem('user_names', JSON.stringify(name_ary));
1214 }else{ 1219 }else{
...@@ -1254,6 +1259,7 @@ ...@@ -1254,6 +1259,7 @@
1254 Core.Data.is_guest = msg.is_guest; 1259 Core.Data.is_guest = msg.is_guest;
1255 Core.Data.username = msg.username; 1260 Core.Data.username = msg.username;
1256 Core.Data.nickname = msg.nickname; 1261 Core.Data.nickname = msg.nickname;
1262 + Core.Data.login_key = msg.login_key;
1257 $("input[name='loginUserName']").val(Core.Data.username); 1263 $("input[name='loginUserName']").val(Core.Data.username);
1258 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]); 1264 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]);
1259 // 强制更新显示home模块,模块自刷新 1265 // 强制更新显示home模块,模块自刷新
......
...@@ -900,6 +900,59 @@ ...@@ -900,6 +900,59 @@
900 } 900 }
901 901
902 Core.registerMod('question_detail', Question_detail); 902 Core.registerMod('question_detail', Question_detail);
903 +
904 + //实名认证
905 + var IdentityCard = function(modId) {
906 + Module.call(this, modId);
907 + }
908 + // 继承基础模块
909 + Core.inherit(IdentityCard, Module);
910 + IdentityCard.prototype.bind = function() {
911 + var that = this;
912 + this.$c.on('click', '.submit', function() {
913 + var identityCard = that.$c.find("input[name='identity_card']").val(),//身份证
914 + compellationName = that.$c.find("input[name='compellation_name']").val(),//姓名
915 + compellationNameReg = /^[\u4e00-\u9fa5]{2,10}$/i;//2-10位汉字
916 + if($.trim(identityCard) == ""){
917 + Core.showTips("请输入身份证号码",false);
918 + return false;
919 + }else if(IsIdCard(identityCard) == false){
920 + Core.showTips("请输入正确的身份证信息",false);
921 + return false;
922 + }else if($.trim(compellationName) == ""){
923 + Core.showTips("请输入姓名",false);
924 + return false;
925 + }else if(!compellationNameReg.test(compellationName)){
926 + Core.showTips("请输入正确的中文姓名",false);
927 + return false;
928 + }
929 + Core.ajax({
930 + type:"post",
931 + url:"/user/bind_identity_card?identity_card="+identityCard+"&compellation_name="+compellationName,
932 + data:{format:"json"},
933 + dataType:"json",
934 + success:function(res){
935 + if(res.code === 0){
936 + Core.showTips('认证成功!', true);
937 + Core.Data.compellation_name = compellationName;
938 + Core.Data.identity_card = identityCard;
939 + setTimeout(function() {
940 + Core.updateMod('channel_list');
941 + }, 500);
942 + }else{
943 + Core.showTips(res.msg, true);
944 + }
945 + }
946 + });
947 + });
948 + }
949 + IdentityCard.prototype.show_after = function(){
950 + if(Core.Data.force_auth == 1){
951 + $(".js-return-game").attr("href","javascript:Core.finishLogin()");
952 + }
953 +
954 + }
955 + Core.registerMod('identityCard', IdentityCard);
903 956
904 /** 957 /**
905 * enter_game_amount 进入sdk的要购买的游戏币 958 * enter_game_amount 进入sdk的要购买的游戏币
...@@ -924,7 +977,15 @@ ...@@ -924,7 +977,15 @@
924 //} else 977 //} else
925 //if (Core.Data.enter_game_amount > 0) { 978 //if (Core.Data.enter_game_amount > 0) {
926 // 需要进入渠道充值页面 979 // 需要进入渠道充值页面
927 - Core.start_page = "channel_list"; 980 + if(Core.Data.identity_card == ""){
981 + //游客登录则先让其实名验证
982 + Core.start_page = "identityCard";
983 + }else{
984 + //正式用户直接跳到充值界面
985 + Core.start_page = "channel_list";
986 + }
987 +
988 +
928 Core.Data.game_amount = Core.Data.enter_game_amount; 989 Core.Data.game_amount = Core.Data.enter_game_amount;
929 Core.Data.youai_star = Core.Data.enter_amount; 990 Core.Data.youai_star = Core.Data.enter_amount;
930 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 991 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
...@@ -933,7 +994,7 @@ ...@@ -933,7 +994,7 @@
933 //} 994 //}
934 } 995 }
935 996
936 -function onBridgeReady() { 997 + function onBridgeReady() {
937 var mainImgUrl = Core.Data.game_icon; 998 var mainImgUrl = Core.Data.game_icon;
938 var mainURL = Core.Data.invite_url;//'http://www.9133.com/game/' + Core.Data.app_id + '.html'; 999 var mainURL = Core.Data.invite_url;//'http://www.9133.com/game/' + Core.Data.app_id + '.html';
939 var mainTitle= '一起玩' + Core.Data.game_name; 1000 var mainTitle= '一起玩' + Core.Data.game_name;
......
This diff is collapsed. Click to expand it.
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
34 <!-- 首页模块 --> 34 <!-- 首页模块 -->
35 <section id="home" class="hide" data-attr="dot" data-auth="1"></section> 35 <section id="home" class="hide" data-attr="dot" data-auth="1"></section>
36 <!-- end --> 36 <!-- end -->
37 +<!--实名验证模块-->
38 +<section id="identityCard" class="hide" data-attr="dot">
39 +</section>
40 +<!--end-->
37 <!-- 兑换元宝列表模块 --> 41 <!-- 兑换元宝列表模块 -->
38 <section id="exchange" class="hide" data-attr="dot" data-auth="1"></section> 42 <section id="exchange" class="hide" data-attr="dot" data-auth="1"></section>
39 <!-- end --> 43 <!-- end -->
...@@ -185,7 +189,27 @@ ...@@ -185,7 +189,27 @@
185 </div> 189 </div>
186 </div> 190 </div>
187 </script> 191 </script>
188 - 192 +<script id="identityCard_template" type="text/x-jquery-tmpl" >
193 + <div class="new-sdk-container">
194 + <div class="SDK-titlebox"></div>
195 + <div class="user-center">
196 + <a href="#channel_list" class="lefticon js-return-game">
197 + <i class="iconfont icon-fanhui"></i>
198 + </a>
199 + 实名认证
200 + </div>
201 + <form action="/user/bind_identity_card" method="post" class="ajax" onkeydown="if(event.keyCode==13) return false;" >
202 + <div class="new-sdk-box">
203 + <div class="input" style="padding:0 25px;"><input type="text" name="identity_card" required placeholder="请输入身份证号码" style="text-align: left;"></div>
204 + <div class="input" style="padding:0 25px;"><input type="text" name="compellation_name" required placeholder="请输入姓名" style="text-align: left;"></div>
205 + <p style="font-size: 24px; text-indent: 1em; color: #999;text-align: left;">根据国家规定，为了保障您的权益，请登记本人实名信息</p>
206 + </div>
207 + <ul class="inline-btn">
208 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">提交</a></li>
209 + </ul>
210 + </form>
211 + </div>
212 +</script>
189 <script id='modify_pwd_template' type='text/x-jquery-tmpl'> 213 <script id='modify_pwd_template' type='text/x-jquery-tmpl'>
190 <div class="header"> 214 <div class="header">
191 <a class="iconfont icon-iconfontxiangyou poslft" href="##home"></a> 215 <a class="iconfont icon-iconfontxiangyou poslft" href="##home"></a>
...@@ -784,7 +808,8 @@ FastClick.attach(document.body); ...@@ -784,7 +808,8 @@ FastClick.attach(document.body);
784 <script type="text/javascript" src="js/core.min.js?201504218002" ></script> 808 <script type="text/javascript" src="js/core.min.js?201504218002" ></script>
785 <script type="text/javascript" src="js/pay.min.js?201504218001" ></script> 809 <script type="text/javascript" src="js/pay.min.js?201504218001" ></script>
786 <script type="text/javascript" src="js/loader.min.js?201504218001"></script> 810 <script type="text/javascript" src="js/loader.min.js?201504218001"></script>
787 - 811 +<!--身份证号码验证：2.0为没有限制年龄-->
812 +<script type="text/javascript" src="js/identity_id_2.0.js" ></script>
788 <script type="text/javascript"> 813 <script type="text/javascript">
789 (function(){ 814 (function(){
790 getData('/sdk/pay/json'); 815 getData('/sdk/pay/json');
......
...@@ -23,6 +23,7 @@ section{ ...@@ -23,6 +23,7 @@ section{
23 a,input,textarea,select { 23 a,input,textarea,select {
24 outline: 0; 24 outline: 0;
25 } 25 }
26 +input[type=button],input[type=text],input[type=password]{-webkit-appearance:none;outline:none}
26 a:focus { 27 a:focus {
27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */ 28 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
28 } 29 }
......
...@@ -1324,4 +1324,117 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder { ...@@ -1324,4 +1324,117 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder {
1324 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill { 1324 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
1325 background-color: rgb(255, 255, 255) !important; 1325 background-color: rgb(255, 255, 255) !important;
1326 box-shadow: 0 0 0px 1000px white inset !important; 1326 box-shadow: 0 0 0px 1000px white inset !important;
1327 +}
1328 +/**------实名验证--------*/
1329 +
1330 +.SDK-titlebox{
1331 + height: 33px;
1332 + background: #00beef;
1333 +}
1334 +.user-center{
1335 + position: relative;
1336 + text-align: center;
1337 + padding: 26px 0 18px;
1338 + border-bottom: 2px solid #fff;
1339 + color: #00beef;
1340 + font-family: "Microsoft YaHei","微软雅黑";
1341 + font-size: 36px;
1342 +}
1343 +.new-sdk-container .new-sdk-box {
1344 + padding: 20px 37px;
1345 + border-top: 1px solid #c4c3c3;
1346 + box-sizing: border-box;
1347 + -moz-box-sizing: border-box;
1348 + -webkit-box-sizing: border-box;
1349 +}
1350 +.new-sdk-container .new-sdk-box .input {
1351 + margin-bottom: 15px;
1352 + border: 1px solid #c0c0c0;
1353 + /* box-shadow: 1px 2px 2px #c2c2c2 inset; */
1354 + border-radius: 10px;
1355 + -moz-border-radius: 10px;
1356 + -webkit-border-radius: 10px;
1357 + padding: 25px 0;
1358 + background: #fff;
1359 + box-sizing: border-box;
1360 + -webkit-box-sizing: border-box;
1361 + -moz-box-sizing: border-box;
1362 +}
1363 +.new-sdk-container .new-sdk-box .input input {
1364 + display: inline-block;
1365 + width: 100%;
1366 + background: none;
1367 + border: none;
1368 + color: #000;
1369 + font-size: 30px;
1370 + font-family: "Microsoft YaHei","微软雅黑";
1371 + white-space: nowrap;
1372 + text-overflow: ellipsis;
1373 + overflow: hidden;
1374 + word-break: break-all;
1375 + height: 45px;
1376 + line-height: 45px;
1377 + vertical-align: middle;
1378 + margin: 20px 0;
1379 + box-shadow: none;
1380 +}
1381 +ol, ul {
1382 + list-style: none;
1383 +}
1384 +.new-sdk-container .inline-btn {
1385 + overflow: auto;
1386 + zoom: 1;
1387 + width: 88%;
1388 + margin: 0px auto 25px auto;
1389 +}
1390 +.new-sdk-container .inline-btn li {
1391 + float: left;
1392 + width: 45%;
1393 + text-align: center;
1394 + background: #ff9600;
1395 + border-radius: 20px;
1396 + padding: 26px 0;
1397 +}
1398 +.new-sdk-container .inline-btn .btn {
1399 + display: inline-block;
1400 + border: 0;
1401 + background: #00beef;
1402 + color: #fff;
1403 + font-size: 30px;
1404 + font-family: "Microsoft YaHei","微软雅黑";
1405 + letter-spacing: 2px;
1406 + cursor: pointer;
1407 + width: 100%;
1408 + vertical-align: middle;
1409 + border-radius: 20px;
1410 + -moz-border-radius: 20px;
1411 + -webkit-border-radius: 20px;
1412 +}
1413 +.new-sdk-container .inline-btn .btn-orange {
1414 + background: #ff9600;
1415 +}
1416 +/*字体图标*/
1417 +@font-face {font-family: "iconfont";
1418 + src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
1419 + src: url('../font/iconfont.eot?t=1468997064#iefix') format('embedded-opentype'), /* IE6-IE8 */
1420 + url('../font/iconfont.woff?t=1468997064') format('woff'), /* chrome, firefox */
1421 + url('../font/iconfont.ttf?t=1468997064') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
1422 + url('../font/iconfont.svg?t=1468997064#iconfont') format('svg'); /* iOS 4.1- */
1423 +}
1424 +.iconfont {
1425 + font-family:"iconfont" !important;
1426 + font-size:16px;
1427 + font-style:normal;
1428 + -webkit-font-smoothing: antialiased;
1429 + -webkit-text-stroke-width: 0.2px;
1430 + -moz-osx-font-smoothing: grayscale;
1431 +}
1432 +.icon-fanhui:before { content: "\e610"; color: #00beef; font-size: 36px;}
1433 +.user-center a {
1434 + position: absolute;
1435 + left: 37px;
1436 + bottom: 7px;
1437 + color: #ff9600;
1438 + font-size: 24px;
1439 + padding: 10px;
1327 } 1440 }
...\ No newline at end of file ...\ No newline at end of file
......
1 #!/bin/sh 1 #!/bin/sh
2 #js css压缩,生成更新包打包 2 #js css压缩,生成更新包打包
3 3
4 -CDN_SERVER='http://cdn.9133.com/static' 4 +CDN_SERVER='http://sdk.uuufish.com/static'
5 5
6 6
7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )" 7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
1 -20170511 1 +20170511
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 6
7 <uses-sdk 7 <uses-sdk
8 android:minSdkVersion="8" 8 android:minSdkVersion="8"
9 - android:targetSdkVersion="19" /> 9 + android:targetSdkVersion="20" />
10 10
11 <!-- SDK start --> 11 <!-- SDK start -->
12 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> 12 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
......
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
2 <config> 2 <config>
3 3
4 <sdkconfig 4 <sdkconfig
5 - YA_APPID="58fd78a9834e7246b8dc0eac" 5 + YA_APPID="5a374e62f0d770280d72f021"
6 - YA_APPKEY="b06b86b79c25774ec758657a7203bae6" 6 + YA_APPKEY="181d78ad8378a2994f7f390b3f5bcd9c"
7 - gamesimplename="fytx_test" 7 + game_url="http://inter.fc65.cn/api/youai/login.php"
8 + gamesimplename="hmwz_hb"
8 sdksimplename="youyu" 9 sdksimplename="youyu"
9 - sdkversioncode="V1_1" 10 + sdkversioncode="V1_0"
10 channelparameter1="" 11 channelparameter1=""
11 channelparameter2="" 12 channelparameter2=""
12 custom="" 13 custom=""
...@@ -14,6 +15,6 @@ ...@@ -14,6 +15,6 @@
14 logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check" 15 logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check"
15 paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm" 16 paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm"
16 payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create" 17 payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create"
17 - usertype="gssaXIIEiL0=" /> 18 + />
18 19
19 </config> 20 </config>
...\ No newline at end of file ...\ No newline at end of file
......

7.05 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

81 KB | W: | H:

81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -34,7 +34,7 @@ function initMatching(){ ...@@ -34,7 +34,7 @@ function initMatching(){
34 Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 34 Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1;
35 var ratio = window.devicePixelRatio; 35 var ratio = window.devicePixelRatio;
36 Core.ratio = ratio; 36 Core.ratio = ratio;
37 - 37 + Core.isShowIdentity = true;
38 38
39 var lastServer = localStorage.getItem('last_server'); 39 var lastServer = localStorage.getItem('last_server');
40 if(lastServer && lastServer.indexOf('http:')==0){ 40 if(lastServer && lastServer.indexOf('http:')==0){
...@@ -89,10 +89,12 @@ function initMatching(){ ...@@ -89,10 +89,12 @@ function initMatching(){
89 if (!Core.sdk_w) Core.sdk_w = 600; 89 if (!Core.sdk_w) Core.sdk_w = 600;
90 _scale = 1; 90 _scale = 1;
91 if(ratio == 2){//5、6、6s(2.4) 91 if(ratio == 2){//5、6、6s(2.4)
92 - _scale = 2.4 / ratio; 92 + _scale = 2.2 / ratio;
93 if(userAgent.indexOf('iPad') != -1){ 93 if(userAgent.indexOf('iPad') != -1){
94 _scale = 2 / ratio; 94 _scale = 2 / ratio;
95 } 95 }
96 + }else if(ratio ==3){//iphoneX
97 + _scale = 3.1 / ratio;
96 }else if(ratio >2.5){//6s plus 98 }else if(ratio >2.5){//6s plus
97 _scale = 2.7 / ratio; 99 _scale = 2.7 / ratio;
98 }else if (ratio < 1) { 100 }else if (ratio < 1) {
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
52 that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面 52 that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面
53 e.stopPropagation(); 53 e.stopPropagation();
54 Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！"); 54 Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
55 + Core.isShowIdentity = false;
55 }); 56 });
57 +
56 } 58 }
57 59
58 Home.prototype.logout_cb = function(data) { 60 Home.prototype.logout_cb = function(data) {
...@@ -1021,6 +1023,9 @@ ...@@ -1021,6 +1023,9 @@
1021 }); 1023 });
1022 } 1024 }
1023 IdentityCard.prototype.show_after = function(){ 1025 IdentityCard.prototype.show_after = function(){
1026 + if(!Core.isShowIdentity){
1027 + $(".js-return-game").attr("href","javascript:Core.finishLogin()");
1028 + }
1024 1029
1025 } 1030 }
1026 Core.registerMod('identityCard', IdentityCard); 1031 Core.registerMod('identityCard', IdentityCard);
...@@ -1208,7 +1213,7 @@ ...@@ -1208,7 +1213,7 @@
1208 if(Core.Data.is_guest == 1){ 1213 if(Core.Data.is_guest == 1){
1209 //游客帐号转正 1214 //游客帐号转正
1210 localStorage.removeItem('guest_n'); 1215 localStorage.removeItem('guest_n');
1211 - Core.showTips('升级账号成功！请妥善保管正式账号！', true); 1216 + Core.showTips('绑定账号成功！请妥善保管正式账号！', true);
1212 delete name_ary[Core.Data.nickname]; 1217 delete name_ary[Core.Data.nickname];
1213 localStorage.setItem('user_names', JSON.stringify(name_ary)); 1218 localStorage.setItem('user_names', JSON.stringify(name_ary));
1214 }else{ 1219 }else{
...@@ -1254,6 +1259,7 @@ ...@@ -1254,6 +1259,7 @@
1254 Core.Data.is_guest = msg.is_guest; 1259 Core.Data.is_guest = msg.is_guest;
1255 Core.Data.username = msg.username; 1260 Core.Data.username = msg.username;
1256 Core.Data.nickname = msg.nickname; 1261 Core.Data.nickname = msg.nickname;
1262 + Core.Data.login_key = msg.login_key;
1257 $("input[name='loginUserName']").val(Core.Data.username); 1263 $("input[name='loginUserName']").val(Core.Data.username);
1258 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]); 1264 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]);
1259 // 强制更新显示home模块,模块自刷新 1265 // 强制更新显示home模块,模块自刷新
......
...@@ -900,6 +900,59 @@ ...@@ -900,6 +900,59 @@
900 } 900 }
901 901
902 Core.registerMod('question_detail', Question_detail); 902 Core.registerMod('question_detail', Question_detail);
903 +
904 + //实名认证
905 + var IdentityCard = function(modId) {
906 + Module.call(this, modId);
907 + }
908 + // 继承基础模块
909 + Core.inherit(IdentityCard, Module);
910 + IdentityCard.prototype.bind = function() {
911 + var that = this;
912 + this.$c.on('click', '.submit', function() {
913 + var identityCard = that.$c.find("input[name='identity_card']").val(),//身份证
914 + compellationName = that.$c.find("input[name='compellation_name']").val(),//姓名
915 + compellationNameReg = /^[\u4e00-\u9fa5]{2,10}$/i;//2-10位汉字
916 + if($.trim(identityCard) == ""){
917 + Core.showTips("请输入身份证号码",false);
918 + return false;
919 + }else if(IsIdCard(identityCard) == false){
920 + Core.showTips("请输入正确的身份证信息",false);
921 + return false;
922 + }else if($.trim(compellationName) == ""){
923 + Core.showTips("请输入姓名",false);
924 + return false;
925 + }else if(!compellationNameReg.test(compellationName)){
926 + Core.showTips("请输入正确的中文姓名",false);
927 + return false;
928 + }
929 + Core.ajax({
930 + type:"post",
931 + url:"/user/bind_identity_card?identity_card="+identityCard+"&compellation_name="+compellationName,
932 + data:{format:"json"},
933 + dataType:"json",
934 + success:function(res){
935 + if(res.code === 0){
936 + Core.showTips('认证成功!', true);
937 + Core.Data.compellation_name = compellationName;
938 + Core.Data.identity_card = identityCard;
939 + setTimeout(function() {
940 + Core.updateMod('channel_list');
941 + }, 500);
942 + }else{
943 + Core.showTips(res.msg, true);
944 + }
945 + }
946 + });
947 + });
948 + }
949 + IdentityCard.prototype.show_after = function(){
950 + if(Core.Data.force_auth == 1){
951 + $(".js-return-game").attr("href","javascript:Core.finishLogin()");
952 + }
953 +
954 + }
955 + Core.registerMod('identityCard', IdentityCard);
903 956
904 /** 957 /**
905 * enter_game_amount 进入sdk的要购买的游戏币 958 * enter_game_amount 进入sdk的要购买的游戏币
...@@ -924,7 +977,15 @@ ...@@ -924,7 +977,15 @@
924 //} else 977 //} else
925 //if (Core.Data.enter_game_amount > 0) { 978 //if (Core.Data.enter_game_amount > 0) {
926 // 需要进入渠道充值页面 979 // 需要进入渠道充值页面
927 - Core.start_page = "channel_list"; 980 + if(Core.Data.identity_card == ""){
981 + //游客登录则先让其实名验证
982 + Core.start_page = "identityCard";
983 + }else{
984 + //正式用户直接跳到充值界面
985 + Core.start_page = "channel_list";
986 + }
987 +
988 +
928 Core.Data.game_amount = Core.Data.enter_game_amount; 989 Core.Data.game_amount = Core.Data.enter_game_amount;
929 Core.Data.youai_star = Core.Data.enter_amount; 990 Core.Data.youai_star = Core.Data.enter_amount;
930 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 991 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
...@@ -933,7 +994,7 @@ ...@@ -933,7 +994,7 @@
933 //} 994 //}
934 } 995 }
935 996
936 -function onBridgeReady() { 997 + function onBridgeReady() {
937 var mainImgUrl = Core.Data.game_icon; 998 var mainImgUrl = Core.Data.game_icon;
938 var mainURL = Core.Data.invite_url;//'http://www.9133.com/game/' + Core.Data.app_id + '.html'; 999 var mainURL = Core.Data.invite_url;//'http://www.9133.com/game/' + Core.Data.app_id + '.html';
939 var mainTitle= '一起玩' + Core.Data.game_name; 1000 var mainTitle= '一起玩' + Core.Data.game_name;
......
This diff is collapsed. Click to expand it.
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
34 <!-- 首页模块 --> 34 <!-- 首页模块 -->
35 <section id="home" class="hide" data-attr="dot" data-auth="1"></section> 35 <section id="home" class="hide" data-attr="dot" data-auth="1"></section>
36 <!-- end --> 36 <!-- end -->
37 +<!--实名验证模块-->
38 +<section id="identityCard" class="hide" data-attr="dot">
39 +</section>
40 +<!--end-->
37 <!-- 兑换元宝列表模块 --> 41 <!-- 兑换元宝列表模块 -->
38 <section id="exchange" class="hide" data-attr="dot" data-auth="1"></section> 42 <section id="exchange" class="hide" data-attr="dot" data-auth="1"></section>
39 <!-- end --> 43 <!-- end -->
...@@ -185,7 +189,27 @@ ...@@ -185,7 +189,27 @@
185 </div> 189 </div>
186 </div> 190 </div>
187 </script> 191 </script>
188 - 192 +<script id="identityCard_template" type="text/x-jquery-tmpl" >
193 + <div class="new-sdk-container">
194 + <div class="SDK-titlebox"></div>
195 + <div class="user-center">
196 + <a href="#channel_list" class="lefticon js-return-game">
197 + <i class="iconfont icon-fanhui"></i>
198 + </a>
199 + 实名认证
200 + </div>
201 + <form action="/user/bind_identity_card" method="post" class="ajax" onkeydown="if(event.keyCode==13) return false;" >
202 + <div class="new-sdk-box">
203 + <div class="input" style="padding:0 25px;"><input type="text" name="identity_card" required placeholder="请输入身份证号码" style="text-align: left;"></div>
204 + <div class="input" style="padding:0 25px;"><input type="text" name="compellation_name" required placeholder="请输入姓名" style="text-align: left;"></div>
205 + <p style="font-size: 24px; text-indent: 1em; color: #999;text-align: left;">根据国家规定，为了保障您的权益，请登记本人实名信息</p>
206 + </div>
207 + <ul class="inline-btn">
208 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">提交</a></li>
209 + </ul>
210 + </form>
211 + </div>
212 +</script>
189 <script id='modify_pwd_template' type='text/x-jquery-tmpl'> 213 <script id='modify_pwd_template' type='text/x-jquery-tmpl'>
190 <div class="header"> 214 <div class="header">
191 <a class="iconfont icon-iconfontxiangyou poslft" href="##home"></a> 215 <a class="iconfont icon-iconfontxiangyou poslft" href="##home"></a>
...@@ -784,7 +808,8 @@ FastClick.attach(document.body); ...@@ -784,7 +808,8 @@ FastClick.attach(document.body);
784 <script type="text/javascript" src="js/core.min.js?201504218002" ></script> 808 <script type="text/javascript" src="js/core.min.js?201504218002" ></script>
785 <script type="text/javascript" src="js/pay.min.js?201504218001" ></script> 809 <script type="text/javascript" src="js/pay.min.js?201504218001" ></script>
786 <script type="text/javascript" src="js/loader.min.js?201504218001"></script> 810 <script type="text/javascript" src="js/loader.min.js?201504218001"></script>
787 - 811 +<!--身份证号码验证：2.0为没有限制年龄-->
812 +<script type="text/javascript" src="js/identity_id_2.0.js" ></script>
788 <script type="text/javascript"> 813 <script type="text/javascript">
789 (function(){ 814 (function(){
790 getData('/sdk/pay/json'); 815 getData('/sdk/pay/json');
......
...@@ -23,6 +23,7 @@ section{ ...@@ -23,6 +23,7 @@ section{
23 a,input,textarea,select { 23 a,input,textarea,select {
24 outline: 0; 24 outline: 0;
25 } 25 }
26 +input[type=button],input[type=text],input[type=password]{-webkit-appearance:none;outline:none}
26 a:focus { 27 a:focus {
27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */ 28 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
28 } 29 }
......
...@@ -1324,4 +1324,117 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder { ...@@ -1324,4 +1324,117 @@ input:-ms-input-placeholder, textarea:-ms-input-placeholder {
1324 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill { 1324 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
1325 background-color: rgb(255, 255, 255) !important; 1325 background-color: rgb(255, 255, 255) !important;
1326 box-shadow: 0 0 0px 1000px white inset !important; 1326 box-shadow: 0 0 0px 1000px white inset !important;
1327 +}
1328 +/**------实名验证--------*/
1329 +
1330 +.SDK-titlebox{
1331 + height: 33px;
1332 + background: #00beef;
1333 +}
1334 +.user-center{
1335 + position: relative;
1336 + text-align: center;
1337 + padding: 26px 0 18px;
1338 + border-bottom: 2px solid #fff;
1339 + color: #00beef;
1340 + font-family: "Microsoft YaHei","微软雅黑";
1341 + font-size: 36px;
1342 +}
1343 +.new-sdk-container .new-sdk-box {
1344 + padding: 20px 37px;
1345 + border-top: 1px solid #c4c3c3;
1346 + box-sizing: border-box;
1347 + -moz-box-sizing: border-box;
1348 + -webkit-box-sizing: border-box;
1349 +}
1350 +.new-sdk-container .new-sdk-box .input {
1351 + margin-bottom: 15px;
1352 + border: 1px solid #c0c0c0;
1353 + /* box-shadow: 1px 2px 2px #c2c2c2 inset; */
1354 + border-radius: 10px;
1355 + -moz-border-radius: 10px;
1356 + -webkit-border-radius: 10px;
1357 + padding: 25px 0;
1358 + background: #fff;
1359 + box-sizing: border-box;
1360 + -webkit-box-sizing: border-box;
1361 + -moz-box-sizing: border-box;
1362 +}
1363 +.new-sdk-container .new-sdk-box .input input {
1364 + display: inline-block;
1365 + width: 100%;
1366 + background: none;
1367 + border: none;
1368 + color: #000;
1369 + font-size: 30px;
1370 + font-family: "Microsoft YaHei","微软雅黑";
1371 + white-space: nowrap;
1372 + text-overflow: ellipsis;
1373 + overflow: hidden;
1374 + word-break: break-all;
1375 + height: 45px;
1376 + line-height: 45px;
1377 + vertical-align: middle;
1378 + margin: 20px 0;
1379 + box-shadow: none;
1380 +}
1381 +ol, ul {
1382 + list-style: none;
1383 +}
1384 +.new-sdk-container .inline-btn {
1385 + overflow: auto;
1386 + zoom: 1;
1387 + width: 88%;
1388 + margin: 0px auto 25px auto;
1389 +}
1390 +.new-sdk-container .inline-btn li {
1391 + float: left;
1392 + width: 45%;
1393 + text-align: center;
1394 + background: #ff9600;
1395 + border-radius: 20px;
1396 + padding: 26px 0;
1397 +}
1398 +.new-sdk-container .inline-btn .btn {
1399 + display: inline-block;
1400 + border: 0;
1401 + background: #00beef;
1402 + color: #fff;
1403 + font-size: 30px;
1404 + font-family: "Microsoft YaHei","微软雅黑";
1405 + letter-spacing: 2px;
1406 + cursor: pointer;
1407 + width: 100%;
1408 + vertical-align: middle;
1409 + border-radius: 20px;
1410 + -moz-border-radius: 20px;
1411 + -webkit-border-radius: 20px;
1412 +}
1413 +.new-sdk-container .inline-btn .btn-orange {
1414 + background: #ff9600;
1415 +}
1416 +/*字体图标*/
1417 +@font-face {font-family: "iconfont";
1418 + src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
1419 + src: url('../font/iconfont.eot?t=1468997064#iefix') format('embedded-opentype'), /* IE6-IE8 */
1420 + url('../font/iconfont.woff?t=1468997064') format('woff'), /* chrome, firefox */
1421 + url('../font/iconfont.ttf?t=1468997064') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
1422 + url('../font/iconfont.svg?t=1468997064#iconfont') format('svg'); /* iOS 4.1- */
1423 +}
1424 +.iconfont {
1425 + font-family:"iconfont" !important;
1426 + font-size:16px;
1427 + font-style:normal;
1428 + -webkit-font-smoothing: antialiased;
1429 + -webkit-text-stroke-width: 0.2px;
1430 + -moz-osx-font-smoothing: grayscale;
1431 +}
1432 +.icon-fanhui:before { content: "\e610"; color: #00beef; font-size: 36px;}
1433 +.user-center a {
1434 + position: absolute;
1435 + left: 37px;
1436 + bottom: 7px;
1437 + color: #ff9600;
1438 + font-size: 24px;
1439 + padding: 10px;
1327 } 1440 }
...\ No newline at end of file ...\ No newline at end of file
......
1 #!/bin/sh 1 #!/bin/sh
2 #js css压缩,生成更新包打包 2 #js css压缩,生成更新包打包
3 3
4 -CDN_SERVER='http://cdn.9133.com/static' 4 +CDN_SERVER='http://sdk.uuufish.com/static'
5 5
6 6
7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )" 7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
1 -20170511 1 +20170511
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
11 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt 11 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12 12
13 # Project target. 13 # Project target.
14 -target=android-19 14 +target=android-20
......