seam 8 жил өмнө
parent
commit
3eebfeb0ea

+ 16 - 16
www/protected/modules/moonclub/views/web/index.php

@@ -11,28 +11,28 @@
   <meta http-equiv="Pragma" content="no-cache">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=20170802">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=20170804">
   <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170802">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170804">
   <!--      <link rel="stylesheet" href="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=20170802-->
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=20170804-->
   <?php ////echo time();?><!--">-->
   <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170802">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170804">
   <!--    <link href="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170802" rel="stylesheet">-->
-  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=20170802">
-  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/LCalendar.css?v=20170802">
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170804" rel="stylesheet">-->
+  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=20170804">
+  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/LCalendar.css?v=20170804">
 
   <!--     <script src="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170802"></script> -->
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170804"></script> -->
   <link rel="stylesheet"
         href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css" media="screen"
         title="no title">
   <script
-    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170802"></script>
-  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=20170802"></script>-->
-  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/LCalendar.js?v=20170802"></script>
+    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170804"></script>
+  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=20170804"></script>-->
+  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/LCalendar.js?v=20170804"></script>
   <style>
     html {
       height: 100%
@@ -187,9 +187,9 @@
       }
     }
   </style>
-  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170802"
+  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170804"
           crossOrigin="anonymous"></script>
-  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170802"></script>
+  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170804"></script>
   <script type="text/javascript">
     window.bughd = window.bughd || function () {
       };
@@ -246,10 +246,10 @@
       location.hash = '';
     }
     var debug = false;
-//    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20170802';
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170802';
+//    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20170804';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170804';
     if (debug) {
-      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=20170802' + (new Date()).getTime();
+      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=20170804' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
     }
     document.getElementById('graceMain').setAttribute('data-main', main);

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/moonclub/dist/js/page/userInfo.js


+ 129 - 124
www/webapp/moonclub/js/page/userInfo.js

@@ -21,10 +21,11 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
     var codeLength = 4; //验证码的长度
     var i = 0
     // var checkCode = $("#checkCode").val();
-    var random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-      'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'); //随机数
+    // var random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+    //   'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'); //随机数
+    var random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9); //随机数
     for (; i < codeLength; i++) { //循环操作
-      var charIndex = Math.floor(Math.random() * 36); //取得随机数的索引
+      var charIndex = Math.floor(Math.random() * 10); //取得随机数的索引
       code += random[charIndex]; //根据索引取得随机数加到code上
     }
     return code; //把code值赋给验证码
