Merge branch 'test'

www/protected/controllers/ROrderController.php

@@ -737,7 +737,7 @@ class ROrderController extends AdminController{
 
     public function actionDelOrder(){
        $delOrder =  array('5826a4c89f5160d1048b52bf');
-           $total = 0;
+        $total = 0;
         foreach($delOrder as $value){
             $order = ROrder::model()->get(new MongoId($value));
             if($order->delete()){

www/protected/modules/o2o/controllers/MyOrderController.php

@@ -163,8 +163,8 @@ class MyOrderController extends CController {
         if (!$order_obj || !$flag) {
             O2oApp::response(false, '用户或订单ID错误', []);
         }
-
-        $order_obj->signUrl = $url;
+        $url = get_object_vars(json_decode($url));
+        $order_obj->signUrl = 'http://odulcd8g1.bkt.clouddn.com/'.$url['hash'];
         $order_obj->status = 6;
         $success = $order_obj->save();
         O2oApp::response($success, '保存失败，请重试', []);

www/protected/modules/o2o/views/myOrder/info.php

@@ -1,5 +1,6 @@
 <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=B349f0b32ef6e78b2e678f45cb9fddaf"></script>
 <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/jq-signature.min.js"></script>
+<!--<link rel="stylesheet" href="--><?php //echo Yii::app()->request->baseUrl; ?><!--/css/bootstrap-3.3.7.min.css">-->
 <div>
     <div id="header">
         <div class="am-g">
@@ -99,12 +100,12 @@
         </div>
     </div>
 </div>
-<div class="container" id="pics" style="position: fixed;width: 100%;background: #ffff00;top:0;display: none;">
+<div class="container" id="pics" style="position: fixed;width: 100%;background: #fff;top:0;display: none;">
     <div class="row">
         <div class="col-xs-12">
             <div class="js-signature"></div>
         </div>
-        <p style="margin: 0">
+        <p style="margin: 0;text-align:center;border-top: 1px solid rgba(0,0,0,0.3);">
             <button id="clearBtn" class="btn btn-default" onclick="clearCanvas();">清除</button>
             &nbsp;
             <button id="saveBtn" class="btn btn-default" onclick="saveSignature();" disabled>保存</button>
@@ -199,11 +200,7 @@
         });
         // 确认上门
         $('#confirm_come').click(function () {
-            $('#pics').css('display', 'block');
-            $('.js-signature').eq(0).on('jq.signature.changed', function () {
-                $('#saveBtn').attr('disabled', false);
-            });
-            /*$.vloading('open');
+            $.vloading('open');
             $.post(
                 '/index.php?r=o2o/myOrder/techCome',
                 {
@@ -216,18 +213,22 @@
                     if (data.success) {
                         $('#setout_container').addClass('am-hide');
                         $('#come_container').addClass('am-hide');
-                        $('#has_come_container').addClass('am-hide');
-//                        $('#has_come_success').removeClass('am-hide');
+                        $('#has_come_container').removeClass('am-hide');
+                        $('#has_come_success').addClass('am-hide');
                     } else {
                         $.valert(data.msg);
                     }
                 }
-            );*/
+            );
         });
         //已完成
         $('#has_come_container').click(function () {
             /*调出手写板*/
 
+            $('#pics').css('display', 'block');
+            $('.js-signature').eq(0).on('jq.signature.changed', function () {
+                $('#saveBtn').attr('disabled', false);
+            });
         });
     });
     function putb64() {
@@ -268,7 +269,6 @@
         url = $('.js-signature').eq(0).jqSignature('getDataURL');
         if (url != undefined) {
             $('#pics').css('display', 'none');
-            console.log(url);
             //七牛上传照片
             putb64();
         }
@@ -300,7 +300,7 @@
                     v_order.info = content;
                     for (var j in content.technicians) {
                         if (content.technicians[j]['technician_id'] == user) {
-                            console.log(content.status);
+
                             if (content.status != 4 && content.status != 5 && content.status != 6 && $.inArray(content.status, [1, 2, 3]) != -1) {
                                 $('#setout_container').removeClass('am-hide');
                                 $('#come_container').addClass('am-hide');

www/webapp/o2o/js/page/home.js

@@ -183,15 +183,15 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			 }, $view);  */
 
 			// 双十一活动
-			$.newTouch('.btn-home-day', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: 'activity-day',
-					pushData: {
-						needReset: true
-					}
-				});
-			}, $view);
+			// $.newTouch('.btn-home-day', function (event) {
+			// 	event.preventDefault();
+			// 	$doc.trigger('spa:navigate', {
+			// 		hash: 'activity-day',
+			// 		pushData: {
+			// 			needReset: true
+			// 		}
+			// 	});
+			// }, $view);
 			// 民宿保洁
 			$.newTouch('.btn-homestay', function (event) {
 				event.preventDefault();

www/webapp/o2o/tpl/home/index.html

@@ -21,32 +21,33 @@
 							<div class="swiper-wrapper">
 								<div class="swiper-slide">
 									<!--<img class="btn-appliances" data-product-type="9" src="http://odulvej8l.bkt.clouddn.com/%E7%AE%A1%E5%AE%B6.jpg" alt="">-->
-									<img class="btn-home-day" data-product-type="9" src="http://odulvej8l.bkt.clouddn.com/11%E5%85%83banner.jpg" alt="">
+									<img class="btn-home-day lazy" data-product-type="9" src="http://odulvej8l.bkt.clouddn.com/1111%E5%85%83banner.jpg" alt="">
+									<!--<img src="http://odulvej8l.bkt.clouddn.com/11%E5%85%83banner.jpg" alt="">-->
 								</div>
 								<div class="swiper-slide btn-banner-recharge">
-									<img src="http://odulvej8l.bkt.clouddn.com/banner-2.jpg" alt="">
+									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner-2.jpg" alt="">
 								</div>
 								<div class="swiper-slide btn-banner-coupon">
-									<img src="http://odulvej8l.bkt.clouddn.com/%E7%AE%A1%E5%AE%B6-2.jpg" alt="">
+									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/%E7%AE%A1%E5%AE%B6-2.jpg" alt="">
 								</div>
 							</div>
 							<div class="pagination"></div>
 						</div>
-						<img class="home-remy" src="http://odulvej8l.bkt.clouddn.com/%E5%9B%BE%E6%A0%87-01.jpg" alt="">
+						<img class="home-remy lazy" src="http://odulvej8l.bkt.clouddn.com/%E5%9B%BE%E6%A0%87-01.jpg" alt="">
 
 						<div class="home-box">
 							<div class="width-percent-50 box-align-center">
-								<img class="btn-secondary" src="http://odulvej8l.bkt.clouddn.com/4-1-01.png" alt="">
+								<img class="btn-secondary lazy" src="http://odulvej8l.bkt.clouddn.com/4-1-01.png" alt="">
 							</div>
 							<div class="width-percent-50 box-align-center ">
-								<img class="btn-appliances" data-product-type="4" src="http://odulvej8l.bkt.clouddn.com/4-2-01.png"
+								<img class="btn-appliances lazy" data-product-type="4" src="http://odulvej8l.bkt.clouddn.com/4-2-01.png"
 								     alt="">
 							</div>
 							<div class="width-percent-50 box-align-center">
-								<img class="btn-homestay" src="http://odulvej8l.bkt.clouddn.com/4-3-01.png" alt="">
+								<img class="btn-homestay lazy" src="http://odulvej8l.bkt.clouddn.com/4-3-01.png" alt="">
 							</div>
 							<div class="width-percent-50 box-align-center">
-								<img class="btn-homeenterprise" src="http://odulvej8l.bkt.clouddn.com/4-4-01.png" alt="">
+								<img class="btn-homeenterprise lazy" src="http://odulvej8l.bkt.clouddn.com/4-4-01.png" alt="">
 							</div>
 						</div>
 

www/webapp/o2o/tpl/placeOrder/index.html

@@ -15,7 +15,7 @@
 					<div class="">
 						<ul class="table-view product-pic-o2o">
 							<li id="product-pic-bg">
-								<img src="{{imgSrc}}" style="width: 100%;" alt="">
+								<img class="lazy" src="{{imgSrc}}" style="width: 100%;" alt="">
 								<!--<div class="product-name">{{title}}详情及评价 <span id="hot">&gt;&gt;&gt;</span></div>-->
 								<div class="product-img"></div>
 							</li>

www/webapp/o2o/tpl/product/index.html

@@ -29,7 +29,7 @@
               <div class="img-list">
                 <div class="img-list-container">
                   {{ each picLists as pic}}
-                  <img src="{{pic.url}}" alt="">
+                  <img class="lazy" src="{{pic.url}}" alt="">
                   {{/each}}
                 </div>
               </div>