myorder

www/protected/components/QyWechat.php

@@ -1983,7 +1983,7 @@ class QyWechat
         if (ENVIRONMENT != 'product') {
             // 测试账号列表检索
             $test_userid_list = [
-                'dengtao',
+                //'dengtao',
                 'honghaitao',
                 'jiangrui',
             ];

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

@@ -86,7 +86,32 @@ class MyOrderController extends CController {
 
         $this->render('info', $data);
     }
+    /**
+     * 保洁师确认订单
+     */
+    public function actionTechConfirmOrder() {
+        $order = Yii::app()->request->getParam('order', '');
+        $user  = intval(Yii::app()->request->getParam('user', 0));
+
+        if (!CommonFn::isMongoId($order) || $user == 0) {
+            O2oApp::response(false, '订单或用户不存在', []);
+        }
+
+        $order_obj = ROrder::get(new MongoId($order));
+        $flag = false;
+        foreach($order_obj->technicians as $data){
+            if ($user == $data['technician_id']) {
+                $flag = true;break;
+            }
+        }
+        if (!$order_obj || !$flag) {
+            O2oApp::response(false, '用户或订单ID错误', []);
+        }
 
+        $order_obj->status = 3;
+        $success = $order_obj->save();
+        O2oApp::response($success, '保存失败，请重试', []);
+    }
     /**
      * 保洁师确认出发
      */

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

@@ -1,6 +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">-->
+<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css">
 <div>
     <div id="header">
         <div class="am-g">
@@ -77,6 +77,11 @@
                     </ul>
                 </div>
             </div>
+            <div class="am-g am-hide" id="confirm_container">
+                <div class="am-u-sm-12">
+                    <button class="am-btn am-btn-block am-btn-primary" id="confirm_set_out">确认订单</button>
+                </div>
+            </div>
             <div class="am-g am-hide" id="setout_container">
                 <div class="am-u-sm-12">
                     <button class="am-btn am-btn-block am-btn-primary" id="confirm_set_out">确认出发</button>
@@ -100,12 +105,12 @@
         </div>
     </div>
 </div>
-<div class="container" id="pics" style="position: fixed;width: 100%;background: #fff;top:0;display: none;">
+<div class="container" id="pics" style="position: fixed;width: 100%;background: #ffff00;top:0;display: none;">
     <div class="row">
         <div class="col-xs-12">
             <div class="js-signature"></div>
         </div>
-        <p style="margin: 0;text-align:center;border-top: 1px solid rgba(0,0,0,0.3);">
+        <p style="margin: 0">
             <button id="clearBtn" class="btn btn-default" onclick="clearCanvas();">清除</button>
             &nbsp;
             <button id="saveBtn" class="btn btn-default" onclick="saveSignature();" disabled>保存</button>
@@ -176,8 +181,32 @@
         $('#hideMap').click(function () {
             $('#map_box').hide();
         });
+        //确认订单
+        $('#confirm_container').click(function () {
+            $.vloading('open');
+            $.post(
+                '/index.php?r=o2o/myOrder/techConfirmOrder',
+                {
+                    order: order,
+                    user: user
+                },
+                function (res) {
+                    $.vloading('close');
+                    var data = $.parseJSON(res);
+                    if (data.success) {
+                        $('#confirm_container').addClass('am-hide');
+                        $('#setout_container').removeClass('am-hide');
+                        $('#come_container').addClass('am-hide');
+                        $('#has_come_container').addClass('am-hide');
+                    } else {
+                        $.valert(data.msg);
+                    }
+                }
+            );
+        });
+
         // 确认出发
-        $('#confirm_set_out').click(function () {
+        $('#setout_container').click(function () {
             $.vloading('open');
             $.post(
                 '/index.php?r=o2o/myOrder/techSetout',
@@ -224,7 +253,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);
@@ -269,6 +299,7 @@
         url = $('.js-signature').eq(0).jqSignature('getDataURL');
         if (url != undefined) {
             $('#pics').css('display', 'none');
+            console.log(url);
             //七牛上传照片
             putb64();
         }
@@ -300,9 +331,10 @@
                     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');
+                                $('#confirm_container').removeClass('am-hide');
+                                $('#setout_container').addClass('am-hide');
                                 $('#come_container').addClass('am-hide');
                                 $('#has_come_container').addClass('am-hide');
                             } else if (content.status == 4) {