app-wx(v0.1.0 build 15)

1.F 短信接口审核成功，配置参数

app-wx(v0.1.0 build 15)
1.F 短信接口审核成功，配置参数
xu
1 parent 0c34aba8
Showing 30 changed files with 1043 additions and 495 deletions Show diff stats
app-wx/config/params.php
app-wx/controllers/BaseController.php
app-wx/models/UserIdentity.php
app-wx/modules/order/controllers/CustomerController.php
app-wx/modules/order/controllers/DefaultController.php
app-wx/modules/order/views/default/pages/customer-order-template.php
app-wx/modules/order/views/default/pages/order-details-template.php
app-wx/modules/order/views/default/pages/rate-template.php
app-wx/modules/order/views/default/pages/submit-template.php
app-wx/modules/user/controllers/DefaultController.php
app-wx/modules/user/controllers/LoginController.php
app-wx/modules/user/views/default/pages/register-template.php
app-wx/views/widgets/js-site.php
common/helpers/FileHelper.php
common/helpers/ImageManager.php
composer.json
composer.lock
domain/system/SmsMessage.php
web/admin/favicon.ico
web/assets/d0eeab2b/js/cmpts/uploadjs/uploadjs.js
 <?php
 return [
     'adminEmail'            => 'admin@example.com',
-    'VERSION'               => 'v0.1.0 build 14', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
+    'testLoginPhones'       => ['13900139001'],
+    'VERSION'               => 'v0.1.0 build 15', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
 ];
@@ -3,19 +3,6 @@
 namespace app\wx\controllers;
 use Yii;
-use yii\helpers\Url;
-use yii\web\BadRequestHttpException;
-use yii\db\Query;
-use app\wx\models\Engineer;
-use common\helpers\WxHelper;
-use common\helpers\ImageManager;
-use common\exts\wechat\Log as WxLog;
-use common\helpers\Log as AppLog;
-use common\helpers\PerformanceUtils;
-use common\models\SysSetting;
-use domain\engineer\EngineerRole;
-use domain\engineer\EngineerStatus;
-use domain\engineer\EngineerSkillTagsRepository;
 use stdClass;
 use function header;
 use function in_array;
@@ -25,12 +12,8 @@ use function urlencode;
 /**
- * 只有通过 微信 OAuth 验证后才能访问整个App,
- * 这是所有应用控制器的基类
  * Class BaseController
  * @package app\wx\controllers
- * @author lee.li <34923862@qq.com>
- * @date 2015/07/01
  */
 class BaseController extends AppController
 {
@@ -168,6 +151,7 @@ class BaseController extends AppController
         $this->site->timestamp = time();
         $this->site->noncestr = 'noncestr';
         $this->site->signature = 'signature';
+        $this->site->servicePhone =  Yii::$app->params['SERVICE_PHONE'];
     }
     /**
@@ -159,19 +159,28 @@ class UserIdentity extends UserModel
             return $e;
         }
         $code = PhoneCodeHelper::getLoginCode($mobile);
+        $testPhones = Yii::$app->params['testLoginPhones'];
         $sms = new SmsMessage();
         if ($code) {
             // 发送短信
-            $sms->sendLoginCode($mobile, $code);
+            if (!in_array($mobile, $testPhones)) {
+                $sms->sendLoginCode($mobile, $code);
+            }
             $e->message = '您的登录码已经发送，请注意查收短信！';
         } else {
             $code = PhoneCodeHelper::setLoginCode($mobile);
             // 发送短信
-            $sms->sendLoginCode($mobile, $code);
+            if (!in_array($mobile, $testPhones)) {
+                $sms->sendLoginCode($mobile, $code);
+            }
             $e->message = '您的登录码已经发送，请注意查收短信！';
         }
+        if (!in_array($mobile, $testPhones)) {
+            $e->code = '';
+        } else {
+            $e->code = $code;
+        }
         $e->success = true;
-        $e->code = $code;
         return $e;
     }
@@ -213,6 +222,7 @@ class UserIdentity extends UserModel
                 'user_id'           => $userEntity->id,
                 'emergency_contact' => $rData['emergencyContact'],
                 'emergency_person'  => $rData['emergencyPerson'],
+                'address'           => $rData['address']
             ];
             $userProfile = UserProfile::create($pData);
             PhoneCodeHelper::removeRegisterCode($mobile);
@@ -228,6 +238,8 @@ class UserIdentity extends UserModel
             $userProfile->qa_charge_pic = $QAChargePicImage[0].$QAChargePicImage[1];
             $userProfile->save();
             $tran->commit();
+            // 因为注册完成之后要审核，必须把已经登录的退出去
+            Yii::$app->user->logout();
             $e->success = true;
             $e->message = '注册完成，账号审核通过后即可使用';
         } catch (Exception $ex) {
@@ -248,6 +260,7 @@ class UserIdentity extends UserModel
         $e = new stdClass();
         $e->success = false;
         $e->message = '';
+        $e->code = '';
         $userModel = UserModel::findOne(['mobile' => $mobile]);
         $sms = new SmsMessage();
         if ($userModel) {
@@ -261,14 +274,15 @@ class UserIdentity extends UserModel
             //发送短信
             $sms->sendRegCode($mobile, $code);
             $e->message = '您的注册码已经发送，请注意查收短信！';
-            $e->code = $code;
+
         } else {
             $code = PhoneCodeHelper::setRegisterCode($mobile);
             //发送短信
             $sms->sendRegCode($mobile, $code);
             $e->message = '您的注册码已经发送，请注意查收短信！';
-            $e->code = $code;
         }
+        $e->code = '';
+        $e->success = true;
         return $e;
     }
@@ -2,12 +2,11 @@
 namespace app\wx\modules\order\controllers;
+use Yii;
+use common\helpers\ImageManager;
 use common\helpers\Utils;
 use domain\order\RepairOrderRate;
 use domain\order\RepairOrderRateRepository;
-use Yii;
-
-
 use domain\order\RepairOrderRepository;
 use domain\order\RepairOrderStatus;
@@ -48,7 +47,10 @@ class CustomerController extends CustomerBaseController
         $brokenImages = [];
         $baseURL = Yii::$app->request->getHostInfo();
         foreach($brokenImageModels as $k => $v) {
-            $brokenImages[] = $baseURL.'/'.$v->image_path;
+            $brokenImages[] = [
+                'url' => ImageManager::getUrl($v->image_path),
+                'thumb' => ImageManager::getUrl($v->image_path, 'min')
+            ];
         }
         $totalPrice = $orderModel->order_price;
         $rPlans = RepairOrderRepository::findOrderPlansAll(['repair_order_id' => $orderId]);
@@ -59,7 +61,10 @@ class CustomerController extends CustomerBaseController
         $fImages = RepairOrderRepository::findOrderFinishImageAll(['repair_order_id' => $orderId]);
         $finishImages = [];
         foreach($fImages as $k => $image) {
-            $finishImages[] = $baseURL.'/'.$image['image_path'];
+            $finishImages[] = [
+                'url' => ImageManager::getUrl($image['image_path']),
+                'thumb' => ImageManager::getUrl($image['image_path'], 'min')
+            ];
         }
         $comments = [];
         $hasComment = false;
@@ -7,6 +7,7 @@ use yii\helpers\HtmlPurifier;
 use yii\base\Exception;
 use yii\log\Logger;
+use common\helpers\ImageManager;
 use domain\order\RepairOrder;
 use domain\order\RepairOrderImages;
 use domain\order\RepairOrderRepository;
@@ -17,8 +18,7 @@ use domain\order\RepairOrderRate;
 use domain\order\RepairOrderRateRepository;
 use domain\order\CarModelRepository;
 use domain\system\SmsMessage;
-use domain\user\models\UserProfile as UserProfileModel;
-use domain\user\UserProfile;
+use domain\user\UserRepository;
 use stdClass;
@@ -38,30 +38,6 @@ class DefaultController extends BaseController
     /**
      * @return string
      */
