wesmiler

public/static/weixin/css/shop-map.css

@@ -9,13 +9,13 @@
 .info {
     color:#333;
 
-    width: 80px;
+    width: 60px;
 
-    height: 80px;
+    height: 60px;
 
     border:solid 2px currentColor;
 
-    border-radius: 40px  40px  40px 0;
+    border-radius: 30px  30px  30px 0;
 
     -webkit-transform:rotate(-45deg);
 
@@ -41,8 +41,8 @@
     transform: rotate(45deg);
     display: block;
     text-align: center;
-    line-height: 80px;
-    width: 56px;
+    line-height: 56px;
+    width: 40px;
     display: -moz-box;
     text-overflow: '';
     line-clamp: 2;

vendor/thinkcmf/cmf-app/src/weixin/model/Devices.php

@@ -33,7 +33,7 @@ class Devices extends Model
         $dataList = Devices::alias('d')
             ->join('user m', 'm.id=d.shop_uid', 'left')
             ->join('shop s', 's.user_id=d.shop_uid', 'left')
-            ->field("m.id,s.name as shop_name,d.name as device_name,d.device_code,s.business_project,s.intro,s.contact_name,s.mobile,s.logo as thumb,d.show_device_code,d.lng,d.color_type,d.lat,distance('{$lng}','{$lat}',d.`lng`,d.`lat`) as dists, d.address as d_address, s.address")
+            ->field("m.id,s.name as shop_name,d.name as device_name,d.device_code,s.business_project,s.intro,s.contact_name,s.mobile,s.logo as thumb,d.show_device_code,d.lng,d.color_type,d.lat,distance('{$lng}','{$lat}',d.`lng`,d.`lat`) as dists, d.address as d_address, s.address,s.service_time")
             ->where(function ($query) use ($lng, $lat, $distance, $distSql) {
                 if ($lng && $lat && $distance) {
                     return $query->where('', 'exp', $distSql);
@@ -52,6 +52,12 @@ class Devices extends Model
             ->each(function ($item, $k) {
                 $item['thumb'] = isset($item['thumb']) ? cmf_get_image_preview_url($item['thumb']) : '';
                 $item['distance'] = isset($item['dists']) ? moneyFormat($item['dists'] / 1000, 2) : 0;
+                $serviceTime = isset($item['service_time'])? trim($item['service_time']) : '';
+                $times = $serviceTime? explode('-') : [];
+                $day1 = isset($times[0])? trim($times[0]) : '';
+                $day2 = isset($times[1])? trim($times[1]) : '';
+                if($day1 && )
+
                 return $item;
             })
             ->toArray();