Browse Source

Merge branch 'test' of git.oschina.net:yiguanjia/php into test

north 8 years ago
parent
commit
6f45ebfe27

File diff suppressed because it is too large
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/moonclub/dist/js/page/Registered.js


+ 7 - 3
www/webapp/moonclub/js/page/Registered.js

@@ -147,6 +147,7 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
           var inputCode = $(".input").val(); //取得输入的验证码并转化为大写
           var s = 60, t;
           if (viewShow === false) {
+            $(".smsCode").val(smsCode)
             model('该操作过于频繁,请您60秒后,重新尝试!', '确定');
             return;
           } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
@@ -246,16 +247,19 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
             user_name: name,
             card_id: CardId,
             address: userAddress,
-            sex: 1,
+            sex: sex,
             homeType: 1,
             time: num,
             mobile: mobile,
           }, function (res) {
             if (res.success) {
-              model('', res.message);
+              model(res.message, '确定');
+              console.log(res.message)
+              // window.history.go(0)
+              // location.href="http://common.yiguanjia.me/index.php?r=moonclub/web/index";
               return;
             } else {
-              model('', res.message);
+              model(res.message, '确定');
               return;
             }
             console.log(res);

Some files were not shown because too many files changed in this diff