-    public function actionSubmit()
-    {
-        $e = new stdClass();
-        $e->success = false;
-        $e->message = 'ok';
-        $e->address = '';
-        $userId = $this->getUserId();
-        $userProfile = UserProfileModel::findOne(['user_id' => $userId]);
-        if ($userProfile) {
-            if (!empty($userProfile->address)) {
-                $e->address = $userProfile->address;
-            }
-            $e->success = true;
-        } else {
-
-            $e->message = '找不到维修厂信息';
-        }
-
-        return $this->renderJson($e);
-    }
-
-    /**
-     * @return string
-     */
     public function actionDoSubmit()
     {
         $e = new stdClass();
@@ -76,7 +52,6 @@ class DefaultController extends BaseController
         $preRepair      =  HtmlPurifier::process($req->post('preRepair'), ['HTML.Allowed' => '']);
         $predictPrice   =  HtmlPurifier::process($req->post('repairPrice'), ['HTML.Allowed' => '']);
         $finishDate     =  HtmlPurifier::process($req->post('finishDate'), ['HTML.Allowed' => '']);
-        $address        =  HtmlPurifier::process($req->post('address'), ['HTML.Allowed' => '']);
         $images         =  $req->post('images');
         if (empty($carNo)) {
@@ -98,10 +73,17 @@ class DefaultController extends BaseController
         } else {
             $predict_finish_time = strtotime($finishDate.':00:00');
         }
-        if (empty($address)) {
-            $e->message = '维修厂地址必填';
-            return $this->renderJson($e);
+        $address = '';
+        $maintainer = '';
+        $tel = '';
+        $userModel = UserRepository::findOne(['id' => $userId]);
+        if ($userModel) {
+            $maintainer = $userModel->name;
+            $tel = $userModel->mobile;
+            $profileModel = $userModel->profile;
+            $address = isset($profileModel)?$profileModel->address:'';
         }
+
         $data = [
             'user_id'               => $userId,
             'car_no'                => $carNo,
@@ -111,6 +93,8 @@ class DefaultController extends BaseController
             'predict_fault'         => $preRepair,
             'predict_price'         => $predictPrice,
             'maintainer_address'    => $address,
+            'maintainer_tel'        => $tel,
+            'maintainer_name'       => $maintainer,
             'predict_finish_time'   => $predict_finish_time,
             'status'                => RepairOrderStatus::WORKING,
         ];
@@ -119,11 +103,10 @@ class DefaultController extends BaseController
             $repairOrder = RepairOrder::create($data);
             $uuid = $repairOrder->uuid;
             RepairOrderImages::createBrokenImages($repairOrder->id, $uuid, $images);
-            UserProfile::updateAddress($userId, $address);
             $tran->commit();
             RepairOrderImages::mvBrokenImages($uuid, $images);
-            //$sms = new SmsMessage();
-            //$sms->sendSubmitInfo($phone, $finishDate);
+
+            $this->sendSubmitSMS($repairOrder, $userId);
             $e->orderId = $uuid;
             $e->success = true;
         } catch(Exception $ex) {
@@ -138,6 +121,59 @@ class DefaultController extends BaseController
     }
     /**
+     * 下维修单短信
+     * @param $orderModel
+     * @param $userId
+     * @return array
+     */
+    private function sendSubmitSMS($orderModel, $userId)
+    {
+        /*
+         您好，维修厂${maintainer}已进行维修，预计完成时间${dateTime}，预估维修内容${repairPlan}，预估维修费用${repairPrice}，维修厂地址：${address}，联系电话:${tel}
+         * */
+        $smsVars = ['maintainer' => '', 'tel' => '', 'address' => '', 'dateTime' => '', 'repairPlan' => '', 'repairPrice' => ''];
+        $smsVars['maintainer'] = $orderModel->maintainer_name;
+        $smsVars['tel'] = $orderModel->maintainer_tel;
+        $smsVars['address'] = $orderModel->maintainer_address;
+        $smsVars['dateTime'] = date('Y年m月d日 H点', $orderModel->predict_finish_time);
+        $smsVars['repairPlan'] = $orderModel->predict_fault;
+        $smsVars['repairPrice'] = $orderModel->predict_price;
+        $phone = $orderModel->contact_mobile;
+        $sms = new SmsMessage();
+        return $sms->sendSubmitInfo($phone, $smsVars);
+    }
+
+    /**
+     * @param $orderModel
+     * @param $userId
+     */
+    private function sendFinishSMS($orderModel, $userId)
+    {
+        /*
+         您好，${maintainer}已对您的车维修完成，点击http://gkauto.jiwork.com/site/t?o=${code}可以给本次服务评分。如有意见请拨打投诉热线:${tel}
+         * */
+
+        $smsVars = ['maintainer' => '', 'code' => '', 'tel' => ''];
+
+        $smsVars['tel'] = Yii::$app->params['SERVICE_PHONE'];
+        $smsVars['maintainer'] = $orderModel->maintainer_name;
+        $smsVars['code'] = $orderModel->short_uuid;
+        $phone = $orderModel->contact_mobile;
+        $sms = new SmsMessage();
+        return $sms->sendFinishInfo($phone, $smsVars);
+
+    }
+
+    public function actionSms()
+    {
+        $userId = $this->getUserId();
+        $orderModel = RepairOrderRepository::findOne(['id' => 12]);
+        //$result = $this->sendSubmitSMS($orderModel, $userId);
+        //var_dump($result);
+        //$this->sendFinishSMS($orderModel, $userId);
+    }
+
+    /**
      * @return string
      */
     public function actionOrderList()
@@ -218,7 +254,10 @@ class DefaultController extends BaseController
         $brokenImages = [];
         $baseURL = Yii::$app->request->getHostInfo();
         foreach($brokenImageModels as $k => $v) {
-            $brokenImages[] = $baseURL.'/'.$v->image_path;
+            $brokenImages[] = [
+                'url' => ImageManager::getUrl($v->image_path),
+                'thumb' => ImageManager::getUrl($v->image_path, 'min')
+            ];
         }
         $totalPrice = $orderModel->order_price;
         $rPlans = RepairOrderRepository::findOrderPlansAll(['repair_order_id' => $orderId]);
@@ -229,7 +268,10 @@ class DefaultController extends BaseController
         $fImages = RepairOrderRepository::findOrderFinishImageAll(['repair_order_id' => $orderId]);
         $finishImages = [];
         foreach($fImages as $k => $image) {
-            $finishImages[] = $baseURL.'/'.$image['image_path'];
+            $finishImages[] = [
+                'url' => ImageManager::getUrl($image['image_path']),
+                'thumb' => ImageManager::getUrl($image['image_path'], 'min')
+            ];
         }
         $hasComment = false;
         $comments = [];
@@ -316,8 +358,8 @@ class DefaultController extends BaseController
             $orderModel->save();
             $tran->commit();
             RepairFinishImages::mvFinishImages($orderModel->uuid, $images);
-            //$sms = new SmsMessage();
-            //$sms->sendFinishInfo($phone, $finishDate);
+            $this->sendFinishSMS($orderModel, $userId);
+
             $e->success = true;
         } catch (Exception $ex) {
             $tran->rollBack();
@@ -6,6 +6,7 @@ $baseUrl = Url::base(true);
     body,div,p,span,input,ul,li{padding: 0;margin: 0}
     input{-webkit-appearance: none;}
     ul,li{list-style: none }
+    .navbar-inner{background-color:#ff7b24}
     #customer-order .content-div { width:100%; background: #fff; display:inline-flex;padding-top: 1rem}
     #customer-order .left-title-div {width:33%; font-size:1rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.81rem;}
     #customer-order .center-content-div {width:47%; font-size:1rem; font-weight:400; color:rgba(118,118,118,1); line-height:1.81rem;}
@@ -66,14 +67,14 @@ $baseUrl = Url::base(true);
     #customer-order .content-wrapper .rate-btn-cls{color:#fff;border-radius: 1.5rem;padding:0.6rem 0.8rem;text-align: center;background:#FF8728;width:4rem;}
     #customer-order .content-wrapper .comment-txt-cls{color:#000;font-size: 1rem;line-height: 1.5rem}
-    #customer-order #warranty-wrapper{position: absolute;top: 0;bottom: 0;width: 100%;z-index: 2;padding:3rem 2rem;box-sizing: border-box;background: rgba(0,0,0,0.3);}
+    #customer-order #warranty-wrapper{position: absolute;top: 0;bottom: 0;width: 100%;z-index: 2;padding:3rem 1rem;box-sizing: border-box;background: rgba(0,0,0,0.3);}
     #customer-order #warranty-wrapper .warranty-wrapper-inner{width:100%;background: #fff;height:100%;position: relative}
     #customer-order #warranty-wrapper .paragraph-cls{width:100%;padding:0.5rem 1rem;box-sizing: border-box;margin:0.25rem 0 ;}
     #customer-order #warranty-wrapper .agree-btn{position: absolute;bottom:0;right:0;width:100%;color:#FF8728;background: #fff;padding:0.8rem 0.5rem;box-sizing: border-box;text-align: center}
-    #customer-order #warranty-wrapper h2{font-size: 1.0rem;font-weight: bold;}
-    #customer-order #warranty-wrapper p{line-height: 1.5rem;padding:0;margin: 0;}
+    #customer-order #warranty-wrapper h2{font-size: 0.875rem;font-weight: bold;color:#000}
+    #customer-order #warranty-wrapper p{line-height: 1.5rem;padding:0;margin: 0;color:#000}
 </style>
 <script id="customer-order-template" type="text/template">
     <div class="pages">
@@ -142,13 +143,13 @@ $baseUrl = Url::base(true);
                     </div>
                     <div class="pic-image-div">
-                        <div class="pic-image-list">
+                        <ul class="pic-image-list">
                             {{#each item.brokenImages}}
-                            <div class="img-cls">
-                                <div class="pic-class view-img-cls" data-url="{{this}}" style="background-image: url({{this}})"></div>
-                            </div>
+                            <li class="img-cls">
+                                <div class="pic-class view-img-cls" data-index="{{@index}}" data-url="{{this.url}}" style="background-image: url({{this.thumb}})"></div>
+                            </li>
                             {{/each}}
-                        </div>
+                        </ul>
                     </div>
                 </div>
@@ -176,7 +177,7 @@ $baseUrl = Url::base(true);
                                 <ul class="finish-image-ul">
                                     {{#each this.item.finishImages}}
                                     <li class="finish-image-li">
-                                        <div class="finishImage  view-img-cls" data-url="{{this}}" style="background-image:url('{{this}}')"> </div></li>
+                                        <div class="finishImage view-img-cls" data-index="{{@index}}" data-url="{{this.url}}" style="background-image:url('{{this.thumb}}')"> </div></li>
                                     {{/each}}
                                 </ul>
                             </div>
@@ -222,8 +223,15 @@ $baseUrl = Url::base(true);
         <div class="warranty-wrapper-inner">
             <div class="agree-btn">确定</div>
             <div class="warranty-list-div" style="width:100%;height:calc(100% - 50px);;overflow-y: scroll">
+                <div style="padding:0 1rem;box-sizing: border-box">
+                    <h1 style="color:#f85a5a;font-size:1.25rem;text-align: center">维修厂质量保修承诺书</h1>
+                    <div style="width: 100%;text-align: center;font-size: 0.65rem;margin-bottom: 0.5rem;">GK车管家发[2020] 001号</div>
+                    <div style="width: 100%;display: block;background: #f85a5a;height: 0.125rem;"></div>
+                </div>
                 <div class="paragraph-cls">
-                    <h2>维修厂质量保修承诺书</h2>
+                    <p style="line-height: 1.85rem">各位车主：<br>
+                        维修厂对维修质保做以下条款承诺
+                    </p>
                     <p>一、更换的配件保证期为6个月或两万公里（超出其中一项即为超出保证期）。</p>
                     <p>二、在保证期内，凡属于更换的配件质量，维修工艺，装配调整等质量缺陷而引起车辆（或零部件）损坏，本店应予以免费保修。</p>
                     <p>三、特殊零部件的保修承诺<br/>
@@ -235,7 +243,7 @@ $baseUrl = Url::base(true);
                     <p>四、钣金喷漆质保期终身(腻子开裂，漆面失光，变色）本店予以免费维修。如有外力导致脱漆或开裂，本店不予以保修！</p>
                 </div>
-
+                <div style="color:#000;text-align: right;padding:0 1rem;box-sizing: border-box"> 2020年1月</div>
             </div>
         </div>
     </div>
@@ -6,6 +6,7 @@ $baseUrl = Url::base(true);
     body,div,p,span,input{padding: 0;margin: 0}
     input{-webkit-appearance: none;}
     ul,li{list-style: none  }
+    .navbar-inner{background-color:#ff7b24}
     #order-details .content-div { width:100%; background: #fff; display:inline-flex;padding-top: 1rem}
     #order-details .left-title-div {width:33%; font-size:1rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.81rem;}
     #order-details .center-content-div {width:47%; font-size:1rem; font-weight:400; color:rgba(118,118,118,1); line-height:1.81rem;}
@@ -35,7 +36,7 @@ $baseUrl = Url::base(true);
     }
     #order-details .pic-image-list .img-cls{width:25%;box-sizing: border-box;float:left;padding-top:0.3rem;padding-right:0.3rem;}
-    #order-details .pic-class {  margin-right: 0.5rem width:100%;height:0;padding-bottom: 100%;overflow:hidden;
+    #order-details .pic-class { margin-right: 0.5rem; width:100%;height:0;padding-bottom: 100%;overflow:hidden;
                                                                                    background-position: center center;
                                                                                    background-repeat: no-repeat;
                                                                                    -webkit-background-size:cover;
@@ -132,13 +133,13 @@ $baseUrl = Url::base(true);
                         <div class="left-title-div"><span class="padding-left-1rem">车损照片</span></div>
                     </div>
                     <div class="pic-image-div">
-                        <div class="pic-image-list">
+                        <ul class="pic-image-list">
                             {{#each item.brokenImages}}
-                                <div class="img-cls">
-                                    <div class="pic-class view-img-cls" data-url="{{this}}" style="background-image: url({{this}})"></div>
-                                </div>
+                                <li class="img-cls">
+                                    <div class="pic-class view-img-cls" data-index="{{@index}}" data-url="{{this.url}}" style="background-image: url({{this.thumb}})"></div>
+                                </li>
                              {{/each}}
-                        </div>
+                        </ul>
                     </div>
                 </div>
                 {{#js_compare "'working' == this.item.status"}}
@@ -168,7 +169,7 @@ $baseUrl = Url::base(true);
                             <ul class="finish-image-ul">
                                 {{#each this.item.finishImages}}
                                 <li class="finish-image-li">
-                                    <div class="finishImage view-img-cls" data-url="{{this}}" style="background-image:url('{{this}}')"> </div></li>
+                                    <div class="finishImage view-img-cls" data-index="{{@index}}" data-url="{{this.url}}" style="background-image:url('{{this.thumb}}')"> </div></li>
                                 {{/each}}
                             </ul>
                         </div>
@@ -207,4 +208,4 @@ $baseUrl = Url::base(true);
             </div>
         </div>
     </div>
-</script>
 \ No newline at end of file
+</script>
@@ -4,17 +4,17 @@ $baseUrl = Url::base(true);
 ?>
 <style>
     body,div,p,span,input{padding: 0;margin: 0}
-    input{-webkit-appearance: none;}
+    input,textarea{-webkit-appearance: none;}
     #rate .content-div { background: #fff; height: auto;padding: 1rem}
-    #rate .page-content{ background-color: #ECF0F2 }#rate .upload-box .upload-title
+    #rate .page-content{ background-color: #ECF0F2 }
-    #rate .rate-title { height:1.06rem; font-size:1.06rem; font-weight:400; color:rgba(9,9,9,1); line-height:0.75rem;margin-right:1rem;}
+    #rate .rate-title{ height:1.06rem; font-size:1.06rem; font-weight:400; color:rgba(9,9,9,1); line-height:0.75rem;margin-right:1rem;}
     #rate .rate-title-two { height:1.06rem; font-size:1.06rem; font-weight:400; color:rgba(9,9,9,1); line-height:0.75rem; padding-top: 1rem;}
     #rate .comment-div {margin-top: 0.3rem;display: flex;border:1px solid #DDD;line-height:  1.06rem}
     #rate .star-row{display:flex;align-items: center;margin-bottom:0.4rem}
     #rate .img-star {width: 1.4rem; height: 1.4rem; float: left; vertical-align: middle; margin-right: 0.8rem;background-image:url(<?= $baseUrl . "/i/order/rate/rate_no_select.png"?>);background-repeat: no-repeat;background-size: 1.4rem auto;}
     #rate .star-on{background-image:url(<?= $baseUrl . "/i/order/rate/rate_star.png"?>);}
-    #rate .text-content {width: 100%;height: 7.5rem; resize: none;line-height:inherit;padding: 0.5rem;font-size: 1rem}
+    #rate .text-content {width: 100%;height: 7.5rem;border:0; resize: none;line-height:inherit;padding: 0.5rem;font-size: 1rem}
     #rate .btn-box{width:100%;display: block;padding:1rem;box-sizing: border-box;margin-top:2rem;}
     #rate .rate-text { font-size:0.94rem; font-weight:400; color:rgba(0,0,0,1); line-height:1.75rem;}
@@ -37,8 +37,6 @@ $baseUrl = Url::base(true);
     #rate .submit-cls{background:#FF8728;color:#fff;border-radius: 1.2rem;box-sizing: border-box;padding:0.8rem 1rem;width:80%;margin: 0 auto;text-align: center}
-
-
 </style>
 <script id="rate-template" type="text/template">
     <div class="pages">
@@ -97,6 +95,7 @@ $baseUrl = Url::base(true);
                             </ul>
                         </div>
                     </div>
+                    <div style="display: block;padding:0.5rem 0;box-sizing: border-box">投诉监督电话：{{servicePhone}}</div>
                 </div>
                 <div class="btn-box">
@@ -99,7 +99,7 @@ $baseUrl = Url::base(true);
                         </li>
                         <li class="s-li-item">
                             <div class="s-li-div">
-                                <label class="s-li-label">预估维修内容</label>
+                                <label class="s-li-label">预估维修内容<span class="require-cls">*</span></label>
                                 <div class="s-li-div-input-box">
                                     <input class="s-li-div-input preRepair" type="text" value="" placeholder="请填写预估维修内容" />
                                 </div>
@@ -107,7 +107,7 @@ $baseUrl = Url::base(true);
                         </li>
                         <li class="s-li-item">
                             <div class="s-li-div">
-                                <label class="s-li-label">预估维修费用</label>
+                                <label class="s-li-label">预估维修费用<span class="require-cls">*</span></label>
                                 <div class="s-li-div-input-box" style="position: relative">
                                     <input class="s-li-div-input repairPrice" type="number" value="" placeholder="请填写预估维修费用" />
                                     <span class="price-union-cls">元</span>
@@ -123,14 +123,7 @@ $baseUrl = Url::base(true);
                                 </div>
                             </div>
                         </li>
-                        <li class="s-li-item">
-                            <div class="s-li-div">
-                                <label class="s-li-label">维修厂地址<span class="require-cls">*</span></label>
-                                <div class="s-li-div-input-box">
-                                    <input class="s-li-div-input maintainerAddress" type="text" value="" placeholder="请填写维修厂地址" />
-                                </div>
-                            </div>
-                        </li>
+
                     </ul>
                 </div>
@@ -33,19 +33,34 @@ class DefaultController extends BaseController
         $e->message = 'ok';
         $userId = 0;
+        if (isset($_POST["uploadType"]) && 'base64' == $_POST["uploadType"]) {
+            $e = $this->uploadFileStr();
+        } else {
+            $e = $this->uploadFile();
+        }
+        return $this->renderJson($e);
+    }
+
+    private function uploadFile()
+    {
+        $e = new stdClass();
+        $e->success = false;
+        $e->message = 'ok';
+
         if (empty($_FILES["file"])) {
             $e->message = '文件为空';
-            return $this->renderJson($e);
+            return $e;
         }
+
         if (empty($_FILES["file"]['tmp_name'])) {
             $e->message = '文件为空';
-            return $this->renderJson($e);
+            return $e;
         }
         $type = $_FILES["file"]["type"];
         $typeArr = explode('/', $type);
         if ('image' !== $typeArr[0]) {
             $e->message = '只能上传 png， jpg 等文件';
-            return $this->renderJson($e);
+            return $e;
         }
         $uploadInfo = ImageManager::uploadImg($_FILES["file"]);
@@ -59,7 +74,33 @@ class DefaultController extends BaseController
         $e->tmpUrl = $tmpUrl;
         $e->message = 'ok';
-        return $this->renderJson($e);
+        return $e;
     }
+    private function uploadFileStr()
+    {
+        $e = new stdClass();
+        $e->success = false;
+        $e->message = 'fail';
+        $e->tmpFile = '';
+        $e->tmpMinUrl = '';
+        $e->tmpUrl = '';
+        $imgData = $this->request->post("file");
+        $imgData = str_replace('data:image/jpeg;base64,', '', $imgData);
+        $imageStr = base64_decode($imgData);
+        if ($imageStr) {
+            $uploadInfo = ImageManager::saveBase64ImgFileToLocal($imageStr);
+            $filename = $uploadInfo[0];
+            $tmpUrl = $this->site->base_url.'/'.$uploadInfo[2];
+            $tmpMinFile = $this->site->base_url.'/'.$uploadInfo[3];
+
+            $e->success = true;
+            $e->tmpFile = $filename;
+            $e->tmpMinUrl = $tmpMinFile;
+            $e->tmpUrl = $tmpUrl;
+            $e->message = 'ok';
+        }
+
+        return $e;
+    }
 } 
 \ No newline at end of file
@@ -42,8 +42,7 @@ class LoginController extends BaseController
             $code = $codeRe->code;
         }
-        $e->success = true;
-        // 测试用
+        // 测试用 - 正式启用的时候这里要关闭了
         $e->testCode = $code;
         return $this->renderJson($e);
@@ -67,6 +66,7 @@ class LoginController extends BaseController
         $QAChargePic = $this->request->post('QAChargePic');
         $emergencyContact = $this->request->post('emergencyContact');
         $emergencyPerson = $this->request->post('emergencyPerson');
+        $address = $this->request->post('address');
         if (empty($name)) {
             $e->message = '车厂名称必填';
@@ -91,7 +91,10 @@ class LoginController extends BaseController
             $e->message = '紧急联系电话必填';
             return $this->renderJson($e);
         }
-
+        if (empty($address)) {
+            $e->message = '维修厂地址必填';
+            return $this->renderJson($e);
+        }
         if (empty($licensePic)) {
             $e->message = '请上传营业执照';
             return $this->renderJson($e);
@@ -122,7 +125,7 @@ class LoginController extends BaseController
         }
         $rData = [
-            'name' => $name, 'emergencyContact' => $emergencyContact, 'emergencyPerson' => $emergencyPerson,
+            'name' => $name, 'emergencyContact' => $emergencyContact, 'emergencyPerson' => $emergencyPerson, 'address' => $address,
             'licensePic' => $licensePic, 'headPic' => $headPic, 'techChargePic' => $techChargePic ,'QAChargePic' => $QAChargePic
         ];
         $regResult = UserIdentity::register($mobile, $rData);
@@ -17,7 +17,7 @@ $baseUrl = Url::base(true);
     #register .input-list .validation-code{display:flex;align-items: center}
     #register .input-list .get-code-cls{width: 10rem;font-size: 1rem;display: flex;align-items: center;justify-content:center;color:#FF8728;padding:0.302rem  0.3rem;box-sizing: border-box;border-left:0;}
     #register .upload-box{padding:0 2rem 1rem 2rem;box-sizing: border-box;overflow: hidden}
-    #register .upload-box .upload-section{width:50%;margin-bottom:0.5rem;float:left}
+    #register .upload-box .upload-section{width:50%;margin-bottom:0.5rem;float:left;display: flex;justify-content: center;flex-direction: column;align-items: center}
     #register .upload-box .upload-title{line-height: 1.5rem;color:#BCBCBC;margin-bottom:0;}
     #register .upload-box .upload-img-box{display: block;width: 50%;}
     #register .upload-box .upload-item{width:100%;height:0;padding-bottom: 100%;overflow:hidden;
@@ -37,7 +37,7 @@ $baseUrl = Url::base(true);
     #register input::input-placeholder{
         color:#BCBCBC
     }
-    #register .legal-agreement{padding:0.2rem 2rem;width: 100%;box-sizing: border-box;display:flex;align-items: center}
+    #register .legal-agreement{padding:0.2rem 2rem;width: 100%;box-sizing: border-box;display:flex;align-items: center;justify-content: center}
     #register .check-agreement{width:1rem;height: 1rem;display: block;border:1px solid #ccc;border-radius: 1rem;}
     #register .legal-agreement .checked-active{border:1px solid #FF8728;background: #FF8728;position: relative}
     #register .legal-agreement .checked-active:after{content: '';position: absolute;top: 4px;left: 3px;width: 0.50rem;height: 0.2rem;border-top: 0.125rem solid #fff;border-right: 0.125rem solid #fff;transform: rotate(135deg);}
@@ -46,14 +46,14 @@ $baseUrl = Url::base(true);
     #register .agreement-cls:active,
     #register .agreement-cls:visited{color:#FF8728;font-size:0.8rem;}
-    #register #agreement-wrapper{position: absolute;top: 0;bottom: 0;width: 100%;z-index: 2;padding:3rem 2rem;box-sizing: border-box;background: rgba(0,0,0,0.3);}
+    #register #agreement-wrapper{position: absolute;top: 0;bottom: 0;width: 100%;z-index: 2;padding:3rem 1rem;box-sizing: border-box;background: rgba(0,0,0,0.3);}
     #register #agreement-wrapper .agreement-wrapper-inner{width:100%;background: #fff;height:100%;position: relative}
     #register #agreement-wrapper .paragraph-cls{width:100%;padding:0.5rem 1rem;box-sizing: border-box;margin:0.25rem 0 ;}
     #register #agreement-wrapper .agree-btn{position: absolute;bottom:0;right:0;width:100%;color:#FF8728;background: #fff;padding:0.8rem 0.5rem;box-sizing: border-box;text-align: center}
-    #register #agreement-wrapper h2{font-size: 1.0rem;font-weight: bold;}
-    #register #agreement-wrapper p{line-height: 1.5rem;padding:0;margin: 0;}
+    #register #agreement-wrapper h2{font-size: 0.9rem;font-weight: bol;color:#000}
+    #register #agreement-wrapper p{line-height: 1.5rem;padding:0;margin: 0;color:#000}
 </style>
 <script id="register-template" type="text/template">
     <div class="pages">
@@ -86,6 +86,10 @@ $baseUrl = Url::base(true);
                         <div class="input-row-cls">
                             <label class="input-label-cls"></label><div class="input-div"><input class="input-cls emergency_contact" type="number" placeholder="紧急联系电话" /></div>
                         </div>
+                    <div class="input-row-cls">
+                        <label class="input-label-cls"></label><div class="input-div"><input class="input-cls address" type="text" placeholder="维修厂地址" /></div>
+                    </div>
+
                 </div>
                 <div class="upload-box">
                     <div class="upload-section">
@@ -129,7 +133,7 @@ $baseUrl = Url::base(true);
                 </div>
                 <div class="legal-agreement">
-                    <span class="check-agreement"></span> <a href="javascript:void(0)" class="agreement-cls">《平台车管家服务条款》</a>
+                    <span class="check-agreement"></span> <a href="javascript:void(0)" class="agreement-cls">《GK车管家服务条款》</a>
                 </div>
                 <div class="action-box">
                     <div class="register-btn-cls register-btn">注册</div>
@@ -144,6 +148,11 @@ $baseUrl = Url::base(true);
         <div class="agreement-wrapper-inner">
             <div class="agree-btn">我同意</div>
             <div class="agreement-list-div" style="width:100%;height:calc(100% - 50px);;overflow-y: scroll">
+                <div style="padding:0 1rem;box-sizing: border-box">
+                    <h1 style="color:#f85a5a;font-size:1.25rem;text-align: center">平安车主服务维修流程标准</h1>
+                    <div style="width: 100%;text-align: center;font-size: 0.65rem;margin-bottom: 0.5rem;">GK车管家发[2020] 001号</div>
+                    <div style="width: 100%;display: block;background: #f85a5a;height: 0.125rem;"></div>
+                </div>
                 <div class="paragraph-cls">
                 <h2>平安车主服务中心合作维修厂钣金工艺标准流程</h2>
                 <p>1.轻微钣金整形要求，板面平整，无明显坑洼，手感光滑，无高凸点，筋线流畅，车身左右对称标准无差异，板金件工作面需要作羽状边处理，裸露铁皮需要作磷化底漆处理。</p>
@@ -190,7 +199,7 @@ $baseUrl = Url::base(true);
                 <p>2、中度，重度钣喷（3件以上），需要更换零部件，外部釆购零部件，添加机电维修项目等，根椐维修厂车间生产情况和客户要求协商确认交车时间，征得客户同意。</p>
                 <p>3、超过时效未能完工交车的，需主动联系客户，征求客户意见和谅解，维修厂应免费提供客户代步车辆。</p>
                 </div>
-
+                <div style="color:#000;text-align: right;padding:0 1rem;box-sizing: border-box"> 2020年1月</div>
             </div>
         </div>
     </div>
@@ -10,5 +10,6 @@ window.$site = {
     noncestr: '<?=$site->noncestr?>',//noncestr
     signature: '<?=$site->signature?>',//signature
     user_bridge_url: '<?=$site->user_bridge_url?>',
-    sn: '<?=$site->sn ?>'
+    sn: '<?=$site->sn ?>',
+    servicePhone: '<?=$site->servicePhone?>'
 }
 \ No newline at end of file
@@ -133,7 +133,7 @@ class FileHelper
             $tmpPastePath = 'tmp/';
         }
-        $somePath = Yii::getAlias('@app/wx') . "/web/".$tmpPastePath;
+        $somePath = $dir = Yii::getAlias('@site') . "/".$tmpPastePath;
         if (!is_dir($somePath)) {
             mkdir($somePath, 0777, true);
         }
@@ -122,4 +122,36 @@ class ImageManager
         return [$filename, $minFileName, $tmpUrl, $tmpMinFile];
     }
+
+    /**
+     * @param $imageStr
+     * @param string $tmpPath
+     * @return array
+     */
+    public static function saveBase64ImgFileToLocal($imageStr)
+    {
+        $somePath = $dir = Yii::getAlias('@site') . "/tmp";
+        if (!is_dir($somePath)) {
+            mkdir($somePath, 0777, true);
+        }
+        if (!is_writable($somePath)) {
+            chmod($somePath, 0777);
+        }
+        $tt = time();
+        $image = imagecreatefromstring($imageStr);
+        $fileNameId = 'auto_'.$tt.md5(date('YmdHis').'_'.mt_rand(100000, 999999));
+        $minFileName = $fileNameId.'_min.jpg';
+        $filename = $fileNameId.'.jpg';
+        $saveFilePath = $somePath."/" .$filename;
+        imagejpeg($image, $saveFilePath);
+
+        $tmpUrl = $tmpMinFile = 'tmp/'.$filename;
+        $imgSource = self::_imageCreateFromPath($saveFilePath);
+        if ($imgSource) {
+            ImageUtils::resizeImage($imgSource, 100, 100, $dir.'/'.$minFileName);
+            $tmpMinFile = 'tmp/'.$minFileName;
+        }
+
+        return [$filename, $minFileName, $tmpUrl, $tmpMinFile];
+    }
 }
 \ No newline at end of file
@@ -18,7 +18,8 @@
         "yiisoft/yii2": "~2.0.6",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0",
-        "php-amqplib/php-amqplib": "^2.9"
+        "php-amqplib/php-amqplib": "^2.9",
+        "alibabacloud/client": "^1.5"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.0.0",
@@ -4,9 +4,139 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a48067fb03d4d29e121ae6c52d934bc1",
+    "content-hash": "446deeded6c58ced6c733ef16c4f2f6c",
     "packages": [
         {
+            "name": "adbario/php-dot-notation",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/adbario/php-dot-notation.git",
+                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/eee4fc81296531e6aafba4c2bbccfc5adab1676e",
+                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0|^5.0|^6.0",
+                "squizlabs/php_codesniffer": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Adbar\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Riku Särkinen",
+                    "email": "riku@adbar.io"
+                }
+            ],
+            "description": "PHP dot notation access to arrays",
+            "homepage": "https://github.com/adbario/php-dot-notation",
+            "keywords": [
+                "ArrayAccess",
+                "dotnotation"
+            ],
+            "time": "2019-01-01T23:59:15+00:00"
+        },
+        {
+            "name": "alibabacloud/client",
+            "version": "1.5.20",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aliyun/openapi-sdk-php-client.git",
+                "reference": "e18c5d79072417250f6faf0c1c8ca8bd3fd73f2b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aliyun/openapi-sdk-php-client/zipball/e18c5d79072417250f6faf0c1c8ca8bd3fd73f2b",
+                "reference": "e18c5d79072417250f6faf0c1c8ca8bd3fd73f2b",
+                "shasum": ""
+            },
+            "require": {
+                "adbario/php-dot-notation": "^2.2",
+                "clagiordano/weblibs-configmanager": "^1.0",
+                "danielstjules/stringy": "^3.1",
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "ext-simplexml": "*",
+                "ext-xmlwriter": "*",
+                "guzzlehttp/guzzle": "^6.3",
+                "mtdowling/jmespath.php": "^2.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "composer/composer": "^1.8",
+                "drupal/coder": "^8.3",
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-sockets": "*",
+                "ext-spl": "*",
+                "league/climate": "^3.2.4",
+                "mikey179/vfsstream": "^1.6",
+                "monolog/monolog": "^1.24",
+                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "psr/cache": "^1.0",
+                "symfony/dotenv": "^3.4",
+                "symfony/var-dumper": "^3.4"
+            },
+            "suggest": {
+                "ext-sockets": "To use client-side monitoring"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AlibabaCloud\\Client\\": "src"
+                },
+                "files": [
+                    "src/Functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Alibaba Cloud SDK",
+                    "email": "sdk-team@alibabacloud.com",
+                    "homepage": "http://www.alibabacloud.com"
+                }
+            ],
+            "description": "Alibaba Cloud Client for PHP - Use Alibaba Cloud in your PHP project",
+            "homepage": "https://www.alibabacloud.com/",
+            "keywords": [
+                "alibaba",
+                "alibabacloud",
+                "aliyun",
+                "client",
+                "cloud",
+                "library",
+                "sdk",
+                "tool"
+            ],
+            "time": "2019-12-30T01:59:20+00:00"
+        },
+        {
             "name": "bower-asset/bootstrap",
             "version": "v3.3.7",
             "source": {
@@ -268,6 +398,110 @@
             "time": "2016-09-14T20:40:20+00:00"
         },
         {
+            "name": "clagiordano/weblibs-configmanager",
+            "version": "v1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clagiordano/weblibs-configmanager.git",
+                "reference": "6ef4c27354368deb2f54b39bbe06601da8c873a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clagiordano/weblibs-configmanager/zipball/6ef4c27354368deb2f54b39bbe06601da8c873a0",
+                "reference": "6ef4c27354368deb2f54b39bbe06601da8c873a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "clagiordano/phpunit-result-printer": "^1",
+                "phpunit/phpunit": "^4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "clagiordano\\weblibs\\configmanager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Claudio Giordano",
+                    "email": "claudio.giordano@autistici.org",
+                    "role": "Developer"
+                }
+            ],
+            "description": "weblibs-configmanager is a tool library for easily read and access to php config array file and direct read/write configuration file / object",
+            "keywords": [
+                "clagiordano",
+                "configuration",
+                "manager",
+                "tool",
+                "weblibs"
+            ],
+            "time": "2019-09-25T22:10:10+00:00"
+        },
+        {
+            "name": "danielstjules/stringy",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/danielstjules/Stringy.git",
+                "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
+                "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "symfony/polyfill-mbstring": "~1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Stringy\\": "src/"
+                },
+                "files": [
+                    "src/Create.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel St. Jules",
+                    "email": "danielst.jules@gmail.com",
+                    "homepage": "http://www.danielstjules.com"
+                }
+            ],
+            "description": "A string manipulation library with multibyte support",
+            "homepage": "https://github.com/danielstjules/Stringy",
+            "keywords": [
+                "UTF",
+                "helpers",
+                "manipulation",
+                "methods",
+                "multibyte",
+                "string",
+                "utf-8",
+                "utility",
+                "utils"
+            ],
+            "time": "2017-06-12T01:10:27+00:00"
+        },
+        {
             "name": "ezyang/htmlpurifier",
             "version": "v4.9.3",
             "source": {
@@ -315,62 +549,240 @@
             "time": "2017-06-03T02:28:16+00:00"
         },
         {
-            "name": "mdmsoft/yii2-admin",
-            "version": "2.9",
+            "name": "guzzlehttp/guzzle",
+            "version": "6.3.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mdmsoft/yii2-admin.git",
-                "reference": "59e65542b1dc1abcf14c62588ea4ae128e08036c"
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mdmsoft/yii2-admin/zipball/59e65542b1dc1abcf14c62588ea4ae128e08036c",
-                "reference": "59e65542b1dc1abcf14c62588ea4ae128e08036c",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
                 "shasum": ""
             },
             "require": {
-                "yiisoft/yii2": "~2.0.7"
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
             },
             "require-dev": {
-                "yiisoft/yii2-codeception": "~2.0"
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.0"
             },
             "suggest": {
-                "yiisoft/yii2-bootstrap": "Used when using layout 'left-menu', 'right-menu' or 'top-menu'"
+                "psr/log": "Required for using the Log middleware"
             },
-            "type": "yii2-extension",
+            "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.0.master": "1.0.x-dev",
-                    "dev-master": "2.x-dev"
+                    "dev-master": "6.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2018-04-22T15:46:56+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
                 },
