删除订单

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/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>
@@ -223,6 +224,8 @@
         //已完成
         $('#has_come_container').click(function () {
             /*调出手写板*/
+            $('#has_come_container').addClass('am-hide');
+            $('#has_come_success').removeClass('am-hide');
             $('#pics').css('display', 'block');
             $('.js-signature').eq(0).on('jq.signature.changed', function () {
                 $('#saveBtn').attr('disabled', false);
@@ -267,7 +270,6 @@
         url = $('.js-signature').eq(0).jqSignature('getDataURL');
         if (url != undefined) {
             $('#pics').css('display', 'none');
-            console.log(url);
             //七牛上传照片
             putb64();
         }
@@ -299,7 +301,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');