shish 4 лет назад
Родитель
Сommit
0364c19e1d
2 измененных файлов с 1 добавлено и 6 удалено
  1. 1 5
      app-ghs/controllers/CustomController.php
  2. 0 1
      biz-ghs/custom/classes/CustomClass.php

+ 1 - 5
app-ghs/controllers/CustomController.php

@@ -118,7 +118,6 @@ class CustomController extends BaseController
         $type = isset($get['type']) ? $get['type'] : 0;
         $type = isset($get['type']) ? $get['type'] : 0;
         $name = isset($get['name']) ? $get['name'] : '';
         $name = isset($get['name']) ? $get['name'] : '';
         $where = ['ownShopId' => $this->shopId];
         $where = ['ownShopId' => $this->shopId];
-
         if ($type == 1) {
         if ($type == 1) {
             //欠款客户
             //欠款客户
             $where['isDebt'] = 1;
             $where['isDebt'] = 1;
@@ -128,9 +127,8 @@ class CustomController extends BaseController
             $sort = 'buyAmount DESC';
             $sort = 'buyAmount DESC';
         } else {
         } else {
             //其它
             //其它
-            $sort = 'addTime DESC';
+            $sort = 'visitTime DESC';
         }
         }
-
         if (!empty($name)) {
         if (!empty($name)) {
             if (stringUtil::isLetter($name)) {
             if (stringUtil::isLetter($name)) {
                 $where['py'] = ['like', $name];
                 $where['py'] = ['like', $name];
@@ -138,9 +136,7 @@ class CustomController extends BaseController
                 $where['name'] = ['like', $name];
                 $where['name'] = ['like', $name];
             }
             }
         }
         }
-
         $list = CustomService::getCustomSortList($where, $sort);
         $list = CustomService::getCustomSortList($where, $sort);
-
         $shop = $this->shop;
         $shop = $this->shop;
         $list['totalUser'] = $shop->totalUser ?? 0;
         $list['totalUser'] = $shop->totalUser ?? 0;
         $list['mayGatheringNum'] = $shop->mayGatheringNum ?? 0;
         $list['mayGatheringNum'] = $shop->mayGatheringNum ?? 0;

+ 0 - 1
biz-ghs/custom/classes/CustomClass.php

@@ -101,7 +101,6 @@ class CustomClass extends BaseClass
             $list[$key]['shortSmallAvatar'] = $currentInfo['shortSmallLogoUrl'];
             $list[$key]['shortSmallAvatar'] = $currentInfo['shortSmallLogoUrl'];
             $list[$key]['avatar'] = $avatar;
             $list[$key]['avatar'] = $avatar;
             $list[$key]['shortAvatar'] = $currentInfo['shortLogoUrl'];
             $list[$key]['shortAvatar'] = $currentInfo['shortLogoUrl'];
-            $list[$key]['visitTime'] = date("m-d H:i", strtotime($val['visitTime']));
             $list[$key]['sn'] = $val['id'];
             $list[$key]['sn'] = $val['id'];
             $level = $val['level'] ?? 0;
             $level = $val['level'] ?? 0;
             $levelName = $levelMap[$level] ?? '';
             $levelName = $levelMap[$level] ?? '';