-                "asset-installer-paths": {
-                    "npm-asset-library": "vendor/npm",
-                    "bower-asset-library": "vendor/bower"
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "mdm\\admin\\": ""
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-03-20T17:10:46+00:00"
+        },
+        {
+            "name": "mtdowling/jmespath.php",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jmespath/jmespath.php.git",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "bin/jp.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "JmesPath\\": "src/"
+                },
+                "files": [
+                    "src/JmesPath.php"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Misbahul Munir",
-                    "email": "misbahuldmunir@gmail.com"
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
                 }
             ],
-            "description": "RBAC Auth manager for Yii2 ",
+            "description": "Declaratively specify how to extract elements from a JSON document",
             "keywords": [
-                "admin",
-                "auth",
-                "rbac",
-                "yii"
+                "json",
+                "jsonpath"
             ],
-            "time": "2018-11-12T12:35:44+00:00"
+            "time": "2016-12-03T22:08:25+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
@@ -412,7 +824,57 @@
                     "PhpAmqpLib\\": "PhpAmqpLib/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/"
+            "notification-url": "https://packagist.org/downloads/"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -469,6 +931,65 @@
             "time": "2017-05-01T15:54:03+00:00"
         },
         {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
             "name": "yiisoft/yii2",
             "version": "2.0.12",
             "source": {
@@ -1037,71 +1558,6 @@
             "time": "2016-04-29T12:21:54+00:00"
         },
         {
-            "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2017-03-20T17:10:46+00:00"
-        },
-        {
             "name": "myclabs/deep-copy",
             "version": "1.6.1",
             "source": {
@@ -1782,56 +2238,6 @@
             "time": "2016-12-08T20:27:08+00:00"
         },
         {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
             "name": "psr/log",
             "version": "1.0.2",
             "source": {
@@ -2840,65 +3246,6 @@
             "time": "2017-06-01T21:01:25+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
             "name": "symfony/yaml",
             "version": "v3.3.1",
             "source": {
@@ -37,7 +37,7 @@ class SmsMessage
             }
             $result = AlibabaCloud::rpc()
-                ->regionId("cn-hongkong") // 指定请求的区域，不指定则使用客户端区域、默认区域
+                ->regionId("cn-hangzhou") // 指定请求的区域，不指定则使用客户端区域、默认区域
                 ->product('Dysmsapi') // 指定产品
                 ->version('2017-05-25') // 指定产品版本
                 ->action('SendSms') // 指定产品接口
@@ -55,53 +55,71 @@ class SmsMessage
         } catch (ClientException $exception) {
             AppLog::DEBUG('短信发送出错：' . $exception->getErrorMessage());
+            return false;
         } catch (ServerException $exception) {
             AppLog::DEBUG('短信发送出错：' . $exception->getErrorMessage());
+            return false;
         }
     }
     /**
+     * @return string
+     */
+    private function getSignName()
+    {
+        $smsConfig = Yii::$app->params['sms'];
+        return isset($smsConfig['smsSignName'])?$smsConfig['smsSignName']:'';
+    }
+    /**
      * 手机验证码
      * 模版内容: 验证码${code}，您正在注册成为新用户，感谢您的支持！
      * 申请说明: 用户注册验证码
-     * 模版CODE: SMS_179880510
+     * 模版CODE: SMS_181866843
      * @param $phone
      * @param $code
      * @param $signName
      * @return mixed
      */
-    public function sendRegCode($phone, $code, $signName = '科技')
+    public function sendRegCode($phone, $code)
     {
-        //$this->send($phone, $signName, "SMS_179880510", ["code" => $code]);
-        return true;
+        //return true;
+        $signName = $this->getSignName();
+        return $this->send($phone, $signName, "SMS_181866843", ["code" => $code]);
     }
     /**
      * 登录验证码
-     * 模版内容: 模版CODE: SMS_180755775
+     * 模版内容: 模版CODE: SMS_181866846
      * 模版内容: 尊敬的用户，您的登录码为：${code}，请勿泄漏于他人！
      * @param $phone
      * @return mixed
      */
-    public function sendLoginCode($phone, $code, $signName = '科技')
+    public function sendLoginCode($phone, $code)
     {
-        //$this->send($phone, $signName, "SMS_180755775", ["code" => $code]);
-        return true;
+        //return true;
+        $signName = $this->getSignName();
+        return $this->send($phone, $signName, "SMS_181866846", ["code" => $code]);
     }
     /*
-    * 【XX车管家】您好，xxxx厂已经进行维修，预计完成时间xxxx，预估维修内容xxxx，预估维修费用xxxx, 地址：XXXXXX, 联系电话；XXXXXXXX”
+     * 模版CODE: SMS_181867814
+    * 您好，您的爱车已在${maintainer}维修厂维修，预计${dateTime}维修完成，预估维修内容：${repairPlan}，预估维修费：${repairPrice}，维修厂地址：${address}，联系电话：${tel}
     * */
-    public function sendSubmitInfo($maintainer, $maintainerPhone, $preFinish, $address, $phone)
+    public function sendSubmitInfo($phone, $postData)
     {
-        return true;
+    	//return true;
+        $signName = $this->getSignName();
+        return $this->send($phone, $signName, "SMS_181867814", $postData);
     }
     /*
+     * 模版CODE: SMS_181851842
      * 【XX车管家】您好，xxxx厂已对您的车维修完成，点击http://wwwwwww.com/xxx 可以给本次服务评分。如有意见请拨打投诉热线:4000xxxxxx”
      * */
-    public function sendFinishInfo($maintainer, $url, $phone)
+    public function sendFinishInfo($phone, $postData)
     {
-        return true;
+    	//return true;
+        $signName = $this->getSignName();
+        return $this->send($phone, $signName, "SMS_181851842", $postData);
     }
 }
 \ No newline at end of file
-define([],function(){var e={};return e.uploadFile=function(e){var o={selector:e.selector||"",url:e.url||"",processAppendTo:e.processAppendTo||"",timeout:e.timeout||6e3,beforeSend:function(e,o){},success:function(o,r){e.success&&e.success(o,r)},complete:function(o,r){e.complete&&e.complete(o,r)},process:function(e){},ontimeout:function(e){},error:function(o,r){e.error&&e.error(o,r)}};o.beforeSend=function(r,t){if(e.beforeSend)e.beforeSend(r,t);else{var n='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=o.processAppendTo){var s=document.querySelector(o.processAppendTo);if(!s)return"";var i=s.querySelector("#process-bar");s&&i&&s.removeChild(i),s.insertAdjacentHTML("beforeend",n)}}},o.process=function(r){if(e.process)e.process(r);else if(""!=o.processAppendTo){var t=document.querySelector(o.processAppendTo);if(!t)return"";var n=t.querySelector("#pro-bar");if(n){var s=100*r.loaded/r.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},o.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(o.selector).files[0],t=new FormData,n=new XMLHttpRequest;n.timeout=o.timeout,n.onload=function(e){var r=JSON.parse(this.response);o.success(r,e)},n.onloadend=function(e){if(""!=o.processAppendTo){var r=document.querySelector(o.processAppendTo);if(r){var t=r.querySelector("#process-bar");r&&r.removeChild(t)}}var n=JSON.parse(this.response);o.complete(n,e)},n.onerror=function(e){var r=JSON.parse(this.response);o.error(r,e)},n.ontimeout=function(e){console.log("request timeout"),o.ontimeout(e)},n.addEventListener("loadstart",function(e){o.beforeSend(e)}),n.open("post",o.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&o.process(e)},t.append("file",r),n.send(t)},e});
 \ No newline at end of file
+define([],function(){var e={};return e.uploadFile=function(e){function o(){var e='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(!o)return"";var r=o.querySelector("#process-bar");o&&r&&o.removeChild(r),o.insertAdjacentHTML("beforeend",e)}}var t={selector:e.selector||"",url:e.url||"",processAppendTo:e.processAppendTo||"",timeout:e.timeout||6e3,beforeSend:function(e,o){},success:function(o,t){e.success&&e.success(o,t)},complete:function(o,t){e.complete&&e.complete(o,t)},process:function(e){},ontimeout:function(e){},error:function(o,t){e.error&&e.error(o,t)}};t.beforeSend=function(t,r){e.beforeSend?e.beforeSend(t,r):o()},t.process=function(o){if(e.process)e.process(o);else if(""!=t.processAppendTo){var r=document.querySelector(t.processAppendTo);if(!r)return"";var n=r.querySelector("#pro-bar");if(n){var s=100*o.loaded/o.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},t.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(t.selector).files[0],n="",s=r.size/1024;t.uploadPost=function(e,o){var r=new FormData,n=new XMLHttpRequest;n.timeout=t.timeout,n.onload=function(e){var o=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.success(o,e)},n.onloadend=function(e){if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(o){var r=o.querySelector("#process-bar");o&&o.removeChild(r)}}var n=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.complete(n,e)},n.onerror=function(e){var o=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.error(o,e)},n.ontimeout=function(e){console.log("request timeout"),t.ontimeout(e)},n.addEventListener("loadstart",function(e){t.beforeSend(e)}),n.open("post",t.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&t.process(e)},r.append("uploadType",o),r.append("file",e),n.send(r)},t.compressAndUpload=function(e,r){var n=new FileReader,s=new Image,i=e,c=document.createElement("canvas"),a=c.getContext("2d");if(void 0!=i&&""!=i){if(0!=i.type.indexOf("image"))return!1;n.readAsDataURL(i),n.onload=function(e){s.src=e.target.result},o(),s.onload=function(){var e=this,o=((new Date).getTime(),e.width),n=e.height,s=1024,i=1024,u=o,d=n;(o>s||n>i)&&(o/n>s/i?(u=s,d=Math.round(s*(n/o))):(d=i,u=Math.round(i*(o/n)))),c.width=u,c.height=d,a.clearRect(0,0,u,d),a.drawImage(e,0,0,u,d);var p=c.toDataURL("image/jpeg",.7);t.uploadPost(p,r)}}},s<=1024?(n="file",t.uploadPost(r,n)):(n="base64",t.compressAndUpload(r,n))},e});
 \ No newline at end of file
-define([],function(){var e={};return e.uploadFile=function(e){var o={selector:e.selector||"",url:e.url||"",processAppendTo:e.processAppendTo||"",timeout:e.timeout||6e3,beforeSend:function(e,o){},success:function(o,r){e.success&&e.success(o,r)},complete:function(o,r){e.complete&&e.complete(o,r)},process:function(e){},ontimeout:function(e){},error:function(o,r){e.error&&e.error(o,r)}};o.beforeSend=function(r,t){if(e.beforeSend)e.beforeSend(r,t);else{var n='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=o.processAppendTo){var s=document.querySelector(o.processAppendTo);if(!s)return"";var i=s.querySelector("#process-bar");s&&i&&s.removeChild(i),s.insertAdjacentHTML("beforeend",n)}}},o.process=function(r){if(e.process)e.process(r);else if(""!=o.processAppendTo){var t=document.querySelector(o.processAppendTo);if(!t)return"";var n=t.querySelector("#pro-bar");if(n){var s=100*r.loaded/r.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},o.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(o.selector).files[0],t=new FormData,n=new XMLHttpRequest;n.timeout=o.timeout,n.onload=function(e){var r=JSON.parse(this.response);o.success(r,e)},n.onloadend=function(e){if(""!=o.processAppendTo){var r=document.querySelector(o.processAppendTo);if(r){var t=r.querySelector("#process-bar");r&&r.removeChild(t)}}var n=JSON.parse(this.response);o.complete(n,e)},n.onerror=function(e){var r=JSON.parse(this.response);o.error(r,e)},n.ontimeout=function(e){console.log("request timeout"),o.ontimeout(e)},n.addEventListener("loadstart",function(e){o.beforeSend(e)}),n.open("post",o.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&o.process(e)},t.append("file",r),n.send(t)},e});
 \ No newline at end of file
+define([],function(){var e={};return e.uploadFile=function(e){function o(){var e='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(!o)return"";var r=o.querySelector("#process-bar");o&&r&&o.removeChild(r),o.insertAdjacentHTML("beforeend",e)}}var t={selector:e.selector||"",url:e.url||"",processAppendTo:e.processAppendTo||"",timeout:e.timeout||6e3,beforeSend:function(e,o){},success:function(o,t){e.success&&e.success(o,t)},complete:function(o,t){e.complete&&e.complete(o,t)},process:function(e){},ontimeout:function(e){},error:function(o,t){e.error&&e.error(o,t)}};t.beforeSend=function(t,r){e.beforeSend?e.beforeSend(t,r):o()},t.process=function(o){if(e.process)e.process(o);else if(""!=t.processAppendTo){var r=document.querySelector(t.processAppendTo);if(!r)return"";var n=r.querySelector("#pro-bar");if(n){var s=100*o.loaded/o.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},t.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(t.selector).files[0],n="",s=r.size/1024;t.uploadPost=function(e,o){var r=new FormData,n=new XMLHttpRequest;n.timeout=t.timeout,n.onload=function(e){var o=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.success(o,e)},n.onloadend=function(e){if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(o){var r=o.querySelector("#process-bar");o&&o.removeChild(r)}}var n=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.complete(n,e)},n.onerror=function(e){var o=JSON.parse(""==this.response||null==this.response?"[]":this.response);t.error(o,e)},n.ontimeout=function(e){console.log("request timeout"),t.ontimeout(e)},n.addEventListener("loadstart",function(e){t.beforeSend(e)}),n.open("post",t.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&t.process(e)},r.append("uploadType",o),r.append("file",e),n.send(r)},t.compressAndUpload=function(e,r){var n=new FileReader,s=new Image,i=e,c=document.createElement("canvas"),a=c.getContext("2d");if(void 0!=i&&""!=i){if(0!=i.type.indexOf("image"))return!1;n.readAsDataURL(i),n.onload=function(e){s.src=e.target.result},o(),s.onload=function(){var e=this,o=((new Date).getTime(),e.width),n=e.height,s=1024,i=1024,u=o,d=n;(o>s||n>i)&&(o/n>s/i?(u=s,d=Math.round(s*(n/o))):(d=i,u=Math.round(i*(o/n)))),c.width=u,c.height=d,a.clearRect(0,0,u,d),a.drawImage(e,0,0,u,d);var p=c.toDataURL("image/jpeg",.7);t.uploadPost(p,r)}}},s<=1024?(n="file",t.uploadPost(r,n)):(n="base64",t.compressAndUpload(r,n))},e});
 \ No newline at end of file
-define("order-app",["mk7/app"],function(t){var e=Dom7,i=function(){var t=e(".ui-loading-block");0==t.length&&(e(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var t=document.getElementById("loader-inner"),e=document.createElement("p");e.className="notice",t&&(e.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',t.appendChild(e))},window.waitingTime))},n=!0;return t.name="order",t.routes={index:function(){return n=!1,i(),t.runController("index")},"index/:tab":function(e){n=!1,i();var a={tab:e};return t.runController("index",a)},submit:function(){return n=!1,i(),t.runController("submit")},"order-details/:id":function(e){n=!1,i();var a={id:e};return t.runController("order-details",a)},"customer-order/:id/:sn":function(e,a){n=!1,i();var r={id:e,sn:a};return t.runController("customer-order",r)},"rate/:id/:sn":function(e,a){n=!1,i();var r={id:e,sn:a};return t.runController("rate",r)},"cost-list/:id":function(e){n=!1,i();var a={id:e};return t.runController("cost-list",a)},"*":function(){return t.runController("index")}},t}),define("order/cost-list-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(t,e,i,n){var a=Dom7,t=(Template7,new t),r="/user/default/upload-file",o="/order/default/submit-repair-plans";return t.run=function(){var t=this;t.setPageTitle("费用列表"),t.id=t.params.id,t.imgLimit=9,t.canSubmit=!0,t.render()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.addEvent(),t.uploadImgEvent(),t.delPlanEvent(),t.inputPriceChangeEvent(),t.submitEvent()},t.addEvent=function(){var t=this;a("#cost-list .add-repair-plan").click(function(e){var i=a("#cost-list .cost-list-div"),n=t.planTpl(i.length+1);a(n).insertBefore(a("#cost-list .cost-total-list-div"))})},t.delPlanEvent=function(){var t=this;a("#cost-list").on("click",".del-plan",function(e){console.log("del plan event"),a(this).parents(".cost-list-div").remove(),a("#cost-list .total-plan-price").html(t.computedPrice())})},t.planTpl=function(t){var e='<div class="cost-list-div"><p class="item-title">第'+t+'项</p><div class="repair-item-cls"><input type="text" class="input-left input-cls" placeholder="填写维修内容" value=""><input type="number" class="input-right input-cls" placeholder="价格" value=""><span class="del-plan"></span></div></div>';return e},t.inputPriceChangeEvent=function(){var t=this;a("#cost-list").on("input propertychange",".input-cls",function(){var e=t.computedPrice();a("#cost-list .total-plan-price").html(e)})},t.computedPrice=function(){var t=a("#cost-list .input-right"),e=0;return a.each(t,function(t,i){e+=1*a(i).val()}),Math.round(e,2)},t.uploadImgEvent=function(){var t=this;a("#cost-list #upload-btn").change(function(){if(""!=a(this).val()&&null!=a(this).val()){var o=a(this).parents("li");n.uploadFile({selector:"#upload-btn",url:e.to(r),processAppendTo:"#cost-list",success:function(e,n){try{if(e.success){var r=e.tmpUrl;a('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+r+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(o),t.imgLimit==a("#cost-list #image-list").find(".up-img").length&&a("#cost-list .upload-btn-li").hide()}else i.toast({content:e.message,closeDelay:5e3})}catch(s){console.log(s),i.toast({content:"出错",closeDelay:5e3})}}})}}),a("#cost-list #image-list").on("click",".del-img",function(e){a(this).parent().remove(),t.imgLimit>=a("#cost-list #image-list").find(".up-img").length&&a("#cost-list .upload-btn-li").show()})},t.submitEvent=function(){var t=this;a("#cost-list .btn-submit").click(function(n){var r=a("#cost-list .content-div").find(".repair-item-cls"),s=[],l=!0,c=!0;if(a.each(r,function(t,e){var n=i.trim(a(e).find(".input-left").val()),r=i.trim(a(e).find(".input-right").val());""==n&&(l=!1),""!=r&&0!=r||(c=!1),s.push({content:n,price:r})}),!l)return i.toast({content:"维修清单有部分未填内容"}),!1;if(!c)return i.toast({content:"维修清单有部分未填价格"}),!1;var d=a("#cost-list #image-list").find(".upload-item"),u=[];if(a.each(d,function(t,e){u.push(a(e).attr("data"))}),!t.canSubmit)return!1;t.canSubmit=!1;var m=t.csrf({images:u,plans:s,id:t.id});i.httpPost(o,m,function(n){t.canSubmit=!0,n.success?window.location.replace(e.to("order#order-details/"+t.id)):i.toast({content:n.message})},!0)})},t}),define("order/customer-order-controller",["mk7/controller","mk7/url","mk7/utils"],function(t,e,i){var n=Dom7,a=Template7,t=new t,r="order/customer/order-details";return t.run=function(){var t=this;t.id=t.params.id,t.sn=t.params.sn,t.success=!0,t.setPageTitle("维修单"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.goToComment(),t.popupImageLayer(),t.agreementEvent()},t.beforeRender=function(){var t=this;console.log("beforeRender"),t.success||(this.view="customer-order-error")},t.loadPage=function(){var t=this,n=t.csrf({id:t.id});i.httpPost(e.to(r),n,function(e){var i=e;t.success=e.success,t.render(i)},!0)},t.goToComment=function(){var t=this;n("#customer-order .rate-btn-cls").click(function(i){window.location.replace(e.to("order/customer#rate/"+t.id+"/"+t.sn))})},t.agreementEvent=function(){n("#customer-order").on("click",".warranty-btn",function(t){n("#warranty-wrapper").remove();var e=n("#customer-order"),i=n("script#warranty-template"),r=a.compile(i.html()),o=r({});e.append(o)}),n("#customer-order").on("click",".agree-btn",function(t){n("#warranty-wrapper").remove()})},t.popupImageLayer=function(){n("#customer-order").on("click",".view-img-cls",function(t){var e=n(this).attr("data-url");n("#img-mask").remove();var i='<div id="img-mask" style="z-index:2;background:#000;justify-content:center;position: absolute;bottom:0;top:0;width:100%;display:flex;flex-direction: column;align-items: center"><div style="width:100%;"> <img width="100%" src="'+e+'" /></div></div>';n("#customer-order").append(i)}),n("#customer-order").on("click","#img-mask, #img-mask img",function(t){t.preventDefault(),t.stopPropagation();var e=document.body.clientHeight,i=n("#img-mask img").height();console.log(e+"dddd"+i);var a=Math.abs(i-e);if(a>=0&&a<=20)n("#img-mask").remove();else{var r=n(t.target).attr("id");"img-mask"==r&&n("#img-mask").remove()}})},t}),define("order/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(t,e,i){var n=Dom7,a=Template7,t=new t,r="order/default/order-list";return t.run=function(){var t=this;t.setPageTitle("订单列表"),t.tab=t.params.tab,t.page=0,t.nodata="",t.loading=!1,t.pageCount=1,t.render({tab:t.tab}),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.tabEvent(),t.bindScrollEvent(),t.addEvent(),t.orderClickEvent()},t.tabEvent=function(){n(".tab-cls").click(function(t){var e=n(this).attr("data-href");window.location.replace(e)})},t.handleNodata=function(){var t=this;t.nodata="没有数据了";var e=n(".nodata");0==e.length&&n("#index .order-list").append('<div class="nodata">'+t.nodata+"</div>"),t.app.detachInfiniteScroll(".infinite-scroll"),n("#index .infinite-scroll-preloader").remove()},t.loadPage=function(){var t=this;if(t.loading=!0,t.page>=t.pageCount)return void t.handleNodata();var a={status:t.tab};a.page=t.page+1,a=t.csrf(a),n.ajax({method:"GET",url:e.to(r),data:a,dataType:"json",beforeSend:function(){t.showIndicator()},success:function(e){if(1==e.success&&(i.isDefined(e.page)&&(t.page=parseInt(e.page)),i.isDefined(e.page_count)&&(t.pageCount=parseInt(e.page_count)),t.renderItems(e.items,!0),t.page>=t.pageCount))return void t.handleNodata()},error:function(t){},complete:function(e){t.hideIndicator(),t.loading=!1}})},t.bindScrollEvent=function(){var t=this;t.app.attachInfiniteScroll("#index .infinite-scroll"),n("#index .infinite-scroll").on("infinite",function(){t.loading||t.nodata||t.loadPage()})},t.renderItems=function(t,e){var i=n("#index .order-list"),r=n("script#order-item-template"),o=a.compile(r.html()),s=o({list:t});0==e&&(i.html(""),i.append(s)),i.append(s)},t.addEvent=function(){n("#index .add-btn-cls").click(function(t){window.location.href=e.to("order/#submit")})},t.orderClickEvent=function(){n("#index").on("click",".order-item",function(t){var i=n(this).attr("data-id");window.location.href=e.to("order#order-details/"+i)})},t}),define("order/order-details-controller",["mk7/controller","mk7/url","mk7/utils"],function(t,e,i){var n=Dom7,t=(Template7,new t),a="order/default/order-details";return t.run=function(){var t=this;t.id=t.params.id,t.success=!0,t.setPageTitle("维修单"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.finishBtnEvent(),t.popupImageLayer()},t.beforeRender=function(){var t=this;console.log("beforeRender"),t.success||(t.view="order-details-error")},t.loadPage=function(){var t=this,n=t.csrf({id:t.id});i.httpPost(e.to(a),n,function(e){var i=e;t.success=e.success,t.render(i)},!0)},t.finishBtnEvent=function(){var t=this;n("#order-details .finish-submit").click(function(i){window.location.href=e.to("order/#cost-list/"+t.id)})},t.agreementEvent=function(){},t.popupImageLayer=function(){n("#order-details").on("click",".view-img-cls",function(t){var e=n(this).attr("data-url");n("#img-mask").remove();var i='<div id="img-mask" style="z-index:2;background:#000;justify-content:center;position: absolute;bottom:0;top:0;width:100%;display:flex;flex-direction: column;align-items: center"><div style="width:100%;"> <img width="100%" src="'+e+'" /></div></div>';n("#order-details").append(i)}),n("#order-details").on("click","#img-mask, #img-mask img",function(t){t.preventDefault(),t.stopPropagation();var e=document.body.clientHeight,i=n("#img-mask img").height();console.log(e+"dddd"+i);var a=Math.abs(i-e);if(a>=0&&a<=20)n("#img-mask").remove();else{var r=n(t.target).attr("id");"img-mask"==r&&n("#img-mask").remove()}})},t}),define("order/rate-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(t,e,i,n){var a=Dom7,t=(Template7,new t),r="order/customer/submit-rate",o="/user/default/upload-file";return t.run=function(){var t=this;t.id=t.params.id,t.sn=t.params.sn,t.imgLimit=4,t.setPageTitle("评价"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.starClickEvent(),t.submitEvent(),t.uploadImgEvent()},t.loadPage=function(){var t=this;t.render()},t.starClickEvent=function(){a("#rate").on("click",".img-star",function(t){var e=a(this).attr("data-id"),i=a(this).parent(".star-div"),n=i.find(".img-star");a.each(n,function(t,n){var r=a(n).attr("data-id");if(1*r<=e){a(n).addClass("star-on");var o=i.find(".rate-text"),s=a(n).attr("data-txt");o.html(s)}else a(n).removeClass("star-on")})})},t.uploadImgEvent=function(){var t=this;a("#rate #upload-btn").change(function(){if(""!=a(this).val()&&null!=a(this).val()){var r=a(this).parents("li");n.uploadFile({selector:"#upload-btn",url:e.to(o),processAppendTo:"#rate",success:function(e,n){try{if(e.success){var o=e.tmpUrl;a('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+o+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(r),t.imgLimit==a("#rate #image-list").find(".up-img").length&&a("#rate .upload-btn-li").hide()}else i.toast({content:e.message,closeDelay:5e3})}catch(s){console.log(s),i.toast({content:"出错",closeDelay:5e3})}}})}}),a("#rate #image-list").on("click",".del-img",function(e){a(this).parent().remove(),t.imgLimit>=a("#rate #image-list").find(".up-img").length&&a("#rate .upload-btn-li").show()})},t.getUploadImgs=function(){var t=a("#rate #image-list").find(".up-img"),e=[];return 0==t.length?[]:(a.each(t,function(t,i){var n=a(i).find(".upload-item");e.push(n.attr("data"))}),e)},t.submitEvent=function(){var t=this;a("#rate .submit-btn").click(function(n){var o=i.trim(a("#rate .text-content").val()),s=a("#rate .quality-box .img-star"),l=0;a.each(s,function(t,e){a(e).hasClass("star-on")&&l++});var c=a("#rate .effect-box .img-star"),d=0;a.each(c,function(t,e){a(e).hasClass("star-on")&&d++});var u=a("#rate .service-box .img-star"),m=0;a.each(u,function(t,e){a(e).hasClass("star-on")&&m++});var p=t.getUploadImgs(),v=t.csrf({comment:o,id:t.id,qualityStar:l,effectStar:d,serviceStar:m,images:p});i.httpPost(e.to(r),v,function(n){n.success?window.location.replace(e.to("order/customer#customer-order/"+t.id+"/"+t.sn)):i.toast({content:n.message})},!0)})},t}),define("order/submit-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs","mk7/picker"],function(t,e,n,a,r){var o=Dom7,s=Template7,t=new t,l="/user/default/upload-file",c="/order/default/submit",d="/order/default/do-submit",u=!0,m="";return t.run=function(){var t=this;t.setPageTitle("录入维修单"),t.imgLimit=9,t.render(),t.loadInit()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.uploadImgEvent(),t.submitEvent(),t.selectDateEvent(),t.openCarModel(),t.searchCarModel(),t.carModelClick()},t.loadInit=function(){var t=this,e={id:t.id};n.httpGet(c,e,function(t){t.success&&t.address&&(o("#submit .maintainerAddress").val(t.address),o("#submit .maintainerAddress").attr("readonly",!0))},!0)},t.uploadImgEvent=function(){var t=this;o("#submit #upload-btn").change(function(){if(""!=o(this).val()&&null!=o(this).val()){var i=o(this).parents("li");a.uploadFile({selector:"#upload-btn",url:e.to(l),processAppendTo:"#submit",success:function(e,a){try{if(e.success){var r=e.tmpUrl;o('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+r+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(i),t.imgLimit==o("#submit #image-list").find(".up-img").length&&o("#submit .upload-btn-li").hide()}else n.toast({content:e.message,closeDelay:5e3})}catch(s){n.toast({content:"出错",closeDelay:5e3})}}})}}),o("#submit #image-list").on("click",".del-img",function(e){o(this).parent().remove(),t.imgLimit>=o("#submit #image-list").find(".up-img").length&&o("#submit .upload-btn-li").show()})},t.submitEvent=function(){var t=this;o("#submit .submit-btn-cls").click(function(i){var a=n.trim(o("#submit .carNo").val()),r=n.trim(o("#submit .carModel").val()),s=n.trim(o("#submit .customer").val()),l=n.trim(o("#submit .phone").val()),c=n.trim(o("#submit .preRepair").val()),m=n.trim(o("#submit .repairPrice").val()),p=n.trim(o("#submit .finishDate").val()),v=n.trim(o("#submit .maintainerAddress").val());if(0==u)return!1;if(""==a)return n.toast({content:"车牌号必填"}),!1;if(""==r)return n.toast({content:"车辆型号必填"}),!1;if(""==s)return n.toast({content:"客户名称必填"}),!1;if(""==l)return n.toast({content:"客联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"客联系电话有误"}),!1;if(""==p)return n.toast({content:"预估完成时间必填"}),!1;if(""==v)return n.toast({content:"维修厂地址必填"}),!1;var f=t.getUploadImgs();if(0==f.length)return n.toast({content:"请上传车损照"}),!1;u=!1;var g=t.csrf({carNo:a,carModel:r,customer:s,phone:l,preRepair:c,repairPrice:m,finishDate:p,images:f,address:v});n.httpPost(d,g,function(t){return u=!0,t.success?void window.location.replace(e.to("order#order-details/"+t.orderId)):(n.toast({content:t.message}),!1)},!0)})},t.getUploadImgs=function(){var t=o("#submit #image-list").find(".up-img"),e=[];return 0==t.length?[]:(o.each(t,function(t,i){var n=o(i).find(".upload-item");e.push(n.attr("data"))}),e)},t.selectDateEvent=function(){var t=this;o("#submit .finish-date-input").click(function(e){var i=o("#submit .finish-date-input").val();console.log(i),t.dateTimeSelector("#submit .finish-date-input",i)})},t.dateTimeSelector=function(t,e){var n=this,a=new Date,r=30,s=a.getFullYear(),l=a.getMonth(),c=a.getDate(),d=a.getHours(),u=s+"-"+(l+1)+"-"+c;if(""!=e&&null!=e&&void 0!==e){var p=e.split(" ");u=p[0],d=p[1]}var v=[];for(i=0;i<=r;i++){var f=new Date;f.setDate(a.getDate()+i);var g=f.getFullYear()+"-"+(f.getMonth()+1)+"-"+f.getDate();v.push(g)}var h=n.app.picker({input:t,toolbarTemplate:'<div class="toolbar"><div class="toolbar-inner"><div class="left">请选择用工时间</div><div class="right"><a href="javascript:void(0);" class="link submit-confirm-picker">确定</a></div></div></div>',value:[u,d],onChange:function(t,e,i){var n,a,r;if(e[0]instanceof Date)n=e[0].getFullYear(),a=e[0].getMonth(),r=e[0].getDate();else{var o=e[0].split("-");n=o[0],a=o[1]-1,r=o[2]}var s=new Date(n,a,r,e[1],0),l=new Date((new Date).getTime()+36e5);if(s<l){if(void 0===t.cols[0])return!1;var c=l.getHours(),d=l.getFullYear()+"-"+(l.getMonth()+1)+"-"+l.getDate(),u=new Date(l.getFullYear(),l.getMonth(),l.getDate(),l.getHours(),0);if(u-new Date<9e5){var m=new Date(u.getTime()+36e5);c=m.getHours(),d=m.getFullYear()+"-"+(m.getMonth()+1)+"-"+m.getDate()}t.cols[0].setValue(d),t.cols[2].setValue(c)}},formatValue:function(t,e,i){var n="";n=e[0]instanceof Date?e[0].getFullYear()+"-"+(e[0].getMonth()+1)+"-"+e[0].getDate():e[0];var a=n+" "+e[1];return a},cols:[{values:v,displayValues:function(){var t=[],e=new Date,i=e.getFullYear(),n=e.getMonth()+1,a=e.getDate();e.setDate(e.getDate()+1);for(var r=0;r<v.length;r++){var o=v[r],s=o.split("-"),l=s[1]+"月"+s[2]+"日";i==s[0]&&1*n==s[1]&&1*a==s[2]&&(l+="(今天)"),1*e.getFullYear()==s[0]&&1*e.getMonth()+1==s[1]&&1*e.getDate()==s[2]&&(l+="(明天)"),t.push(l)}return t}()},{divider:!0,content:"  "},{values:function(){for(var t=[],e=0;e<=23;e++)t.push(e);return t}(),displayValues:function(){for(var t=[],e=0;e<=23;e++)t.push(e<10?"0"+e+"时":e+"时");return t}()},{divider:!0,content:"  "}],onClose:function(e){if(h){var i=h.value,n=i[1]<10?"0"+i[1]:i[1];m=i[0]+" "+n,o(t).val(m),h.destroy()}}});h.open(),o(".submit-confirm-picker").on("click",function(e){e.preventDefault();var i=h.value,n=i[1]<10?"0"+i[1]:i[1];m=i[0]+" "+n,o(t).val(m),h.destroy()})},t.openCarModel=function(){o("#submit").on("click",".carModel",function(t){o("#search-wrapper").remove();var e=o("#submit"),i=o("script#search-car-model-template"),n=s.compile(i.html()),a=n({keyword:""});e.append(a)})},t.renderCarModelItem=function(t){var e=o("#search-wrapper .model-list"),i=o("script#search-car-model-item-template"),n=s.compile(i.html()),a=n({items:t});e.html(a)},t.searchCarModel=function(){var t=this;o("#submit").on("click",".model-search-btn",function(e){t.ajaxSearch()}),o("#submit").on("submit","#search-form",function(e){return e.preventDefault(),t.ajaxSearch(),!1})},t.ajaxSearch=function(){var t=this,i={keyword:o("#search-wrapper .search-input").val()};o.ajax({method:"POST",url:e.to("order/default/search-model"),data:i,dataType:"json",beforeSend:function(){t.showIndicator()},success:function(e){e.success?t.renderCarModelItem(e.items):t.renderCarModelItem([])},error:function(t){},complete:function(e){t.hideIndicator()}})},t.carModelClick=function(){o("#submit").on("click",".model-div-btn",function(t){var e=o(this).attr("data-value");o("#submit .carModel").val(e),o("#search-wrapper").remove()}),o("#submit").on("click",".closeBtn",function(t){o("#search-wrapper").remove()})},t});
 \ No newline at end of file
+define("order-app",["mk7/app"],function(t){var e=Dom7,i=function(){var t=e(".ui-loading-block");0==t.length&&(e(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var t=document.getElementById("loader-inner"),e=document.createElement("p");e.className="notice",t&&(e.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',t.appendChild(e))},window.waitingTime))},n=!0;return t.name="order",t.routes={index:function(){return n=!1,i(),t.runController("index")},"index/:tab":function(e){n=!1,i();var a={tab:e};return t.runController("index",a)},submit:function(){return n=!1,i(),t.runController("submit")},"order-details/:id":function(e){n=!1,i();var a={id:e};return t.runController("order-details",a)},"customer-order/:id/:sn":function(e,a){n=!1,i();var r={id:e,sn:a};return t.runController("customer-order",r)},"rate/:id/:sn":function(e,a){n=!1,i();var r={id:e,sn:a};return t.runController("rate",r)},"cost-list/:id":function(e){n=!1,i();var a={id:e};return t.runController("cost-list",a)},"*":function(){return t.runController("index")}},t}),define("order/cost-list-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(t,e,i,n){var a=Dom7,t=(Template7,new t),r="/user/default/upload-file",o="/order/default/submit-repair-plans";return t.run=function(){var t=this;t.setPageTitle("费用列表"),t.id=t.params.id,t.imgLimit=9,t.canSubmit=!0,t.render()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.addEvent(),t.uploadImgEvent(),t.delPlanEvent(),t.inputPriceChangeEvent(),t.submitEvent()},t.addEvent=function(){var t=this;a("#cost-list .add-repair-plan").click(function(e){var i=a("#cost-list .cost-list-div"),n=t.planTpl(i.length+1);a(n).insertBefore(a("#cost-list .cost-total-list-div"))})},t.delPlanEvent=function(){var t=this;a("#cost-list").on("click",".del-plan",function(e){console.log("del plan event"),a(this).parents(".cost-list-div").remove(),a("#cost-list .total-plan-price").html(t.computedPrice())})},t.planTpl=function(t){var e='<div class="cost-list-div"><p class="item-title">第'+t+'项</p><div class="repair-item-cls"><input type="text" class="input-left input-cls" placeholder="填写维修内容" value=""><input type="number" class="input-right input-cls" placeholder="价格" value=""><span class="del-plan"></span></div></div>';return e},t.inputPriceChangeEvent=function(){var t=this;a("#cost-list").on("input propertychange",".input-cls",function(){var e=t.computedPrice();a("#cost-list .total-plan-price").html(e)})},t.computedPrice=function(){var t=a("#cost-list .input-right"),e=0;return a.each(t,function(t,i){e+=1*a(i).val()}),Math.round(e,2)},t.uploadImgEvent=function(){var t=this;a("#cost-list #upload-btn").change(function(){if(""!=a(this).val()&&null!=a(this).val()){var o=a(this).parents("li");n.uploadFile({selector:"#upload-btn",url:e.to(r),processAppendTo:"#cost-list",success:function(e,n){try{if(e.success){var r=e.tmpUrl;a('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+r+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(o),t.imgLimit==a("#cost-list #image-list").find(".up-img").length&&a("#cost-list .upload-btn-li").hide()}else i.toast({content:e.message,closeDelay:5e3})}catch(s){console.log(s),i.toast({content:"出错",closeDelay:5e3})}}})}}),a("#cost-list #image-list").on("click",".del-img",function(e){a(this).parent().remove(),t.imgLimit>=a("#cost-list #image-list").find(".up-img").length&&a("#cost-list .upload-btn-li").show()})},t.submitEvent=function(){var t=this;a("#cost-list .btn-submit").click(function(n){var r=a("#cost-list .content-div").find(".repair-item-cls"),s=[],l=!0,c=!0;if(a.each(r,function(t,e){var n=i.trim(a(e).find(".input-left").val()),r=i.trim(a(e).find(".input-right").val());""==n&&(l=!1),""!=r&&0!=r||(c=!1),s.push({content:n,price:r})}),!l)return i.toast({content:"维修清单有部分未填内容"}),!1;if(!c)return i.toast({content:"维修清单有部分未填价格"}),!1;var u=a("#cost-list #image-list").find(".upload-item"),d=[];if(a.each(u,function(t,e){d.push(a(e).attr("data"))}),!t.canSubmit)return!1;t.canSubmit=!1;var m=t.csrf({images:d,plans:s,id:t.id});i.httpPost(o,m,function(n){t.canSubmit=!0,n.success?window.location.replace(e.to("order#order-details/"+t.id)):i.toast({content:n.message})},!0)})},t}),define("order/customer-order-controller",["mk7/controller","mk7/url","mk7/utils","mk7/photo-browser"],function(t,e,i,n){var a=Dom7,r=Template7,t=new t,o="order/customer/order-details";return t.run=function(){var t=this;t.id=t.params.id,t.sn=t.params.sn,t.success=!0,t.setPageTitle("维修单"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.goToComment(),t.popupImageLayer(),t.agreementEvent()},t.beforeRender=function(){var t=this;console.log("beforeRender"),t.success||(this.view="customer-order-error")},t.loadPage=function(){var t=this,n=t.csrf({id:t.id});i.httpPost(e.to(o),n,function(e){var i=e;t.success=e.success,t.render(i)},!0)},t.goToComment=function(){var t=this;a("#customer-order .rate-btn-cls").click(function(i){window.location.replace(e.to("order/customer#rate/"+t.id+"/"+t.sn))})},t.agreementEvent=function(){a("#customer-order").on("click",".warranty-btn",function(t){a("#warranty-wrapper").remove();var e=a("#customer-order"),i=a("script#warranty-template"),n=r.compile(i.html()),o=n({});e.append(o)}),a("#customer-order").on("click",".agree-btn",function(t){a("#warranty-wrapper").remove()})},t.popupImageLayer=function(){var t=this;a("#customer-order").on("click",".view-img-cls",function(e){var i=a(this).parents("ul"),n=i.find(".view-img-cls"),r=[],o=a(this).attr("data-index");a.each(n,function(t,e){var i=a(e).attr("data-url");r.push(i)});var s=t.app.photoBrowser({photos:r,initialSlide:o});s.open()})},t}),define("order/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(t,e,i){var n=Dom7,a=Template7,t=new t,r="order/default/order-list";return t.run=function(){var t=this;t.setPageTitle("订单列表"),t.tab=t.params.tab,t.page=0,t.nodata="",t.loading=!1,t.pageCount=1,t.render({tab:t.tab}),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.tabEvent(),t.bindScrollEvent(),t.addEvent(),t.orderClickEvent()},t.tabEvent=function(){n(".tab-cls").click(function(t){var e=n(this).attr("data-href");window.location.replace(e)})},t.handleNodata=function(){var t=this;t.nodata="没有数据了";var e=n(".nodata");0==e.length&&n("#index .order-list").append('<div class="nodata">'+t.nodata+"</div>"),t.app.detachInfiniteScroll(".infinite-scroll"),n("#index .infinite-scroll-preloader").remove()},t.loadPage=function(){var t=this;if(t.loading=!0,t.page>=t.pageCount)return void t.handleNodata();var a={status:t.tab};a.page=t.page+1,a=t.csrf(a),n.ajax({method:"GET",url:e.to(r),data:a,dataType:"json",beforeSend:function(){t.showIndicator()},success:function(e){if(1==e.success&&(i.isDefined(e.page)&&(t.page=parseInt(e.page)),i.isDefined(e.page_count)&&(t.pageCount=parseInt(e.page_count)),t.renderItems(e.items,!0),t.page>=t.pageCount))return void t.handleNodata()},error:function(t){},complete:function(e){t.hideIndicator(),t.loading=!1}})},t.bindScrollEvent=function(){var t=this;t.app.attachInfiniteScroll("#index .infinite-scroll"),n("#index .infinite-scroll").on("infinite",function(){t.loading||t.nodata||t.loadPage()})},t.renderItems=function(t,e){var i=n("#index .order-list"),r=n("script#order-item-template"),o=a.compile(r.html()),s=o({list:t});0==e&&(i.html(""),i.append(s)),i.append(s)},t.addEvent=function(){n("#index .add-btn-cls").click(function(t){window.location.href=e.to("order/#submit")})},t.orderClickEvent=function(){n("#index").on("click",".order-item",function(t){var i=n(this).attr("data-id");window.location.href=e.to("order#order-details/"+i)})},t}),define("order/order-details-controller",["mk7/controller","mk7/url","mk7/utils","mk7/photo-browser"],function(t,e,i,n){var a=Dom7,t=(Template7,new t),r="order/default/order-details";return t.run=function(){var t=this;t.id=t.params.id,t.success=!0,t.setPageTitle("维修单"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.finishBtnEvent(),t.popupImageLayer()},t.beforeRender=function(){var t=this;console.log("beforeRender"),t.success||(t.view="order-details-error")},t.loadPage=function(){var t=this,n=t.csrf({id:t.id});i.httpPost(e.to(r),n,function(e){var i=e;t.success=e.success,t.render(i)},!0)},t.finishBtnEvent=function(){var t=this;a("#order-details .finish-submit").click(function(i){window.location.href=e.to("order/#cost-list/"+t.id)})},t.agreementEvent=function(){},t.popupImageLayer=function(){var t=this;a("#order-details").on("click",".view-img-cls",function(e){var i=a(this).parents("ul"),n=i.find(".view-img-cls"),r=[],o=a(this).attr("data-index");a.each(n,function(t,e){var i=a(e).attr("data-url");r.push(i)});var s=t.app.photoBrowser({photos:r,initialSlide:o});s.open()})},t}),define("order/rate-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(t,e,i,n){var a=Dom7,t=(Template7,new t),r="order/customer/submit-rate",o="/user/default/upload-file";return t.run=function(){var t=this;t.id=t.params.id,t.sn=t.params.sn,t.imgLimit=4,t.setPageTitle("评价"),t.loadPage()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.starClickEvent(),t.submitEvent(),t.uploadImgEvent()},t.loadPage=function(){var t=this;t.render({servicePhone:window.$site.servicePhone})},t.starClickEvent=function(){a("#rate").on("click",".img-star",function(t){var e=a(this).attr("data-id"),i=a(this).parent(".star-div"),n=i.find(".img-star");a.each(n,function(t,n){var r=a(n).attr("data-id");if(1*r<=e){a(n).addClass("star-on");var o=i.find(".rate-text"),s=a(n).attr("data-txt");o.html(s)}else a(n).removeClass("star-on")})})},t.uploadImgEvent=function(){var t=this;a("#rate #upload-btn").change(function(){if(""!=a(this).val()&&null!=a(this).val()){var r=a(this).parents("li");n.uploadFile({selector:"#upload-btn",url:e.to(o),processAppendTo:"#rate",success:function(e,n){try{if(e.success){var o=e.tmpUrl;a('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+o+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(r),t.imgLimit==a("#rate #image-list").find(".up-img").length&&a("#rate .upload-btn-li").hide()}else i.toast({content:e.message,closeDelay:5e3})}catch(s){console.log(s),i.toast({content:"出错",closeDelay:5e3})}}})}}),a("#rate #image-list").on("click",".del-img",function(e){a(this).parent().remove(),t.imgLimit>=a("#rate #image-list").find(".up-img").length&&a("#rate .upload-btn-li").show()})},t.getUploadImgs=function(){var t=a("#rate #image-list").find(".up-img"),e=[];return 0==t.length?[]:(a.each(t,function(t,i){var n=a(i).find(".upload-item");e.push(n.attr("data"))}),e)},t.submitEvent=function(){var t=this;a("#rate .submit-btn").click(function(n){var o=i.trim(a("#rate .text-content").val()),s=a("#rate .quality-box .img-star"),l=0;a.each(s,function(t,e){a(e).hasClass("star-on")&&l++});var c=a("#rate .effect-box .img-star"),u=0;a.each(c,function(t,e){a(e).hasClass("star-on")&&u++});var d=a("#rate .service-box .img-star"),m=0;a.each(d,function(t,e){a(e).hasClass("star-on")&&m++});var p=t.getUploadImgs(),v=t.csrf({comment:o,id:t.id,qualityStar:l,effectStar:u,serviceStar:m,images:p});i.httpPost(e.to(r),v,function(n){n.success?window.location.replace(e.to("order/customer#customer-order/"+t.id+"/"+t.sn)):i.toast({content:n.message})},!0)})},t}),define("order/submit-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs","mk7/picker"],function(t,e,n,a,r){var o=Dom7,s=Template7,t=new t,l="/user/default/upload-file",c="/order/default/do-submit",u=!0,d="";return t.run=function(){var t=this;t.setPageTitle("录入维修单"),t.imgLimit=9,t.render(),t.loadInit()},t.bindEvents=function(){var t=this;console.log("bindEvents"),t.uploadImgEvent(),t.submitEvent(),t.selectDateEvent(),t.openCarModel(),t.searchCarModel(),t.carModelClick()},t.loadInit=function(){var t=this;({id:t.id})},t.uploadImgEvent=function(){var t=this;o("#submit #upload-btn").change(function(){if(""!=o(this).val()&&null!=o(this).val()){var i=o(this).parents("li");a.uploadFile({selector:"#upload-btn",url:e.to(l),processAppendTo:"#submit",success:function(e,a){try{if(e.success){var r=e.tmpUrl;o('<li class="upload-li up-img"><div data="'+e.tmpFile+'" data-url="'+r+'" class="upload-item" style="background-image:url('+e.tmpMinUrl+')"></div><span class="del-img"></span></li>').insertBefore(i),t.imgLimit==o("#submit #image-list").find(".up-img").length&&o("#submit .upload-btn-li").hide()}else n.toast({content:e.message,closeDelay:5e3})}catch(s){n.toast({content:"出错",closeDelay:5e3})}}})}}),o("#submit #image-list").on("click",".del-img",function(e){o(this).parent().remove(),t.imgLimit>=o("#submit #image-list").find(".up-img").length&&o("#submit .upload-btn-li").show()})},t.submitEvent=function(){var t=this;o("#submit .submit-btn-cls").click(function(i){var a=n.trim(o("#submit .carNo").val()),r=n.trim(o("#submit .carModel").val()),s=n.trim(o("#submit .customer").val()),l=n.trim(o("#submit .phone").val()),d=n.trim(o("#submit .preRepair").val()),m=n.trim(o("#submit .repairPrice").val()),p=n.trim(o("#submit .finishDate").val());if(0==u)return!1;if(""==a)return n.toast({content:"车牌号必填"}),!1;if(""==r)return n.toast({content:"车辆型号必填"}),!1;if(""==s)return n.toast({content:"客户名称必填"}),!1;if(""==l)return n.toast({content:"客联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"客联系电话有误"}),!1;if(""==d)return n.toast({content:"预估维修内容必填"}),!1;if(""==m)return n.toast({content:"预估维修费用必填"}),!1;if(""==p)return n.toast({content:"预估完成时间必填"}),!1;var v=t.getUploadImgs();if(0==v.length)return n.toast({content:"请上传车损照"}),!1;u=!1;var f=t.csrf({carNo:a,carModel:r,customer:s,phone:l,preRepair:d,repairPrice:m,finishDate:p,images:v});n.httpPost(c,f,function(t){return u=!0,t.success?void window.location.replace(e.to("order#order-details/"+t.orderId)):(n.toast({content:t.message}),!1)},!0)})},t.getUploadImgs=function(){var t=o("#submit #image-list").find(".up-img"),e=[];return 0==t.length?[]:(o.each(t,function(t,i){var n=o(i).find(".upload-item");e.push(n.attr("data"))}),e)},t.selectDateEvent=function(){var t=this;o("#submit .finish-date-input").click(function(e){var i=o("#submit .finish-date-input").val();t.dateTimeSelector("#submit .finish-date-input",i)})},t.dateTimeSelector=function(t,e){var n=this,a=new Date,r=30,s=a.getFullYear(),l=a.getMonth(),c=a.getDate(),u=a.getHours(),m=s+"-"+(l+1)+"-"+c;if(""!=e&&null!=e&&void 0!==e){var p=e.split(" ");m=p[0],u=p[1]}var v=[];for(i=0;i<=r;i++){var f=new Date;f.setDate(a.getDate()+i);var h=f.getFullYear()+"-"+(f.getMonth()+1)+"-"+f.getDate();v.push(h)}var g=n.app.picker({input:t,toolbarTemplate:'<div class="toolbar"><div class="toolbar-inner"><div class="left">请选择用工时间</div><div class="right"><a href="javascript:void(0);" class="link submit-confirm-picker">确定</a></div></div></div>',value:[m,u],onChange:function(t,e,i){var n,a,r;if(e[0]instanceof Date)n=e[0].getFullYear(),a=e[0].getMonth(),r=e[0].getDate();else{var o=e[0].split("-");n=o[0],a=o[1]-1,r=o[2]}var s=new Date(n,a,r,e[1],0),l=new Date((new Date).getTime()+36e5);if(s<l){if(void 0===t.cols[0])return!1;var c=l.getHours(),u=l.getFullYear()+"-"+(l.getMonth()+1)+"-"+l.getDate(),d=new Date(l.getFullYear(),l.getMonth(),l.getDate(),l.getHours(),0);if(d-new Date<9e5){var m=new Date(d.getTime()+36e5);c=m.getHours(),u=m.getFullYear()+"-"+(m.getMonth()+1)+"-"+m.getDate()}t.cols[0].setValue(u),t.cols[2].setValue(c)}},formatValue:function(t,e,i){var n="";n=e[0]instanceof Date?e[0].getFullYear()+"-"+(e[0].getMonth()+1)+"-"+e[0].getDate():e[0];var a=n+" "+e[1];return a},cols:[{values:v,displayValues:function(){var t=[],e=new Date,i=e.getFullYear(),n=e.getMonth()+1,a=e.getDate();e.setDate(e.getDate()+1);for(var r=0;r<v.length;r++){var o=v[r],s=o.split("-"),l=s[1]+"月"+s[2]+"日";i==s[0]&&1*n==s[1]&&1*a==s[2]&&(l+="(今天)"),1*e.getFullYear()==s[0]&&1*e.getMonth()+1==s[1]&&1*e.getDate()==s[2]&&(l+="(明天)"),t.push(l)}return t}()},{divider:!0,content:"  "},{values:function(){for(var t=[],e=0;e<=23;e++)t.push(e);return t}(),displayValues:function(){for(var t=[],e=0;e<=23;e++)t.push(e<10?"0"+e+"时":e+"时");return t}()},{divider:!0,content:"  "}],onClose:function(e){if(g){var i=g.value,n=i[1]<10?"0"+i[1]:i[1];d=i[0]+" "+n,o(t).val(d),g.destroy()}}});g.open(),o(".submit-confirm-picker").on("click",function(e){e.preventDefault();var i=g.value,n=i[1]<10?"0"+i[1]:i[1];d=i[0]+" "+n,o(t).val(d),g.destroy()})},t.openCarModel=function(){o("#submit").on("click",".carModel",function(t){o("#search-wrapper").remove();var e=o("#submit"),i=o("script#search-car-model-template"),n=s.compile(i.html()),a=n({keyword:""});e.append(a)})},t.renderCarModelItem=function(t){var e=o("#search-wrapper .model-list"),i=o("script#search-car-model-item-template"),n=s.compile(i.html()),a=n({items:t});e.html(a)},t.searchCarModel=function(){var t=this;o("#submit").on("click",".model-search-btn",function(e){t.ajaxSearch()}),o("#submit").on("submit","#search-form",function(e){return e.preventDefault(),t.ajaxSearch(),!1})},t.ajaxSearch=function(){var t=this,i={keyword:o("#search-wrapper .search-input").val()};o.ajax({method:"POST",url:e.to("order/default/search-model"),data:i,dataType:"json",beforeSend:function(){t.showIndicator()},success:function(e){e.success?t.renderCarModelItem(e.items):t.renderCarModelItem([])},error:function(t){},complete:function(e){t.hideIndicator()}})},t.carModelClick=function(){o("#submit").on("click",".model-div-btn",function(t){var e=o(this).attr("data-value");o("#submit .carModel").val(e),o("#search-wrapper").remove()}),o("#submit").on("click",".closeBtn",function(t){o("#search-wrapper").remove()})},t});
 \ No newline at end of file
-define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",c=!0,s=!0,a=null;return e.run=function(){var e=this;return e.setPageTitle("登录"),e.codeDuration=60,isGuest?void e.render():(window.location.href=t.to("order/#index"),"")},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==c)return!1;clearInterval(a),c=!1;var s=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),s,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),c=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,a=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(a),e.codeDuration=o,c=!0):r("#login .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var c=n.trim(r("#login .mobile").val()),a=n.trim(r("#login .code").val());if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(0==s)return!1;s=!1;var l=e.csrf({mobile:c,code:a});n.httpPost(t.to(i),l,function(e){return s=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,c="/user/login/register",s="/user/default/upload-file",a="/user/login/get-code",l=!0,u=!0,d=null;return e.run=function(){var e=this;return e.setPageTitle("注册"),e.codeDuration=60,isGuest?void e.render():(window.location.href=t.to("order/#index"),"")},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(){if(""!=o(this).val()&&null!=o(this).val()){var e=o(this).attr("id"),i=o(this).parent();r.uploadFile({selector:"#"+e,url:t.to(s),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;i.css("background-image","url("+e.tmpMinUrl+")"),i.attr("data",e.tmpFile),i.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(a),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),s=n.trim(o("#register .mobile").val()),a=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==s)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(s))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==s)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;var g=o("#register .licensePic").attr("data");if(void 0===g||null==g)return n.toast({content:"请上传营业执照"}),!1;var v=o("#register .headPic").attr("data");if(void 0===v||null==v)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f||null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var m=o("#register .QAChargePic").attr("data");if(void 0===m||null==m)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var h=e.csrf({name:i,mobile:s,code:a,emergencyContact:l,emergencyPerson:d,licensePic:g,headPic:v,techChargePic:f,QAChargePic:m});n.httpPost(t.to(c),h,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){o("#register .check-agreement").click(function(e){o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active")}),o("#register .agreement-cls").click(function(e){o("#agreement-wrapper").remove();var t=o("#register"),n=o("script#agreement-template"),r=i.compile(n.html()),c=r({});t.append(c)}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove();var t=o("#register .check-agreement");t.hasClass("checked-active")||t.addClass("checked-active")})},e});
 \ No newline at end of file
+define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",c=!0,s=!0,a=null;return e.run=function(){var e=this;e.setPageTitle("登录"),e.codeDuration=60,!isGuest,e.render();const t=new Promise(function(e,t){setTimeout(function(){e("foo")},300)});t.then(function(e){console.log(e)}),console.log(t)},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==c)return!1;clearInterval(a),c=!1;var s=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),s,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),c=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,a=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(a),e.codeDuration=o,c=!0):r("#login .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var c=n.trim(r("#login .mobile").val()),a=n.trim(r("#login .code").val());if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(0==s)return!1;s=!1;var l=e.csrf({mobile:c,code:a});n.httpPost(t.to(i),l,function(e){return s=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,c="/user/login/register",s="/user/default/upload-file",a="/user/login/get-code",l=!0,u=!0,d=null,g=!1;return e.run=function(){var e=this;e.setPageTitle("注册"),e.codeDuration=60,!isGuest,e.render()},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(e){if(""!=o(this).val()&&null!=o(this).val()){var i=e.target,c=(i.files[0],o(this).attr("id")),a=o(this).parent();r.uploadFile({selector:"#"+c,url:t.to(s),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;a.css("background-image","url("+e.tmpMinUrl+")"),a.attr("data",e.tmpFile),a.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(a),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),s=n.trim(o("#register .mobile").val()),a=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val()),g=n.trim(o("#register .address").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==s)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(s))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==s)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;if(""==g)return n.toast({content:"维修厂地址必填"}),!1;var v=o("#register .licensePic").attr("data");if(void 0===v||null==v)return n.toast({content:"请上传营业执照"}),!1;var m=o("#register .headPic").attr("data");if(void 0===m||null==m)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f||null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var h=o("#register .QAChargePic").attr("data");if(void 0===h||null==h)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var p=e.csrf({name:i,mobile:s,code:a,emergencyContact:l,emergencyPerson:d,address:g,licensePic:v,headPic:m,techChargePic:f,QAChargePic:h});n.httpPost(t.to(c),p,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){var e=this;o("#register .check-agreement").click(function(t){return 0==g?(e.showAgreement(),!1):void(o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active"))}),o("#register .agreement-cls").click(function(t){e.showAgreement()}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove(),g=!0;var t=o("#register .check-agreement");t.hasClass("checked-active")||t.addClass("checked-active")})},e.showAgreement=function(){o("#agreement-wrapper").remove();var e=o("#register"),t=o("script#agreement-template"),n=i.compile(t.html()),r=n({});e.append(r)},e});
 \ No newline at end of file
@@ -7,9 +7,10 @@ define(
         'mk7/controller',
         'mk7/url',
         'mk7/utils',
+        'mk7/photo-browser'
     ],
-    function(ctrl, url, utils) {
+    function(ctrl, url, utils, photoBrowser) {
         var $$ = Dom7;
         var t7 = Template7;
@@ -73,31 +74,21 @@ define(
             })
         }
         ctrl.popupImageLayer = function() {
+            var me = this;
             $$('#customer-order').on('click', '.view-img-cls', function(e) {
-                var url = $$(this).attr('data-url');
-                $$('#img-mask').remove();
-                var imgContent = '<div id="img-mask" style="z-index:2;background:#000;justify-content:center;position: absolute;bottom:0;top:0;width:100%;display:flex;flex-direction: column;align-items: center"><div style="width:100%;"> <img width="100%" src="'+url+'" /></div></div>';
-                $$('#customer-order').append(imgContent);
-            })
-
-            $$('#customer-order').on('click', '#img-mask, #img-mask img', function(e) {
-                e.preventDefault();
-                e.stopPropagation()
-
-                var bh = document.body.clientHeight;
-                var ih = $$('#img-mask img').height();
-                console.log(bh+'dddd'+ih)
-                var interval = Math.abs(ih-bh);
-                if (interval >=0 && interval <= 20) {
-                    $$('#img-mask').remove();
-                } else {
-                    var id = $$(e.target).attr('id');
-                    if('img-mask' == id) {
-                        $$('#img-mask').remove();
-                    }
-                }
+                var parent = $$(this).parents('ul');
+                var imagesT = parent.find('.view-img-cls');
+                var photoBrowserPhotos = [];
+                var initialSlide = $$(this).attr('data-index');
+                $$.each(imagesT, function(i, n) {
+                    var nURL = $$(n).attr('data-url');
+                    photoBrowserPhotos.push(nURL)
+                })
+                var pBrowser = me.app.photoBrowser({photos:photoBrowserPhotos,initialSlide:initialSlide});
+                pBrowser.open();
             })
+
         }
         return ctrl;
     }
@@ -7,9 +7,10 @@ define(
         'mk7/controller',
         'mk7/url',
         'mk7/utils',
+        'mk7/photo-browser'
     ],
-    function(ctrl, url, utils) {
+    function(ctrl, url, utils, photoBrowser) {
         var $$ = Dom7;
         var t7 = Template7;
@@ -54,48 +55,22 @@ define(
             })
         }
         ctrl.agreementEvent = function() {
-            //agreement-btn
-            /*
-            $$('#order-details .agreement-btn').click(function(e){
-                $$('#agreement-wrapper').remove();
-                var page = $$('#order-details');
-                var ele = $$('script#agreement-template');
-                var compiled = t7.compile(ele.html());
-                var doms = compiled({});
-                page.append(doms);
-            })
-            $$('#order-details').on('click','.agree-btn', function(e){
-                $$('#agreement-wrapper').remove();
-            })
-            */
         }
-        ctrl.popupImageLayer = function(){
+        ctrl.popupImageLayer = function() {
+            var me = this;
             $$('#order-details').on('click', '.view-img-cls', function(e) {
-                var url = $$(this).attr('data-url');
-                $$('#img-mask').remove();
-                var imgContent = '<div id="img-mask" style="z-index:2;background:#000;justify-content:center;position: absolute;bottom:0;top:0;width:100%;display:flex;flex-direction: column;align-items: center"><div style="width:100%;"> <img width="100%" src="'+url+'" /></div></div>';
-                $$('#order-details').append(imgContent);
-            })
-
-            $$('#order-details').on('click', '#img-mask, #img-mask img', function(e) {
-                e.preventDefault();
-                e.stopPropagation()
-
-                var bh = document.body.clientHeight;
-                var ih = $$('#img-mask img').height();
-                console.log(bh+'dddd'+ih)
-                var interval = Math.abs(ih-bh);
-                if (interval >=0 && interval <= 20) {
-                    $$('#img-mask').remove();
-
-                } else {
-                    var id = $$(e.target).attr('id');
-                    if('img-mask' == id) {
-                        $$('#img-mask').remove();
-                    }
-                }
+                var parent = $$(this).parents('ul');
+                var imagesT = parent.find('.view-img-cls');
+                var photoBrowserPhotos = [];
+                var initialSlide = $$(this).attr('data-index');
+                $$.each(imagesT, function(i, n) {
+                    var nURL = $$(n).attr('data-url');
+                    photoBrowserPhotos.push(nURL)
+                })
+                var pBrowser = me.app.photoBrowser({photos:photoBrowserPhotos,initialSlide:initialSlide});
+                pBrowser.open();
             })
         }
@@ -35,7 +35,7 @@ define(
         }
         ctrl.loadPage = function(){
             var me = this;
-            me.render();
+            me.render({servicePhone:window.$site.servicePhone});
         }
         ctrl.starClickEvent = function() {
             $$('#rate').on('click', '.img-star',function(e) {
@@ -48,7 +48,6 @@ define(
                         $$(n).addClass('star-on');
                         var rateText = parentBox.find('.rate-text');
                         var txt = $$(n).attr('data-txt');
-
                         rateText.html(txt);
                     } else {
                         $$(n).removeClass('star-on');
@@ -43,14 +43,7 @@ define(
         ctrl.loadInit = function() {
             var me = this;
             var sData = {id:me.id}
-            utils.httpGet(submitURL, sData, function(res) {
-                if (res.success) {
-                    if (res.address) {
-                        $$('#submit .maintainerAddress').val(res.address);
-                        $$('#submit .maintainerAddress').attr('readonly', true);
-                    }
-                }
-            }, true);
+
         }
         ctrl.uploadImgEvent = function() {
             var me = this;
@@ -101,7 +94,7 @@ define(
                 var preRepair = utils.trim($$('#submit .preRepair').val());
                 var repairPrice = utils.trim($$('#submit .repairPrice').val());
                 var finishDate = utils.trim($$('#submit .finishDate').val());
-                var address = utils.trim($$('#submit .maintainerAddress').val());
+
                 if (false == canSubmit) {
                     return false;
                 }
@@ -125,7 +118,7 @@ define(
                     utils.toast({content:'客联系电话有误'});
                     return false;
                 }
-                /*
+
                 if ('' == preRepair) {
                     utils.toast({content:'预估维修内容必填'});
                     return false;
@@ -134,15 +127,12 @@ define(
                     utils.toast({content:'预估维修费用必填'});
                     return false;
                 }
-                 */
+
                 if ('' == finishDate) {
                     utils.toast({content:'预估完成时间必填'});
                     return false;
                 }
-                if ('' == address) {
-                    utils.toast({content:'维修厂地址必填'});
-                    return false;
-                }
+
                 var imgs = me.getUploadImgs();
                 if (0 == imgs.length) {
                     utils.toast({content:'请上传车损照'});
@@ -151,8 +141,7 @@ define(
                 canSubmit = false;
                 var sData = me.csrf({
                     carNo:carNo, carModel:carModel,customer:customer,phone:phone,
-                    preRepair:preRepair, repairPrice:repairPrice,finishDate:finishDate, images:imgs,
-                    address:address
+                    preRepair:preRepair, repairPrice:repairPrice,finishDate:finishDate, images:imgs
                 })
                 utils.httpPost(doSubmitURL, sData, function(res) {
                     canSubmit = true;
@@ -183,7 +172,7 @@ define(
             var me = this
             $$('#submit .finish-date-input').click(function(e) {
                 var cData = $$('#submit .finish-date-input').val();
-                console.log(cData)
+                //console.log(cData)
                 me.dateTimeSelector('#submit .finish-date-input', cData);
             })
         }
@@ -24,8 +24,8 @@ define(
             me.setPageTitle("登录");
             me.codeDuration = 60;
             if (!isGuest) {
-                window.location.href = url.to('order/#index');
-                return '';
+                //window.location.href = url.to('order/#index');
+                //return '';
             }
             me.render();
         }
@@ -23,14 +23,15 @@ define(
         var clickGetCode = true;
         var registerClick = true;
         var tt = null
+        var hasCheckAgreement = false;
         ctrl.run = function () {
             var me = this;
             me.setPageTitle("注册");
             //me.hideAllNonBaseMenuItem(window.$site);
             me.codeDuration = 60;
             if (!isGuest) {
-                window.location.href = url.to('order/#index');
-                return '';
+                //window.location.href = url.to('order/#index');
+                //return '';
             }
             me.render();
         }
@@ -44,10 +45,13 @@ define(
             me.checkAgreement();
         }
         ctrl.uploadEvent = function() {
-            $$('#register .upload-input-cls').change(function() {
+            $$('#register .upload-input-cls').change(function(e) {
                 if ('' == $$(this).val() || null == $$(this).val()) {
                     return ;
                 }
+                var target = e.target;
+                var fileObject = target.files[0];
+
                 var id = $$(this).attr('id');
                 var parent = $$(this).parent();
                 uploadjs.uploadFile({
@@ -126,6 +130,7 @@ define(
                 var code = utils.trim($$('#register .code').val());
                 var emergencyContact = utils.trim($$('#register .emergency_contact').val());
                 var emergencyPerson = utils.trim($$('#register .emergency_person').val());
+                var address = utils.trim($$('#register .address').val());
                 if ('' == name) {
                     utils.toast({content:'车厂名称必填'})
@@ -163,6 +168,11 @@ define(
                     return false;
                 }
+                if ('' == address) {
+                    utils.toast({content:'维修厂地址必填'})
+                    return false;
+                }
+
                 var licensePic = $$('#register .licensePic').attr('data');
                 if (undefined === licensePic || null == licensePic) {
                     utils.toast({content:'请上传营业执照'})
@@ -196,6 +206,7 @@ define(
                 var pData = me.csrf({
                     name:name, mobile:mobile,code:code,
                     emergencyContact:emergencyContact,emergencyPerson:emergencyPerson,
+                    address:address,
                     licensePic:licensePic,
                     headPic:headPic,
                     techChargePic:techChargePic,
@@ -224,7 +235,12 @@ define(
             })
         }
         ctrl.checkAgreement = function() {
+            var me = this;
             $$('#register .check-agreement').click(function(e) {
+                if (false == hasCheckAgreement) {
+                    me.showAgreement();
+                    return false;
+                }
                 if($$(this).hasClass('checked-active')) {
                     $$(this).removeClass('checked-active');
                 } else {
@@ -233,16 +249,12 @@ define(
             })
             $$('#register .agreement-cls').click(function(e){
-                $$('#agreement-wrapper').remove();
-                var page = $$('#register');
-                var ele = $$('script#agreement-template');
-                var compiled = t7.compile(ele.html());
-                var doms = compiled({});
-                page.append(doms);
+                me.showAgreement();
             })
             $$('#register').on('click','.agree-btn', function(e){
                 $$('#agreement-wrapper').remove();
+                hasCheckAgreement = true;
                 var checkAgreement = $$('#register .check-agreement');
                 if(!checkAgreement.hasClass('checked-active')) {
                     checkAgreement.addClass('checked-active');
@@ -250,6 +262,14 @@ define(
             })
         }
+        ctrl.showAgreement = function() {
+            $$('#agreement-wrapper').remove();
+            var page = $$('#register');
+            var ele = $$('script#agreement-template');
+            var compiled = t7.compile(ele.html());
+            var doms = compiled({});
+            page.append(doms);
+        }
         return ctrl;
     }
 );
@@ -15,23 +15,27 @@ define(
                 ontimeout:function(e){},
                 error:function(res, e){if(options.error){options.error(res, e)}}
             }
+            function appendProcess() {
+                var preUpload = '<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';
+                if ('' != setting.processAppendTo) {
+                    var appendObj = document.querySelector(setting.processAppendTo);
+                    if (!appendObj) {
+                        return '';
+                    }
+                    var processBar = appendObj.querySelector('#process-bar');
+                    if (appendObj && processBar) {
+                        appendObj.removeChild(processBar);
+                    }
+
+                    appendObj.insertAdjacentHTML("beforeend", preUpload)
+                }
+            }
+
             setting.beforeSend = function(res, e) {
                 if(options.beforeSend) {
                     options.beforeSend(res, e)
                 } else {
-                    var preUpload = '<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';
-                    if ('' != setting.processAppendTo) {
-                        var appendObj = document.querySelector(setting.processAppendTo);
-                        if (!appendObj) {
-                            return '';
-                        }
-                        var processBar = appendObj.querySelector('#process-bar');
-                        if (appendObj && processBar) {
-                            appendObj.removeChild(processBar);
-                        }
-
-                        appendObj.insertAdjacentHTML("beforeend", preUpload)
-                    }
+                    appendProcess();
                 }
             }
@@ -64,65 +68,136 @@ define(
             }
             var fileObject = document.querySelector(setting.selector).files[0];
-            var formData = new FormData();
-            var xhr = new XMLHttpRequest();
-            xhr.timeout = setting.timeout;
-            xhr.onload = function(e) {
-                //console.log(this.response);
-
-                var response = JSON.parse(this.response);
-                setting.success(response, e);
-            };
-            xhr.onloadend = function(e) {
-                //console.log('request loadend');
-                if ('' != setting.processAppendTo) {
-                    var appendObj = document.querySelector(setting.processAppendTo);
-                    if (appendObj) {
-                        var processBar = appendObj.querySelector('#process-bar');
+            var uploadType = '';
+            var fileSize = fileObject.size/1024;
+
+            setting.uploadPost = function (fileObject, uploadType) {
+                var formData = new FormData();
+                var xhr = new XMLHttpRequest();
+                xhr.timeout = setting.timeout;
+                xhr.onload = function(e) {
+                    //console.log(this.response);
+
+                    var response = JSON.parse(('' == this.response || null == this.response)?"[]":this.response)
+                    setting.success(response, e);
+                };
+                xhr.onloadend = function(e) {
+                    //console.log('request loadend');
+                    if ('' != setting.processAppendTo) {
+                        var appendObj = document.querySelector(setting.processAppendTo);
                         if (appendObj) {
-                            appendObj.removeChild(processBar);
+                            var processBar = appendObj.querySelector('#process-bar');
+                            if (appendObj) {
+                                appendObj.removeChild(processBar);
+                            }
                         }
                     }
+
+                    var response = JSON.parse(('' == this.response || null == this.response)?"[]":this.response)
+                    setting.complete(response, e);
+                };
+                xhr.onerror = function(e) {
+                    //console.log('request error');
+                    var response = JSON.parse(('' == this.response || null == this.response)?"[]":this.response)
+                    setting.error(response, e);
+                };
+                xhr.ontimeout = function(e) {
+                    console.log('request timeout');
+                    setting.ontimeout(e);
+                };
+                xhr.addEventListener('loadstart', function(e) {
+                    setting.beforeSend(e);
+                });
+
+                xhr.open('post', setting.url, true)
+
+                xhr.upload.onprogress = function (ex) {
+                    if (ex.lengthComputable) {
+                        setting.process(ex);
+                    }
                 }
+                //console.log(uploadType)
+                formData.append('uploadType', uploadType)
+                formData.append('file', fileObject);
+                xhr.send(formData);
+            }
-                var response = JSON.parse(this.response);
-                setting.complete(response, e);
-            };
-            xhr.onerror = function(e) {
-                //console.log('request error');
-                var response = JSON.parse(this.response);
-                setting.error(response, e);
-            };
-            xhr.ontimeout = function(e) {
-                console.log('request timeout');
-                setting.ontimeout(e);
-            };
-            xhr.addEventListener('loadstart', function(e) {
-                setting.beforeSend(e);
-            });
-
-            xhr.open('post', setting.url, true)
-            /*
-             xhr.onreadystatechange = function () {
-             if(this.readyState == 4) {
-             stateChange(this.response);
-             } else {
-             var completeFun = arguments[3];
-             if (completeFun) {
-             completeFun(this);
-             }
-
-             }
-             }
-             */
-
-            xhr.upload.onprogress = function (ex) {
-                if (ex.lengthComputable) {
-                    setting.process(ex);
+            setting.compressAndUpload = function(fileObject, uploadType) {
+
+                // 压缩图片需要的一些元素和对象
+                var reader = new FileReader(),
+                //创建一个img对象
+                    img = new Image();
+
+                // 选择的文件对象
+                var file = fileObject;
+                var newObj = null;
+
+                // 缩放图片需要的canvas
+                var canvas = document.createElement('canvas');
+                var context = canvas.getContext('2d');
+
+                if(file == undefined || file == '') {
+                    return ;
                 }
+                // 选择的文件是图片
+                if(file.type.indexOf("image") == 0) {
+                    reader.readAsDataURL(file);
+                } else {
+                    return false;
+                }
+
+                // 文件base64化，以便获知图片原始尺寸
+                reader.onload = function(onloadEvent) {
+                    img.src = onloadEvent.target.result;
+                };
+                appendProcess();
+                // base64地址图片加载完毕后
+                img.onload = function() {
+
+                    var img = this;
+                    var time = new Date().getTime();
+                    // 图片原始尺寸
+                    var originWidth = img.width;
+                    var originHeight = img.height;
+                    // 最大尺寸限制，可通过设置宽高来实现图片压缩程度
+                    var maxWidth = 1024,
+                        maxHeight = 1024;
+                    // 目标尺寸
+                    var targetWidth = originWidth,
+                        targetHeight = originHeight;
+                    // 图片尺寸超过限制
+                    if (originWidth > maxWidth || originHeight > maxHeight) {
+                        if (originWidth / originHeight > maxWidth / maxHeight) {
+                            // 更宽，按照宽度限定尺寸
+                            targetWidth = maxWidth;
+                            targetHeight = Math.round(maxWidth * (originHeight / originWidth));
+                        } else {
+                            targetHeight = maxHeight;
+                            targetWidth = Math.round(maxHeight * (originWidth / originHeight));
+                        }
+                    }
+                    // canvas对图片进行缩放
+                    canvas.width = targetWidth;
+                    canvas.height = targetHeight;
+                    // 清除画布
+                    context.clearRect(0, 0, targetWidth, targetHeight);
+                    // 图片压缩
+                    context.drawImage(img, 0, 0, targetWidth, targetHeight);
+                    var newImage = canvas.toDataURL('image/jpeg', 0.7); //base64 格式
+
+                    setting.uploadPost(newImage, uploadType);
+                }
+
+            }
+
+            if (fileSize <= 1024) {
+                uploadType = 'file'
+                setting.uploadPost(fileObject, uploadType);
+            } else {
+                uploadType = 'base64';
+                setting.compressAndUpload(fileObject, uploadType)
             }
-            formData.append('file', fileObject);
-            xhr.send(formData);
         }
         return object;
1	<?php	1	<?php
2	return [	2	return [
3	'adminEmail' => 'admin@example.com',	3	'adminEmail' => 'admin@example.com',
4	- 'VERSION' => 'v0.1.0 build 14', // 当前发布版本号: v0.1.0 是版本号 \| build 1 是编译次数	4	+ 'testLoginPhones' => ['13900139001'],
		5	+ 'VERSION' => 'v0.1.0 build 15', // 当前发布版本号: v0.1.0 是版本号 \| build 1 是编译次数
5	];	6	];
	@@ -33,19 +33,34 @@ class DefaultController extends BaseController		@@ -33,19 +33,34 @@ class DefaultController extends BaseController
33	$e->message = 'ok';	33	$e->message = 'ok';
34	$userId = 0;	34	$userId = 0;
35		35
		36	+ if (isset($_POST["uploadType"]) && 'base64' == $_POST["uploadType"]) {
		37	+ $e = $this->uploadFileStr();
		38	+ } else {
		39	+ $e = $this->uploadFile();
		40	+ }
		41	+ return $this->renderJson($e);
		42	+ }
		43	+
		44	+ private function uploadFile()
		45	+ {
		46	+ $e = new stdClass();
		47	+ $e->success = false;
		48	+ $e->message = 'ok';
		49	+
36	if (empty($_FILES["file"])) {	50	if (empty($_FILES["file"])) {
37	$e->message = '文件为空';	51	$e->message = '文件为空';
38	- return $this->renderJson($e);	52	+ return $e;
39	}	53	}
		54	+
40	if (empty($_FILES["file"]['tmp_name'])) {	55	if (empty($_FILES["file"]['tmp_name'])) {
41	$e->message = '文件为空';	56	$e->message = '文件为空';
42	- return $this->renderJson($e);	57	+ return $e;
43	}	58	}
44	$type = $_FILES["file"]["type"];	59	$type = $_FILES["file"]["type"];
45	$typeArr = explode('/', $type);	60	$typeArr = explode('/', $type);
46	if ('image' !== $typeArr[0]) {	61	if ('image' !== $typeArr[0]) {
47	$e->message = '只能上传 png， jpg 等文件';	62	$e->message = '只能上传 png， jpg 等文件';
48	- return $this->renderJson($e);	63	+ return $e;
49	}	64	}
50		65
51	$uploadInfo = ImageManager::uploadImg($_FILES["file"]);	66	$uploadInfo = ImageManager::uploadImg($_FILES["file"]);
	@@ -59,7 +74,33 @@ class DefaultController extends BaseController		@@ -59,7 +74,33 @@ class DefaultController extends BaseController
59	$e->tmpUrl = $tmpUrl;	74	$e->tmpUrl = $tmpUrl;
60	$e->message = 'ok';	75	$e->message = 'ok';
61		76
62	- return $this->renderJson($e);	77	+ return $e;
63	}	78	}
64		79
		80	+ private function uploadFileStr()
		81	+ {
		82	+ $e = new stdClass();
		83	+ $e->success = false;
		84	+ $e->message = 'fail';
		85	+ $e->tmpFile = '';
		86	+ $e->tmpMinUrl = '';
		87	+ $e->tmpUrl = '';
		88	+ $imgData = $this->request->post("file");
		89	+ $imgData = str_replace('data:image/jpeg;base64,', '', $imgData);
		90	+ $imageStr = base64_decode($imgData);
		91	+ if ($imageStr) {
		92	+ $uploadInfo = ImageManager::saveBase64ImgFileToLocal($imageStr);
		93	+ $filename = $uploadInfo[0];
		94	+ $tmpUrl = $this->site->base_url.'/'.$uploadInfo[2];
		95	+ $tmpMinFile = $this->site->base_url.'/'.$uploadInfo[3];
		96	+
		97	+ $e->success = true;
		98	+ $e->tmpFile = $filename;
		99	+ $e->tmpMinUrl = $tmpMinFile;
		100	+ $e->tmpUrl = $tmpUrl;
		101	+ $e->message = 'ok';
		102	+ }
		103	+
		104	+ return $e;
		105	+ }
65	}	106	}
66	\ No newline at end of file	107	\ No newline at end of file
	@@ -133,7 +133,7 @@ class FileHelper		@@ -133,7 +133,7 @@ class FileHelper
133	$tmpPastePath = 'tmp/';	133	$tmpPastePath = 'tmp/';
134	}	134	}
135		135
136	- $somePath = Yii::getAlias('@app/wx') . "/web/".$tmpPastePath;	136	+ $somePath = $dir = Yii::getAlias('@site') . "/".$tmpPastePath;
137	if (!is_dir($somePath)) {	137	if (!is_dir($somePath)) {
138	mkdir($somePath, 0777, true);	138	mkdir($somePath, 0777, true);
139	}	139	}
	@@ -122,4 +122,36 @@ class ImageManager		@@ -122,4 +122,36 @@ class ImageManager
122		122
123	return [$filename, $minFileName, $tmpUrl, $tmpMinFile];	123	return [$filename, $minFileName, $tmpUrl, $tmpMinFile];
124	}	124	}
		125	+
		126	+ /**
		127	+ * @param $imageStr
		128	+ * @param string $tmpPath
		129	+ * @return array
		130	+ */
		131	+ public static function saveBase64ImgFileToLocal($imageStr)
		132	+ {
		133	+ $somePath = $dir = Yii::getAlias('@site') . "/tmp";
		134	+ if (!is_dir($somePath)) {
		135	+ mkdir($somePath, 0777, true);
		136	+ }
		137	+ if (!is_writable($somePath)) {
		138	+ chmod($somePath, 0777);
		139	+ }
		140	+ $tt = time();
		141	+ $image = imagecreatefromstring($imageStr);
		142	+ $fileNameId = 'auto_'.$tt.md5(date('YmdHis').'_'.mt_rand(100000, 999999));
		143	+ $minFileName = $fileNameId.'_min.jpg';
		144	+ $filename = $fileNameId.'.jpg';
		145	+ $saveFilePath = $somePath."/" .$filename;
		146	+ imagejpeg($image, $saveFilePath);
		147	+
		148	+ $tmpUrl = $tmpMinFile = 'tmp/'.$filename;
		149	+ $imgSource = self::_imageCreateFromPath($saveFilePath);
		150	+ if ($imgSource) {
		151	+ ImageUtils::resizeImage($imgSource, 100, 100, $dir.'/'.$minFileName);
		152	+ $tmpMinFile = 'tmp/'.$minFileName;
		153	+ }
		154	+
		155	+ return [$filename, $minFileName, $tmpUrl, $tmpMinFile];
		156	+ }
125	}	157	}
126	\ No newline at end of file	158	\ No newline at end of file
1	-define([],function(){var e={};return e.uploadFile=function(e){var o={selector:e.selector\|\|"",url:e.url\|\|"",processAppendTo:e.processAppendTo\|\|"",timeout:e.timeout\|\|6e3,beforeSend:function(e,o){},success:function(o,r){e.success&&e.success(o,r)},complete:function(o,r){e.complete&&e.complete(o,r)},process:function(e){},ontimeout:function(e){},error:function(o,r){e.error&&e.error(o,r)}};o.beforeSend=function(r,t){if(e.beforeSend)e.beforeSend(r,t);else{var n='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=o.processAppendTo){var s=document.querySelector(o.processAppendTo);if(!s)return"";var i=s.querySelector("#process-bar");s&&i&&s.removeChild(i),s.insertAdjacentHTML("beforeend",n)}}},o.process=function(r){if(e.process)e.process(r);else if(""!=o.processAppendTo){var t=document.querySelector(o.processAppendTo);if(!t)return"";var n=t.querySelector("#pro-bar");if(n){var s=100*r.loaded/r.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},o.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(o.selector).files[0],t=new FormData,n=new XMLHttpRequest;n.timeout=o.timeout,n.onload=function(e){var r=JSON.parse(this.response);o.success(r,e)},n.onloadend=function(e){if(""!=o.processAppendTo){var r=document.querySelector(o.processAppendTo);if(r){var t=r.querySelector("#process-bar");r&&r.removeChild(t)}}var n=JSON.parse(this.response);o.complete(n,e)},n.onerror=function(e){var r=JSON.parse(this.response);o.error(r,e)},n.ontimeout=function(e){console.log("request timeout"),o.ontimeout(e)},n.addEventListener("loadstart",function(e){o.beforeSend(e)}),n.open("post",o.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&o.process(e)},t.append("file",r),n.send(t)},e});
2	\ No newline at end of file	1	\ No newline at end of file
		2	+define([],function(){var e={};return e.uploadFile=function(e){function o(){var e='<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(!o)return"";var r=o.querySelector("#process-bar");o&&r&&o.removeChild(r),o.insertAdjacentHTML("beforeend",e)}}var t={selector:e.selector\|\|"",url:e.url\|\|"",processAppendTo:e.processAppendTo\|\|"",timeout:e.timeout\|\|6e3,beforeSend:function(e,o){},success:function(o,t){e.success&&e.success(o,t)},complete:function(o,t){e.complete&&e.complete(o,t)},process:function(e){},ontimeout:function(e){},error:function(o,t){e.error&&e.error(o,t)}};t.beforeSend=function(t,r){e.beforeSend?e.beforeSend(t,r):o()},t.process=function(o){if(e.process)e.process(o);else if(""!=t.processAppendTo){var r=document.querySelector(t.processAppendTo);if(!r)return"";var n=r.querySelector("#pro-bar");if(n){var s=100o.loaded/o.total,i=Math.floor(s)+"%";n.style.width=i,n.innerHTML=i}}},t.ontimeout=function(o){e.ontimeout?e.ontimeout(o):console.log("time out")};var r=document.querySelector(t.selector).files[0],n="",s=r.size/1024;t.uploadPost=function(e,o){var r=new FormData,n=new XMLHttpRequest;n.timeout=t.timeout,n.onload=function(e){var o=JSON.parse(""==this.response\|\|null==this.response?"[]":this.response);t.success(o,e)},n.onloadend=function(e){if(""!=t.processAppendTo){var o=document.querySelector(t.processAppendTo);if(o){var r=o.querySelector("#process-bar");o&&o.removeChild(r)}}var n=JSON.parse(""==this.response\|\|null==this.response?"[]":this.response);t.complete(n,e)},n.onerror=function(e){var o=JSON.parse(""==this.response\|\|null==this.response?"[]":this.response);t.error(o,e)},n.ontimeout=function(e){console.log("request timeout"),t.ontimeout(e)},n.addEventListener("loadstart",function(e){t.beforeSend(e)}),n.open("post",t.url,!0),n.upload.onprogress=function(e){e.lengthComputable&&t.process(e)},r.append("uploadType",o),r.append("file",e),n.send(r)},t.compressAndUpload=function(e,r){var n=new FileReader,s=new Image,i=e,c=document.createElement("canvas"),a=c.getContext("2d");if(void 0!=i&&""!=i){if(0!=i.type.indexOf("image"))return!1;n.readAsDataURL(i),n.onload=function(e){s.src=e.target.result},o(),s.onload=function(){var e=this,o=((new Date).getTime(),e.width),n=e.height,s=1024,i=1024,u=o,d=n;(o>s\|\|n>i)&&(o/n>s/i?(u=s,d=Math.round(s(n/o))):(d=i,u=Math.round(i*(o/n)))),c.width=u,c.height=d,a.clearRect(0,0,u,d),a.drawImage(e,0,0,u,d);var p=c.toDataURL("image/jpeg",.7);t.uploadPost(p,r)}}},s<=1024?(n="file",t.uploadPost(r,n)):(n="base64",t.compressAndUpload(r,n))},e});
3	\ No newline at end of file	3	\ No newline at end of file
1	-define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",c=!0,s=!0,a=null;return e.run=function(){var e=this;return e.setPageTitle("登录"),e.codeDuration=60,isGuest?void e.render():(window.location.href=t.to("order/#index"),"")},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==c)return!1;clearInterval(a),c=!1;var s=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),s,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),c=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,a=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(a),e.codeDuration=o,c=!0):r("#login .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var c=n.trim(r("#login .mobile").val()),a=n.trim(r("#login .code").val());if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(0==s)return!1;s=!1;var l=e.csrf({mobile:c,code:a});n.httpPost(t.to(i),l,function(e){return s=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,c="/user/login/register",s="/user/default/upload-file",a="/user/login/get-code",l=!0,u=!0,d=null;return e.run=function(){var e=this;return e.setPageTitle("注册"),e.codeDuration=60,isGuest?void e.render():(window.location.href=t.to("order/#index"),"")},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(){if(""!=o(this).val()&&null!=o(this).val()){var e=o(this).attr("id"),i=o(this).parent();r.uploadFile({selector:"#"+e,url:t.to(s),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;i.css("background-image","url("+e.tmpMinUrl+")"),i.attr("data",e.tmpFile),i.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(a),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),s=n.trim(o("#register .mobile").val()),a=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==s)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(s))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==s)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;var g=o("#register .licensePic").attr("data");if(void 0===g\|\|null==g)return n.toast({content:"请上传营业执照"}),!1;var v=o("#register .headPic").attr("data");if(void 0===v\|\|null==v)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f\|\|null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var m=o("#register .QAChargePic").attr("data");if(void 0===m\|\|null==m)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var h=e.csrf({name:i,mobile:s,code:a,emergencyContact:l,emergencyPerson:d,licensePic:g,headPic:v,techChargePic:f,QAChargePic:m});n.httpPost(t.to(c),h,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){o("#register .check-agreement").click(function(e){o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active")}),o("#register .agreement-cls").click(function(e){o("#agreement-wrapper").remove();var t=o("#register"),n=o("script#agreement-template"),r=i.compile(n.html()),c=r({});t.append(c)}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove();var t=o("#register .check-agreement");t.hasClass("checked-active")\|\|t.addClass("checked-active")})},e});
2	\ No newline at end of file	1	\ No newline at end of file
		2	+define("user-app",["mk7/app"],function(e){var t=Dom7,n=function(){var e=t(".ui-loading-block");0==e.length&&(t(".view-main").html('<div class="ui-loading-block" id="ui-loading"><div class="ui-loading-cnt"><div class="spinner"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div><div id="loader-inner"><p></p></div> </div> </div>'),window.waitingTime=1e4,window.loaderTimer&&clearTimeout(window.loaderTimer),window.loaderTimer=setTimeout(function(){var e=document.getElementById("loader-inner"),t=document.createElement("p");t.className="notice",e&&(t.innerHTML='加载速度太慢？试试<a class="link" href="#" onclick="javascript:location.reload();return false;">重新加载</a>',e.appendChild(t))},window.waitingTime))},r=!0;return e.name="user",e.routes={index:function(){return r=!1,n(),e.runController("index")},register:function(){return r=!1,n(),e.runController("register")},login:function(){return r=!1,n(),e.runController("login")},"*":function(){return e.runController("index")}},e}),define("user/index-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var e=(Dom7,Template7,new e);return e.run=function(){var e=this;e.setPageTitle("首页"),e.hideAllNonBaseMenuItem(window.$site),e.render()},e.bindEvents=function(){console.log("bindEvents")},e}),define("user/login-controller",["mk7/controller","mk7/url","mk7/utils"],function(e,t,n){var r=Dom7,e=(Template7,new e),o="/user/login/get-code",i="/user/login/login",c=!0,s=!0,a=null;return e.run=function(){var e=this;e.setPageTitle("登录"),e.codeDuration=60,!isGuest,e.render();const t=new Promise(function(e,t){setTimeout(function(){e("foo")},300)});t.then(function(e){console.log(e)}),console.log(t)},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.getCodeEvent(),e.gotoRegisterEvent(),e.loginEvent()},e.getCodeEvent=function(){var e=this;r("#login .get-code-cls").click(function(){var i=n.trim(r("#login .mobile").val());if(""==i)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(i))return n.toast({content:"手机号码不合格"}),!1;if(0==c)return!1;clearInterval(a),c=!1;var s=e.csrf({action:"login",mobile:i});n.httpGet(t.to(o),s,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),c=!0,!1;n.toast({content:t.message}),t.testCode&&r("#login .code").val(t.testCode);var o=t.codeDuration;e.codeDuration=o,a=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(r("#login .get-code-cls").html("获取验证码"),clearInterval(a),e.codeDuration=o,c=!0):r("#login .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.loginEvent=function(){var e=this;r("#login .login-btn").click(function(o){var c=n.trim(r("#login .mobile").val()),a=n.trim(r("#login .code").val());if(""==c)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(c))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(0==s)return!1;s=!1;var l=e.csrf({mobile:c,code:a});n.httpPost(t.to(i),l,function(e){return s=!0,e.success?void(window.location.href=t.to("order/#index")):(n.toast({content:e.message,closeDelay:3e3}),!1)})})},e.gotoRegisterEvent=function(){r("#login .register-btn").click(function(e){window.location.href=t.to("user/#register")})},e}),define("user/register-controller",["mk7/controller","mk7/url","mk7/utils","mk7/uploadjs"],function(e,t,n,r){var o=Dom7,i=Template7,e=new e,c="/user/login/register",s="/user/default/upload-file",a="/user/login/get-code",l=!0,u=!0,d=null,g=!1;return e.run=function(){var e=this;e.setPageTitle("注册"),e.codeDuration=60,!isGuest,e.render()},e.bindEvents=function(){var e=this;console.log("bindEvents"),e.uploadEvent(),e.getCodeEvent(),e.registerEvent(),e.gotoLoginEvent(),e.checkAgreement()},e.uploadEvent=function(){o("#register .upload-input-cls").change(function(e){if(""!=o(this).val()&&null!=o(this).val()){var i=e.target,c=(i.files[0],o(this).attr("id")),a=o(this).parent();r.uploadFile({selector:"#"+c,url:t.to(s),processAppendTo:"#register",success:function(e,t){try{if(e.success){var r=e.tmpUrl;a.css("background-image","url("+e.tmpMinUrl+")"),a.attr("data",e.tmpFile),a.attr("data-url",r)}else n.toast({content:e.message,closeDelay:5e3})}catch(o){n.toast({content:"出错",closeDelay:5e3})}}})}})},e.getCodeEvent=function(){var e=this;o("#register .get-code-cls").click(function(){var r=n.trim(o("#register .mobile").val());if(""==r)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(r))return n.toast({content:"手机号码不合格"}),!1;if(0==l)return!1;clearInterval(d),l=!1;var i=e.csrf({action:"register",mobile:r});n.httpGet(t.to(a),i,function(t){if(!t.success)return n.toast({content:t.message,closeDelay:3e3}),l=!0,!1;n.toast({content:t.message}),t.testCode&&o("#register .code").val(t.testCode);var r=t.codeDuration;e.codeDuration=r,d=setInterval(function(t){e.codeDuration--,0==e.codeDuration?(o("#register .get-code-cls").html("获取验证码"),clearInterval(d),e.codeDuration=r,l=!0):o("#register .get-code-cls").html('<span class="count-down-cls">'+e.codeDuration+"s后重新获取</span>")},1e3)})})},e.registerEvent=function(){var e=this;o("#register .register-btn").click(function(r){var i=n.trim(o("#register .name").val()),s=n.trim(o("#register .mobile").val()),a=n.trim(o("#register .code").val()),l=n.trim(o("#register .emergency_contact").val()),d=n.trim(o("#register .emergency_person").val()),g=n.trim(o("#register .address").val());if(""==i)return n.toast({content:"车厂名称必填"}),!1;if(""==s)return n.toast({content:"手机号码必填"}),!1;if(!n.isMobile(s))return n.toast({content:"手机号码不合格"}),!1;if(""==a)return n.toast({content:"验证码必填"}),!1;if(""==d)return n.toast({content:"紧急联系人必填"}),!1;if(""==l)return n.toast({content:"紧急联系电话必填"}),!1;if(!n.isMobile(l)&&!n.isTelephone(l))return n.toast({content:"紧急联系电话不合格"}),!1;if(l==s)return n.toast({content:"紧急联系电话不能和注册手机一样"}),!1;if(""==g)return n.toast({content:"维修厂地址必填"}),!1;var v=o("#register .licensePic").attr("data");if(void 0===v\|\|null==v)return n.toast({content:"请上传营业执照"}),!1;var m=o("#register .headPic").attr("data");if(void 0===m\|\|null==m)return n.toast({content:"请上传维修厂门头照"}),!1;var f=o("#register .techChargePic").attr("data");if(void 0===f\|\|null==f)return n.toast({content:"请上传维修技术负责人证书"}),!1;var h=o("#register .QAChargePic").attr("data");if(void 0===h\|\|null==h)return n.toast({content:"请上传质检负责人证书"}),!1;if(!o("#register .check-agreement").hasClass("checked-active"))return n.toast({content:"请阅读同意《平台车管家服务条款》"}),!1;if(0==u)return!1;u=!1;var p=e.csrf({name:i,mobile:s,code:a,emergencyContact:l,emergencyPerson:d,address:g,licensePic:v,headPic:m,techChargePic:f,QAChargePic:h});n.httpPost(t.to(c),p,function(e){if(!e.success)return n.toast({content:e.message,closeDelay:3e3}),u=!0,!1;var r=3e3;n.toast({content:e.message,closeDelay:r}),setTimeout(function(){window.location.href=t.to("order/#index")},r)})})},e.gotoLoginEvent=function(){o("#register .login-btn").click(function(e){window.location.href=t.to("user/#login")})},e.checkAgreement=function(){var e=this;o("#register .check-agreement").click(function(t){return 0==g?(e.showAgreement(),!1):void(o(this).hasClass("checked-active")?o(this).removeClass("checked-active"):o(this).addClass("checked-active"))}),o("#register .agreement-cls").click(function(t){e.showAgreement()}),o("#register").on("click",".agree-btn",function(e){o("#agreement-wrapper").remove(),g=!0;var t=o("#register .check-agreement");t.hasClass("checked-active")\|\|t.addClass("checked-active")})},e.showAgreement=function(){o("#agreement-wrapper").remove();var e=o("#register"),t=o("script#agreement-template"),n=i.compile(t.html()),r=n({});e.append(r)},e});
3	\ No newline at end of file	3	\ No newline at end of file
	@@ -7,9 +7,10 @@ define(		@@ -7,9 +7,10 @@ define(
7	'mk7/controller',	7	'mk7/controller',
8	'mk7/url',	8	'mk7/url',
9	'mk7/utils',	9	'mk7/utils',
		10	+ 'mk7/photo-browser'
10	],	11	],
11		12
12	- function(ctrl, url, utils) {	13	+ function(ctrl, url, utils, photoBrowser) {
13		14
14	var $$ = Dom7;	15	var $$ = Dom7;
15	var t7 = Template7;	16	var t7 = Template7;
	@@ -73,31 +74,21 @@ define(		@@ -73,31 +74,21 @@ define(
73	})	74	})
74	}	75	}
75	ctrl.popupImageLayer = function() {	76	ctrl.popupImageLayer = function() {
		77	+ var me = this;
76	$$('#customer-order').on('click', '.view-img-cls', function(e) {	78	$$('#customer-order').on('click', '.view-img-cls', function(e) {
77	- var url = $$(this).attr('data-url');
78	- $$('#img-mask').remove();
79	- var imgContent = '<div id="img-mask" style="z-index:2;background:#000;justify-content:center;position: absolute;bottom:0;top:0;width:100%;display:flex;flex-direction: column;align-items: center"><div style="width:100%;"> <img width="100%" src="'+url+'" /></div></div>';
80	- $$('#customer-order').append(imgContent);
81	- })
82	-
83	- $$('#customer-order').on('click', '#img-mask, #img-mask img', function(e) {
84	- e.preventDefault();
85	- e.stopPropagation()
86	-
87	- var bh = document.body.clientHeight;
88	- var ih = $$('#img-mask img').height();
89	- console.log(bh+'dddd'+ih)
90	- var interval = Math.abs(ih-bh);
91	- if (interval >=0 && interval <= 20) {
92	- $$('#img-mask').remove();
93	- } else {
94	- var id = $$(e.target).attr('id');
95	- if('img-mask' == id) {
96	- $$('#img-mask').remove();
97	- }
98	- }	79	+ var parent = $$(this).parents('ul');
		80	+ var imagesT = parent.find('.view-img-cls');
		81	+ var photoBrowserPhotos = [];
		82	+ var initialSlide = $$(this).attr('data-index');
		83	+ $$.each(imagesT, function(i, n) {
		84	+ var nURL = $$(n).attr('data-url');
		85	+ photoBrowserPhotos.push(nURL)
		86	+ })
99		87
		88	+ var pBrowser = me.app.photoBrowser({photos:photoBrowserPhotos,initialSlide:initialSlide});
		89	+ pBrowser.open();
100	})	90	})
		91	+
101	}	92	}
102	return ctrl;	93	return ctrl;
103	}	94	}
	@@ -15,23 +15,27 @@ define(		@@ -15,23 +15,27 @@ define(
15	ontimeout:function(e){},	15	ontimeout:function(e){},
16	error:function(res, e){if(options.error){options.error(res, e)}}	16	error:function(res, e){if(options.error){options.error(res, e)}}
17	}	17	}
		18	+ function appendProcess() {
		19	+ var preUpload = '<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';
		20	+ if ('' != setting.processAppendTo) {
		21	+ var appendObj = document.querySelector(setting.processAppendTo);
		22	+ if (!appendObj) {
		23	+ return '';
		24	+ }
		25	+ var processBar = appendObj.querySelector('#process-bar');
		26	+ if (appendObj && processBar) {
		27	+ appendObj.removeChild(processBar);
		28	+ }
		29	+
		30	+ appendObj.insertAdjacentHTML("beforeend", preUpload)
		31	+ }
		32	+ }
		33	+
18	setting.beforeSend = function(res, e) {	34	setting.beforeSend = function(res, e) {
19	if(options.beforeSend) {	35	if(options.beforeSend) {
20	options.beforeSend(res, e)	36	options.beforeSend(res, e)
21	} else {	37	} else {
22	- var preUpload = '<div id="process-bar" style="width:100%;position: absolute;top:0;bottom: 0;z-index: 222;display: flex;justify-content: center;flex-direction: column;"><div style="width: 70%;margin: 0 auto;height:1.5rem;background: #dcdcdc;"><div style="height:1.5rem;width:0%;line-height: 1.5rem;background:#4ae637;text-align:center" id="pro-bar">0%</div></div></div>';
23	- if ('' != setting.processAppendTo) {
24	- var appendObj = document.querySelector(setting.processAppendTo);
25	- if (!appendObj) {
26	- return '';
27	- }
28	- var processBar = appendObj.querySelector('#process-bar');
29	- if (appendObj && processBar) {
30	- appendObj.removeChild(processBar);
31	- }
32	-
33	- appendObj.insertAdjacentHTML("beforeend", preUpload)
34	- }	38	+ appendProcess();
35		39
36	}	40	}
37	}	41	}
	@@ -64,65 +68,136 @@ define(		@@ -64,65 +68,136 @@ define(
64	}	68	}
65		69
66	var fileObject = document.querySelector(setting.selector).files[0];	70	var fileObject = document.querySelector(setting.selector).files[0];
67	- var formData = new FormData();
68	- var xhr = new XMLHttpRequest();
69	- xhr.timeout = setting.timeout;
70	- xhr.onload = function(e) {
71	- //console.log(this.response);
72	-
73	- var response = JSON.parse(this.response);
74	- setting.success(response, e);
75	- };
76	- xhr.onloadend = function(e) {
77	- //console.log('request loadend');
78	- if ('' != setting.processAppendTo) {
79	- var appendObj = document.querySelector(setting.processAppendTo);
80	- if (appendObj) {
81	- var processBar = appendObj.querySelector('#process-bar');	71	+ var uploadType = '';
		72	+ var fileSize = fileObject.size/1024;
		73	+
		74	+ setting.uploadPost = function (fileObject, uploadType) {
		75	+ var formData = new FormData();
		76	+ var xhr = new XMLHttpRequest();
		77	+ xhr.timeout = setting.timeout;
		78	+ xhr.onload = function(e) {
		79	+ //console.log(this.response);
		80	+
		81	+ var response = JSON.parse(('' == this.response \|\| null == this.response)?"[]":this.response)
		82	+ setting.success(response, e);
		83	+ };
		84	+ xhr.onloadend = function(e) {
		85	+ //console.log('request loadend');
		86	+ if ('' != setting.processAppendTo) {
		87	+ var appendObj = document.querySelector(setting.processAppendTo);
82	if (appendObj) {	88	if (appendObj) {
83	- appendObj.removeChild(processBar);	89	+ var processBar = appendObj.querySelector('#process-bar');
		90	+ if (appendObj) {
		91	+ appendObj.removeChild(processBar);
		92	+ }
84	}	93	}
85	}	94	}
		95	+
		96	+ var response = JSON.parse(('' == this.response \|\| null == this.response)?"[]":this.response)
		97	+ setting.complete(response, e);
		98	+ };
		99	+ xhr.onerror = function(e) {
		100	+ //console.log('request error');
		101	+ var response = JSON.parse(('' == this.response \|\| null == this.response)?"[]":this.response)
		102	+ setting.error(response, e);
		103	+ };
		104	+ xhr.ontimeout = function(e) {
		105	+ console.log('request timeout');
		106	+ setting.ontimeout(e);
		107	+ };
		108	+ xhr.addEventListener('loadstart', function(e) {
		109	+ setting.beforeSend(e);
		110	+ });
		111	+
		112	+ xhr.open('post', setting.url, true)
		113	+
		114	+ xhr.upload.onprogress = function (ex) {
		115	+ if (ex.lengthComputable) {
		116	+ setting.process(ex);
		117	+ }
86	}	118	}
		119	+ //console.log(uploadType)
		120	+ formData.append('uploadType', uploadType)
		121	+ formData.append('file', fileObject);
		122	+ xhr.send(formData);
		123	+ }
87		124
88	- var response = JSON.parse(this.response);
89	- setting.complete(response, e);
90	- };
91	- xhr.onerror = function(e) {
92	- //console.log('request error');
93	- var response = JSON.parse(this.response);
94	- setting.error(response, e);
95	- };
96	- xhr.ontimeout = function(e) {
97	- console.log('request timeout');
98	- setting.ontimeout(e);
99	- };
100	- xhr.addEventListener('loadstart', function(e) {
101	- setting.beforeSend(e);
102	- });
103	-
104	- xhr.open('post', setting.url, true)
105	- /*
106	- xhr.onreadystatechange = function () {
107	- if(this.readyState == 4) {
108	- stateChange(this.response);
109	- } else {
110	- var completeFun = arguments[3];
111	- if (completeFun) {
112	- completeFun(this);
113	- }
114	-
115	- }
116	- }
117	- */
118	-
119	- xhr.upload.onprogress = function (ex) {
120	- if (ex.lengthComputable) {
121	- setting.process(ex);	125	+ setting.compressAndUpload = function(fileObject, uploadType) {
		126	+
		127	+ // 压缩图片需要的一些元素和对象
		128	+ var reader = new FileReader(),
		129	+ //创建一个img对象
		130	+ img = new Image();
		131	+
		132	+ // 选择的文件对象
		133	+ var file = fileObject;
		134	+ var newObj = null;
		135	+
		136	+ // 缩放图片需要的canvas
		137	+ var canvas = document.createElement('canvas');
		138	+ var context = canvas.getContext('2d');
		139	+
		140	+ if(file == undefined \|\| file == '') {
		141	+ return ;
122	}	142	}
		143	+ // 选择的文件是图片
		144	+ if(file.type.indexOf("image") == 0) {
		145	+ reader.readAsDataURL(file);
		146	+ } else {
		147	+ return false;
		148	+ }
		149	+
		150	+ // 文件base64化，以便获知图片原始尺寸
		151	+ reader.onload = function(onloadEvent) {
		152	+ img.src = onloadEvent.target.result;
		153	+ };
		154	+ appendProcess();
		155	+ // base64地址图片加载完毕后
		156	+ img.onload = function() {
		157	+
		158	+ var img = this;
		159	+ var time = new Date().getTime();
		160	+ // 图片原始尺寸
		161	+ var originWidth = img.width;
		162	+ var originHeight = img.height;
		163	+ // 最大尺寸限制，可通过设置宽高来实现图片压缩程度
		164	+ var maxWidth = 1024,
		165	+ maxHeight = 1024;
		166	+ // 目标尺寸
		167	+ var targetWidth = originWidth,
		168	+ targetHeight = originHeight;
		169	+ // 图片尺寸超过限制
		170	+ if (originWidth > maxWidth \|\| originHeight > maxHeight) {
		171	+ if (originWidth / originHeight > maxWidth / maxHeight) {
		172	+ // 更宽，按照宽度限定尺寸
		173	+ targetWidth = maxWidth;
		174	+ targetHeight = Math.round(maxWidth * (originHeight / originWidth));
		175	+ } else {
		176	+ targetHeight = maxHeight;
		177	+ targetWidth = Math.round(maxHeight * (originWidth / originHeight));
		178	+ }
		179	+ }
		180	+ // canvas对图片进行缩放
		181	+ canvas.width = targetWidth;
		182	+ canvas.height = targetHeight;
		183	+ // 清除画布
		184	+ context.clearRect(0, 0, targetWidth, targetHeight);
		185	+ // 图片压缩
		186	+ context.drawImage(img, 0, 0, targetWidth, targetHeight);
		187	+ var newImage = canvas.toDataURL('image/jpeg', 0.7); //base64 格式
		188	+
		189	+ setting.uploadPost(newImage, uploadType);
		190	+ }
		191	+
		192	+ }
		193	+
		194	+ if (fileSize <= 1024) {
		195	+ uploadType = 'file'
		196	+ setting.uploadPost(fileObject, uploadType);
		197	+ } else {
		198	+ uploadType = 'base64';
		199	+ setting.compressAndUpload(fileObject, uploadType)
123	}	200	}
124	- formData.append('file', fileObject);
125	- xhr.send(formData);
126		201
127	}	202	}
128	return object;	203	return object;