From 6b3a35d2c17a69d666c70e9f9c934b3db29bf1d1 Mon Sep 17 00:00:00 2001
From: zwesy <zwesy@qq.com>
Date: Tue, 21 Dec 2021 18:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8F=82=E6=95=B0bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=AE=B6=E4=BC=98=E6=83=A0=E5=8D=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Coupon.php                              | 4 ++--
 public/static/layuimini/js/lay-module/location/location.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php
index f54c5c8..85dc9a0 100644
--- a/app/controller/api/Coupon.php
+++ b/app/controller/api/Coupon.php
@@ -570,7 +570,7 @@ class Coupon extends Base
             "intro"                 => $data['intro'] ?? '',
             "white_list"            => $data['white_list'] ?? '',
             "status"                => CouponMain::status_on,
-            "on_shelf"              => CouponMain::on_shelf_off,//默认下架  后天审核上架
+            "on_shelf"              => CouponMain::on_shelf_off,//默认下架  后台审核上架
             "commission_agency"     => $distributionProportion['agency'],
             "commission_admin"      => $distributionProportion['admin'],
             "commission_consumer"   => $distributionProportion['consumer'],
@@ -741,7 +741,7 @@ class Coupon extends Base
             $res['list'] ->each(function ($item) use($time){
                 //已使用张数
                 $item->usingCount = CouponRepository::getInstance()->getCouponMainUsingCount($item->id);
-                if(strtotime($item->start_time) <= $time && strtotime($item->end_time) >= $time){
+                if($item->on_shelf === 0 && strtotime($item->start_time) <= $time && strtotime($item->end_time) >= $time){
                     $item->conduct   = true;
                 }else{
                     $item->conduct   = false;
diff --git a/public/static/layuimini/js/lay-module/location/location.js b/public/static/layuimini/js/lay-module/location/location.js
index bf10cf6..7aac527 100644
--- a/public/static/layuimini/js/lay-module/location/location.js
+++ b/public/static/layuimini/js/lay-module/location/location.js
@@ -250,7 +250,7 @@ layui.define(['layer', 'locationX'], function (exports) {
                             return ;
                         }
                         var htmlList = '';
-                        $.each(result.Ir,function (i,ad){
+                        $.each(result.Kr,function (i,ad){
                             htmlList += '<div data-lng="' + ad.point.lng + '" data-lat="' + ad.point.lat + '" data-title="'+ ad.title +'"  data-address="'+ ad.address +'" class="ew-map-select-search-list-item">';
                             htmlList += '     <div class="ew-map-select-search-list-item-icon-search"><i class="layui-icon layui-icon-search"></i></div>';
                             htmlList += '     <div class="ew-map-select-search-list-item-title">' + ad.title + '</div>';
@@ -258,7 +258,7 @@ layui.define(['layer', 'locationX'], function (exports) {
                             htmlList += '</div>';
                         });
                         $selectTips.html(htmlList);
-                        if (result.Ir.length === 0) $('#ew-map-select-tips').addClass('layui-hide');
+                        if (result.Kr.length === 0) $('#ew-map-select-tips').addClass('layui-hide');
                         else $('#ew-map-select-tips').removeClass('layui-hide');
                     }
                 });