首页 发现 帮助
注册 登录
chenzhiguang
/
bigSceneEdit_java
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

tremble 5 年之前
父节点
9877660ac4 838b2ea771
当前提交
494b85c676
共有 4 个文件被更改，包括 50 次插入 和 11 次删除
分列视图 显示文件统计
  1. 37 2
      index.html
  2. 2 2
      js/main_2020_edit.js
  3. 4 4
      js/main_2020_show.js
  4. 7 3
      js/manage.js

+ 37 - 2
index.html
查看文件 

@@ -28,9 +28,23 @@
 
             window.navigationStart = window.performance.timing.navigationStart;
 
         } else {
 
             window.navigationStart = Date.now() + 300;
 
-        }
 
+        } 
+        
     </script>
 
-
 
+    <style>
 
+        #consoleLog{ 
+          width: 120px;
 
+          height: 153px;
 
+          position: absolute;
 
+          right: 0px;
 
+          bottom: 160px;
 
+          z-index: 999999;
 
+          color: black;
 
+          opacity: 0.9;
 
+            font-size: 12px;
 
+        }
 
+    
+    </style>
 
 </head>
 
 
 <body>
 
@@ -769,6 +783,27 @@
 
  </div>
 
  <![endif]-->
 
     </div>
 
+    <script>
 
+        if(number == "TEST"){
 
+            var textarea = document.createElement('textarea');
 
+              textarea.id = "consoleLog";
 
+
 
+              document.getElementsByTagName("body")[0].appendChild(textarea);
 
+              var list = ["log", "error", "warn", "debug", "info", "time", "timeEnd"]
 
+              var exchange = function (o) {
 
+                console["old" + o] = console[o];
 
+                console[o] = function (str) {
 
+                  console["old" + o](str);
 
+                  var t = document.getElementById("consoleLog").innerHTML;
 
+                  document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;
 
+                }
 
+              }
 
+
 
+              for (var i = 0; i < list.length; i++) {
 
+                exchange(list[i])
 
+              } 
+        }
 
+    </script>
 
     <script src="js/lib/jquery-2.1.1.min.js" class="build keep"></script>
 
     <script src="js/lib/player-0.0.12.min.js" class="build keep"></script>
 
     <script src="js/Tween.js"></script>

+ 2 - 2
js/main_2020_edit.js
查看文件 

@@ -6393,7 +6393,7 @@ function o(a, s, l) {
 
                     })
 
                 }(0, l),
 
                 function(e, t) {
 
-                    $("#play").find("a").on("mousedown touchstart", function(e) {
 
+                    $("#play").on("mousedown touchstart", function(e) {
 
                         y(e),
 
                         _e("tour"),
 
                         q.play(),
 
@@ -6409,7 +6409,7 @@ function o(a, s, l) {
 
                         })
 
                     }
 
                     ,
 
-                    $("#pause").find("a").on("mousedown touchstart", function(e) {
 
+                    $("#pause").on("mousedown touchstart", function(e) {
 
                         y(e),
 
                         q.pause(),
 
                         R.trackAlways("showcase_gui", {

+ 4 - 4
js/main_2020_show.js
查看文件 

@@ -6339,7 +6339,7 @@ window.Modernizr = function(n, e, t) {
 
                 }
 
             }
 
             function A(e, t) {
 
-                $("#play").find("a").on("mousedown touchstart", function(e) {
 
+                $("#play").on("mousedown touchstart", function(e) {
 
  					l(e); 
                     Ze("tour");
 
                     ve.play();
 
@@ -6355,7 +6355,7 @@ window.Modernizr = function(n, e, t) {
 
                        gui_action: "play_highlights"
 
                    })
 
                };
 
-                $("#pause").find("a").on("mousedown touchstart", function(e) {
 
+                $("#pause").on("mousedown touchstart", function(e) {
 
                     l(e),
 
                     ve.pause(),
 
                     J.trackAlways("showcase_gui", {
 
@@ -14609,8 +14609,8 @@ window.Modernizr = function(n, e, t) {
 
                 if (window.MP_PREFETCHED_MODELDATA.hoticon){
 
                     
                     g_HotImage = {
 
-                        point: "https://super.4dage.com/images/4dagePoint2.png"||window.MP_PREFETCHED_MODELDATA.hoticon.default,
 
-                        point2: "https://super.4dage.com/images/4dagePoint.png"||window.MP_PREFETCHED_MODELDATA.hoticon.higt
 
+                        point: window.MP_PREFETCHED_MODELDATA.hoticon.default || "https://super.4dage.com/images/4dagePoint2.png",
 
+                        point2: window.MP_PREFETCHED_MODELDATA.hoticon.higt || "https://super.4dage.com/images/4dagePoint.png"
 
                     } ;
 
                 }
 
                 //czj 判断someData 有没有backgroundMusic 添加音乐

+ 7 - 3
js/manage.js
查看文件 

@@ -199,9 +199,9 @@ Manage.prototype.switchBgmState = function(state){
 
 
 
 Manage.prototype.weixinShare = function() {
 
-
 
+    console.log("weixinShare")
 
     $.ajax({    
-        url:'https://www.4dage.com/Weixin3/wechatconfig/jssdk', 
+        url:'https://www.4dage.com/wechat/jssdk/', 
         type: "post",
 
         data : {
 
             'url' : location.href.split('#')[0]
 
@@ -209,6 +209,9 @@ Manage.prototype.weixinShare = function() {
 
         dataType:"jsonp",     
         jsonpCallback:"success_jsonp",         
         success:function(data,textStatus){
 
+            console.log("weixinShare success")
 
+            console.log(data.appId)
 
+            
             wx.config({
 
                 // debug : true,
 
                 appId : data.appId,
 
@@ -237,7 +240,7 @@ Manage.prototype.weixinShare = function() {
 
         }); 
     
         var success_jsonp = function(json){
 
-        console.log(json);
 
+            console.log(json);
 
         };
 
 
 
@@ -245,6 +248,7 @@ Manage.prototype.weixinShare = function() {
 
         // config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，config是一个客户端的异步操作，所以如果需要在页面加载时就调用相关接口，则须把相关接口放在ready函数中调用来确保正确执行〿
 
         //对于用户触发时才调用的接口，则可以直接调用，不需要放在ready函数中〿
 
         //分享到朋友圈 
+        console.log(g_weixinObj)
 
         wx.onMenuShareTimeline({ 
             title: g_weixinObj.title, // 分享标题 
             link: g_weixinObj.lineLink, // 分享链接