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

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=20170804">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=20170806">
   <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170804">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170806">
   <!--      <link rel="stylesheet" href="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=20170804-->
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=20170806-->
   <?php ////echo time();?><!--">-->
   <link rel="stylesheet"
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170804">
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170806">
   <!--    <link href="-->
-  <?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">
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170806" rel="stylesheet">-->
+  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=20170806">
+  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/LCalendar.css?v=20170806">
 
   <!--     <script src="-->
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170804"></script> -->
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170806"></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=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>
+    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170806"></script>
+  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=20170806"></script>-->
+  <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/LCalendar.js?v=20170806"></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=20170804"
+  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170806"
           crossOrigin="anonymous"></script>
-  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170804"></script>
+  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170806"></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=20170804';
-    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=20170806';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170806';
     if (debug) {
-      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=20170804' + (new Date()).getTime();
+      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=20170806' + (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);

www/webapp/moonclub/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '5870c935a84ea0417e8b456f'; //5870c935a84ea0417e8b456f
+		this.id = ''; //5870c935a84ea0417e8b456f
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

www/webapp/moonclub/js/page/userInfo.js

@@ -73,6 +73,8 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
       }, $view);
       // 重置验证码
       $.newTouch('.checkCodeBtn', function (event) {
+        $(".user-name").val(user.id)
+        console.log(user.id)
         $('#checkCode').val(createCode()); //刷新验证码
       }, $view);
       // 获取短信验证码
@@ -194,6 +196,7 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
       var tpl = template('userInfo/index');
       $('.spa-page-body', $view).html(tpl);
       $('#checkCode').val(createCode())
+      $(".user-name").val(user.id)
       setTimeout(function () {
         pageData.scroll = new IScroll('#userInfoScroll');
         var calendar = new LCalendar();