Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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

@@ -224,8 +224,7 @@
         //已完成
         $('#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);