Merge remote-tracking branch 'origin/master'

app/adminapi/controller/works/ServiceWorkController.php

@@ -92,7 +92,7 @@ class ServiceWorkController extends BaseAdminController
                         'thing4' => $workDetail['title'],
                         'time5' => $workDetail['appointment_time'],
                         'time6' => $params['appointment_time'],
-                        'thing11' => $workDetail['address'],
+                        'thing11' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
                         'phone_number8' => $workDetail['mobile'],
                     ]
                 ]);
@@ -148,7 +148,7 @@ class ServiceWorkController extends BaseAdminController
                     'order_id' => $params['id'],
                     'thing9' => $workDetail['title'],
                     'time7' => $workDetail['appointment_time'],
-                    'thing8' => $workDetail['address'],
+                    'thing8' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
                     'phone_number6' => $workDetail['mobile'],
                 ]
             ]);

app/api/controller/ServiceOrderController.php

@@ -257,7 +257,7 @@ class ServiceOrderController extends BaseApiController
                 'thing4' => $workDetail['title'],
                 'time5' => $workDetail['appointment_time'],
                 'time6' => $params['appointment_time'],
-                'thing11' => $workDetail['address'],
+                'thing11' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
                 'phone_number8' => $workDetail['mobile'],
             ]
         ]);

app/workerapi/controller/WorksController.php

@@ -157,7 +157,7 @@ class WorksController extends BaseApiController
                 'user_id' => $workDetail['master_worker_id'],
                 'thing5' => $workDetail['title'],
                 'time10' => $workDetail['appointment_time'],
-                'thing3' => $workDetail['address'],
+                'thing3' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
             ]
         ]);
         return $this->success('预约成功，等待上门', [], 1, 1);