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 += '