seam vor 8 Jahren
Ursprung
Commit
8a8e48605d

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

+ 2 - 2
www/webapp/common/js/native.js

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

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
www/webapp/moonclub/dist/js/model/user.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
www/webapp/moonclub/dist/js/native.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
www/webapp/moonclub/dist/js/page/userInfo.js


+ 1 - 1
www/webapp/moonclub/js/model/user.js

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

+ 1 - 1
www/webapp/moonclub/js/page/userInfo.js

@@ -187,7 +187,7 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user', 'product', 'api
   },
   beforeopen: function (pageData, dtd) {
     var $view = this;
-    console.log(user.userData)
+    console.log(user.id)
     var $doc = $(document);
     $doc.trigger('spa:openloader');
     if ($doc) {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.