0

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

@@ -55,8 +55,7 @@ define(function (require) {
           //此处有一个循环引用
           require('api').getO2oUserInfo({
             request_from: 'weixin',
-            user_id: localStorage.getItem('wxUserID'),
-            user_xyh_id: localStorage.getItem('xyhwxUserID')
+            user_id: localStorage.getItem('wxUserID')
           }, function (res) {
             if (typeof(that.getUserInfoCallback) == 'function') {
               that.getUserInfoCallback(res);
@@ -250,7 +249,6 @@ define(function (require) {
         wx: function () {
           //目前加上参数，绕过验证，后面再加上相关的验证
           param['user_id'] = localStorage.getItem('wxUserID');
-          param['user_xyh_id'] = localStorage.getItem('xyhwxUserID');
           param['request_from'] = 'weixin';
           if (that.getSignCallback) {
             that.getSignCallback(param);

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

@@ -6,16 +6,16 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		if (typeof User.instance === 'object') {
 			return User.instance;
 		}
+		// localStorage.getItem('xyhwxUserID')
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = ''; //5870c935a84ea0417e8b456f
+		this.id = localStorage.getItem('xyhwxUserID'); //5870c935a84ea0417e8b456f
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';
 		this.mobile = '';
 		this.balance = 0;
 		this.info = {};
-		this.userData = null;
 		this.orders = {
 			1: {
 				data: [],
@@ -118,7 +118,6 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		var that = this;
 		console.log(that)
 		native.getUserInfo(function (res) {
-			this.userData = res;
 			loginWithData.call(that, res);//loginWithData-登录数据
 			if (typeof(callback) == 'function') {//判断callback是否为函数.
 				callback();//调用函数
@@ -188,7 +187,6 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		var that = this;
 		console.log(that);
 		this.getUserInfo(function (res) {//在获取用户信息
-			this.userData = res
 			if (that.id == '') {
 				native.login(function (resA) {//本地中读取是否存在登陆数据
 

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

@@ -75,7 +75,9 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
       $.newTouch('.checkCodeBtn', function (event) {
         $(".user-name").val(user.id)
         console.log(user.id)
-        alert(user.id)
+        console.log(localStorage.getItem('wxUserID'))
+        console.log(localStorage.getItem('xyhwxUserID'))
+        // alert(user.id)
         $('#checkCode').val(createCode()); //刷新验证码
       }, $view);
       // 获取短信验证码