1557492053 1 gadu atpakaļ
vecāks
revīzija
14a7c0d346

+ 3 - 0
application/api/controller/AgencyAction.php

@@ -9,6 +9,9 @@ use app\api\service\WxService;
 use app\api\validate\BaseApiValidate;
 use think\Request;
 
+/**
+ * 代理商申请
+ */
 class AgencyAction extends AgencyBaseApi
 {
 

+ 3 - 0
application/api/controller/Callback.php

@@ -10,6 +10,9 @@ use WeChatPay\Crypto\AesGcm;
 use WeChatPay\Crypto\Rsa;
 use WeChatPay\Formatter;
 
+/**
+ * 支付回调
+ */
 class Callback extends Api
 {
 

+ 3 - 0
application/api/controller/Card.php

@@ -2,6 +2,9 @@
 
 namespace app\api\controller;
 
+/**
+ *
+ */
 class Card
 {
     private $type;

+ 3 - 0
application/api/controller/Index.php

@@ -7,6 +7,9 @@ use app\common\controller\Api;
 use think\Request;
 
 
+/**
+ * 系统数据
+ */
 class Index extends Api
 {
     protected $noNeedLogin = ['*'];

+ 3 - 0
application/api/controller/MassagerAction.php

@@ -9,6 +9,9 @@ use app\api\service\WxService;
 use app\api\validate\BaseApiValidate;
 use think\Request;
 
+/**
+ * 技师
+ */
 class MassagerAction extends MassagerBaseApi
 {
     private $service;

+ 4 - 0
application/api/controller/Order.php

@@ -8,6 +8,10 @@ use app\api\validate\OrderValidate;
 use app\common\controller\Api;
 use think\Request;
 
+
+/**
+ * 订单
+ */
 class Order extends Api
 {
 

+ 2 - 1
application/api/model/order/Order.php

@@ -139,7 +139,8 @@ class Order extends BaseModel
 
     public function fetchMassagerOrder($m_id, array $status, $page, $size)
     {
-        return $this->alias("o")->where(["o.massager_id" => $m_id])
+        return $this->alias("o")
+            ->where(["o.massager_id" => $m_id])
             ->where("o.status", "in", $status)
             ->with("services")
             ->order("o.updatetime", "desc")

+ 10 - 10
application/api/service/MassagerService.php

@@ -179,7 +179,7 @@ class MassagerService extends BaseService
             isset($params['free_travel']) && is_numeric($params['free_travel']) ? $params['free_travel'] : null,
             isset($params['hot']) && is_numeric($params['hot']) ? $params['hot'] : null,
             isset($params['service_id']) && is_numeric($params['service_id']) ? $params['service_id'] : null,
-            isset($params['sort']) ? $params['sort'] : null,
+            $params['sort'] ?? null,
             $params['page'] ?? 1,
             $params['size'] ?? 10,
             $user_id,
@@ -451,11 +451,11 @@ class MassagerService extends BaseService
     {
         $config = config("site.massager_review_score");
         $fmt_config = [
-            "duration" => explode("|", isset($config["时长/天"]) ? $config["时长/天"] : "6|2"),
-            "praise" => explode("|", isset($config["评论/好评"]) ? $config["评论/好评"] : "1|2"),
-            "negative" => explode("|", isset($config["评论/差评"]) ? $config["评论/差评"] : "1|-10"),
-            "performance" => explode("|", isset($config["业绩/天"]) ? $config["业绩/天"] : "500|2"),
-            "reorder" => explode("|", isset($config["项目加钟"]) ? $config["项目加钟"] : "1|2")
+            "duration" => explode("|", $config["时长/天"] ?? "6|2"),
+            "praise" => explode("|", $config["评论/好评"] ?? "1|2"),
+            "negative" => explode("|", $config["评论/差评"] ?? "1|-10"),
+            "performance" => explode("|", $config["业绩/天"] ?? "500|2"),
+            "reorder" => explode("|", $config["项目加钟"] ?? "1|2")
         ];
         $byDuration = $this->interiorScoreByDuration($m_id, $year, $month, $fmt_config["duration"]);
         $byPraise = $this->interiorScoreByPraise($m_id, $year, $month, $fmt_config["praise"]);
@@ -518,10 +518,10 @@ class MassagerService extends BaseService
             $intersection = array_intersect($now_day_times, $clocks_times);
             $meet = count($intersection) >= (fixed2Float((($config[0] ?? 6) * 60) / 10) + 1);
             if ($meet) {
-                array_push($intersections, [
+                $intersections[] = [
                     "date" => $now_day,
                     "count" => count($intersection),
-                ]);
+                ];
                 $score += $config[1] ?? 2;
             }
         }
@@ -563,10 +563,10 @@ class MassagerService extends BaseService
         $details = [];
         foreach ($fmt as $key => $value) {
             if ($value >= $config[0]) {
-                array_push($details, [
+                $details[] = [
                     "date" => $key,
                     "count" => $value,
-                ]);
+                ];
                 $score += $config[1];
             }
         }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 84
application/index/view/index/index_2.html