@@ -76,140 +77,144 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
       }, $view);
       // 获取短信验证码
       $.newTouch('.createCode', function (event) {
-          event.preventDefault();
-          var mobile = $(".user-mobile").val();
-          var createCode1 = $('.createCode');
-          var inputCode = $(".input").val(); //取得输入的验证码并转化为大写
-          var s = 60, t;
-          if (viewShow === false) {
-            model('该操作过于频繁,请您60秒后,重新尝试!', '确定');
-            return;
-          } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
-            model('请重新输入您的手机号码', '确定');
-            return;
-          } else if (inputCode.length <= 0) { //若输入的验证码长度为0
-            model('您输入的验证码有误,请重新输入!', '确定');
-            return;
-          } else if (inputCode.toUpperCase() != code) { //若输入的验证码与产生的验证码不一致时
-            //则弹出验证码输入错误
-            $('#checkCode').val(createCode()); //刷新验证码
-            model('您输入的验证码有误,请重新输入!', '确定');
-            return;
-          } else if (viewShow) {
-            // 计算60秒插件
-            t = setInterval(function () {
-              viewShow = false
-              createCode1.val(s--);
-              if (s < 0) {
-                s = 60;
-                viewShow = true
-                createCode1.val("获取验证码");
-                $('#checkCode').val(createCode()); //刷新验证码
-                clearTimeout(t);
-              }
-            }, 1000);
-            $('#checkCode').val(createCode()); //刷新验证码
-            api.getCode({
-              mobile: mobile
-            }, function (res) {
-              if (res.success) {
-                smsCode = res.data.code
-                model('验证码已发送至您的手机,请注意查收!', '确定');
-                return;
-              } else {
-                model('该操作过于频繁,请您60秒后,重新尝试!', '确定');
-              }
-            })
-          }
-        }, $view
-      )
-
-      $.newTouch('.checkCodeBtn', function (event) {
         event.preventDefault();
-        $('.code').val(createCode())
-      }, $view)
-
-      // 咨询
-      $.newTouch('#submit', function (event) {
-        // event.preventDefault();
-        $('.user-name', $view).blur();
-        $('.user-mobile', $view).blur();
-        $('.input', $view).blur();
-        $('.smsCode', $view).blur();
-        var name = $(".user-name").val();
         var mobile = $(".user-mobile").val();
-        var num = $(".user-num").val();
-        var smsCodeInput = $(".smsCode").val();
-        smsCodeInput = parseInt(smsCodeInput)
-        if (name == null || name == undefined || name == '') {
-          model('请重新输入您的姓名!', '确定');
-          return;
-        } else if (num === undefined) {
-          model('请重新选择您的预产期!', '确定');
+        var createCode1 = $('.createCode');
+        var inputCode = $(".input").val(); //取得输入的验证码并转化为大写
+        var s = 60, t;
+        if (viewShow === false) {
+          model('该操作过于频繁,请您60秒后,重新尝试!', '确定');
           return;
         } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
-          model('请重新输入您的手机号码', '确定');
+          model('请重新输入您的手机号码', '确定');
           return;
-        } else if (smsCode !== smsCodeInput) { // 判断验证码
-          model('请重新填写您的短信验证码!', '确定');
+        } else if (inputCode.length <= 0) { //若输入的验证码长度为0
+          model('您输入的验证码有误,请重新输入!', '确定');
           return;
-        } else {
-          api.getReserveMonth({
-            user_id: user.id,
-            user_name: name,
-            homeType: 1,
-            num: num,
-            mobile: mobile,
+        } else if (inputCode.toUpperCase() != code) { //若输入的验证码与产生的验证码不一致时
+          //则弹出验证码输入错误
+          $('#checkCode').val(createCode()); //刷新验证码
+          model('您输入的验证码有误,请重新输入!', '确定');
+          return;
+        } else if (viewShow) {
+          // 计算60秒插件
+          t = setInterval(function () {
+            viewShow = false
+            createCode1.val(s--);
+            if (s < 0) {
+              s = 60;
+              viewShow = true
+              createCode1.val("获取验证码");
+              $('#checkCode').val(createCode()); //刷新验证码
+              clearTimeout(t);
+            }
+          }, 1000);
+          $('#checkCode').val(createCode()); //刷新验证码
+          api.getCode({
+            mobile: mobile
           }, function (res) {
             if (res.success) {
-              model(res.message, '');
+              smsCode = res.data.code
+              model('验证码已发送至您的手机,请注意查收!', '确定');
               return;
             } else {
-              model(res.message, '');
-              return;
+              model('该操作过于频繁,请您60秒后,重新尝试!', '确定');
             }
-            console.log(res);
-          });
+          })
         }
-      }, $view);
-      // 模态框
-      $.newTouch('.model-content', function (event) {
-        // event.preventDefault();
-        $('.model').css('height', '0');
-        $('.model-box').css('display', 'none');
-      }, $view)
-      dtd.resolve();
-    },
-    beforeopen: function (pageData, dtd) {
-      var $view = this;
-      var $doc = $(document);
-      $doc.trigger('spa:openloader');
-      if ($doc) {
-        $doc.trigger('spa:closeloader');
-        var tpl = template('userInfo/index');
-        $('.spa-page-body', $view).html(tpl);
-        $('#checkCode').val(createCode())
-        setTimeout(function () {
-          pageData.scroll = new IScroll('#userInfoScroll');
-          var calendar = new LCalendar();
-          calendar.init({
-            'trigger': '#demo1', //标签id
-            'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
-            'minDate': '1900-1-1', //最小日期
-            'maxDate': (new Date().getFullYear() + 10) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() //最大日期
-          });
-        }, 700);
+      }, $view
+    )
+
+    $.newTouch('.checkCodeBtn', function (event) {
+      event.preventDefault();
+      $('.code').val(createCode())
+    }, $view)
+
+    // 咨询
+    $.newTouch('#submit', function (event) {
+      // event.preventDefault();
+      $('.user-name', $view).blur();
+      $('.user-mobile', $view).blur();
+      $('.input', $view).blur();
+      $('.smsCode', $view).blur();
+      var name = $(".user-name").val();
+      var mobile = $(".user-mobile").val();
+      var num = $(".user-num").val();
+      var smsCodeInput = $(".smsCode").val();
+      smsCodeInput = parseInt(smsCodeInput)
+      // console.log(smsCode)
+      if (name == null || name == undefined || name == '') {
+        model('请重新输入您的姓名!', '确定');
+        return;
+      } else if (num === undefined) {
+        model('请重新选择您的预产期!', '确定');
+        return;
+      } else if (!(/^1[34578]\d{9}$/.test(mobile)) || mobile == 0) {
+        model('请重新输入您的手机号码!', '确定');
+        return;
+      } else if (smsCode !== smsCodeInput) { // 判断验证码
+        model('请重新填写您的短信验证码!', '确定');
+        return;
+      } else {
+        api.getReserveMonth({
+          user_id: user.id,
+          user_name: name,
+          homeType: 1,
+          num: num,
+          mobile: mobile,
+        }, function (res) {
+          if (res.success) {
+            model(res.message, '确定');
+            return;
+          } else {
+            model(res.message, '确定');
+            return;
+          }
+          // console.log(res);
+        });
       }
-      dtd.resolve();
-    }
-    ,
-    afteropen: function (pageData, dtd) {
-      dtd.resolve();
-    }
-    ,
-    beforeclose: function (pageData, dtd) {
-      dtd.resolve();
+    }, $view);
+    // 模态框
+    $.newTouch('.model-content', function (event) {
+      // event.preventDefault();
+      if ($('.model-title')[0].innerHTML === '提交成功') {
+        location.href="http://common.yiguanjia.me/index.php?r=moonclub/web/index";
+      }
+      $('.model').css('height', '0');
+      $('.model-box').css('display', 'none');
+    }, $view)
+    dtd.resolve();
+  },
+  beforeopen: function (pageData, dtd) {
+    var $view = this;
+    var $doc = $(document);
+    $doc.trigger('spa:openloader');
+    if ($doc) {
+      $doc.trigger('spa:closeloader');
+      var tpl = template('userInfo/index');
+      $('.spa-page-body', $view).html(tpl);
+      $('#checkCode').val(createCode())
+      setTimeout(function () {
+        pageData.scroll = new IScroll('#userInfoScroll');
+        var calendar = new LCalendar();
+        calendar.init({
+          'trigger': '#demo1', //标签id
+          'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
+          'minDate': '1900-1-1', //最小日期
+          'maxDate': (new Date().getFullYear() + 10) + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() //最大日期
+        });
+      }, 700);
     }
+    dtd.resolve();
+  }
+  ,
+  afteropen: function (pageData, dtd) {
+    dtd.resolve();
+  }
+  ,
+  beforeclose: function (pageData, dtd) {
+    dtd.resolve();
   }
+}
 })
-;
+;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно