洪海涛 %!s(int64=8) %!d(string=hai) anos
pai
achega
d71fb8d93f

+ 2 - 2
www/protected/modules/o2o/views/web/index.php

@@ -13,7 +13,7 @@
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
   <link rel="stylesheet"
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017030912">
+  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017030914">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
   <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
   <style>
@@ -79,7 +79,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017030912';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017030914';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

+ 2 - 1
www/webapp/o2o/css/hire.css

@@ -49,4 +49,5 @@
 }
 .spa-page-hire .des .bold {
     font-weight: 500;
-}
+}
+/*.spa-page-hire video{display:none}*/

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
www/webapp/o2o/dist/js/page/hire.js

@@ -1 +1 @@
-define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"壹管家保洁师招聘",body:"",init:function(i,s){var o=this,u=$(document),a=e("hire/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#hireScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),setTimeout(function(){var e=document.getElementById("liveVideo"),t=document.getElementById("liveCanvas"),n=t.getContext("2d"),r=null;e.addEventListener("play",function(){r=setInterval(function(){n.drawImage(myPlayer,0,0,640,320)},20)},!1),e.addEventListener("pause",function(){clearInterval(r)},!1),e.addEventListener("ended",function(){clearInterval(r)},!1)},500),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},o),s.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"壹管家保洁师招聘",body:"",init:function(i,s){var o=this,u=$(document),a=e("hire/index",{showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",o).html(a),setTimeout(function(){i.scroll=new IScroll("#hireScroll")},50),$.newTouch(".back-button",function(e){r.call(this,e)},o),o.on("tapBackButton",function(e){r.call(this,e)}),o.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".service-telephone",function(e){e.preventDefault(),t.call("021-62109097")},o),s.resolve()}}});

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/o2o/js/build/template.js


+ 24 - 24
www/webapp/o2o/js/page/hire.js

@@ -36,30 +36,30 @@ define(['template', 'native', 'config'], function (template, native, config) {
 				back.call(this, event);
 			});
 
-			setTimeout(function () {
-                //获取video
-                var oLiveVideo=document.getElementById("liveVideo");
-                //获取canvas画布
-                var oLiveCanvas=document.getElementById("liveCanvas");
-                //设置画布
-                var oLiveCanvas2D=oLiveCanvas.getContext('2d');
-                //设置setinterval定时器
-                var bLiveVideoTimer=null;
-                //监听播放
-                oLiveVideo.addEventListener('play',function() {
-                    bLiveVideoTimer=setInterval(function() {
-                        oLiveCanvas2D.drawImage(myPlayer,0,0,640,320);
-                    },20);
-                },false);
-                //监听暂停
-                oLiveVideo.addEventListener('pause',function() {
-                    clearInterval(bLiveVideoTimer);
-                },false);
-                //监听结束
-                oLiveVideo.addEventListener('ended',function() {
-                    clearInterval(bLiveVideoTimer);
-                },false);
-            },500);
+            // setTimeout(function () {
+            //     //获取video
+            //     var oLiveVideo=document.getElementById("liveVideo");
+            //     //获取canvas画布
+            //     var oLiveCanvas=document.getElementById("liveCanvas");
+            //     //设置画布
+            //     var oLiveCanvas2D=oLiveCanvas.getContext('2d');
+            //     //设置setinterval定时器
+            //     var bLiveVideoTimer=null;
+            //     //监听播放
+            //     oLiveVideo.addEventListener('play',function() {
+            //         bLiveVideoTimer=setInterval(function() {
+            //             oLiveCanvas2D.drawImage(myPlayer,0,0,640,320);
+            //         },20);
+            //     },false);
+            //     //监听暂停
+            //     oLiveVideo.addEventListener('pause',function() {
+            //         clearInterval(bLiveVideoTimer);
+            //     },false);
+            //     //监听结束
+            //     oLiveVideo.addEventListener('ended',function() {
+            //         clearInterval(bLiveVideoTimer);
+            //     },false);
+            // },500);
 
 
 			//客服电话

+ 2 - 2
www/webapp/o2o/tpl/hire/index.html

@@ -7,8 +7,8 @@
 </header>
 {{ /if }}
 <div class="content" id="placeOrderScroll">
-    <video src="http://wozhua-others.qiniudn.com/20160215-wozhua-2.MP4" poster="http://wozhua-others.qiniudn.com/20160215-wozhua-2.MP4?vframe/jpg/offset/1/w" style="display:none;" id="liveVideo" x5-video-player-type='h5' x5-video-player-fullscreen='true'></video>
-    <canvas id="canvas"></canvas>
+    <video src="http://wozhua-others.qiniudn.com/20160215-wozhua-2.MP4" poster="http://wozhua-others.qiniudn.com/20160215-wozhua-2.MP4?vframe/jpg/offset/1/w" id="liveVideo" x5-video-player-type='h5' x5-video-player-fullscreen='true'></video>
+    <!--<canvas id="canvas"></canvas>-->
     <div class="top-content">
         <p>招募上门宠物保洁师</p>
     </div>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio