dxtc
/
coupon-admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新：百度地图参数bug修复，商家优惠卷状态判断

master
zwesy 2021-12-21 18:26:37 +08:00
parent 10773a71d7
commit 6b3a35d2c1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/Coupon.php
View File

@ -570,7 +570,7 @@ class Coupon extends Base
"intro" => $data['intro'] ?? '', "intro" => $data['intro'] ?? '',
"white_list" => $data['white_list'] ?? '', "white_list" => $data['white_list'] ?? '',
"status" => CouponMain::status_on, "status" => CouponMain::status_on,
"on_shelf" => CouponMain::on_shelf_off,//默认下架 后天审核上架 "on_shelf" => CouponMain::on_shelf_off,//默认下架 后台审核上架
"commission_agency" => $distributionProportion['agency'], "commission_agency" => $distributionProportion['agency'],
"commission_admin" => $distributionProportion['admin'], "commission_admin" => $distributionProportion['admin'],
"commission_consumer" => $distributionProportion['consumer'], "commission_consumer" => $distributionProportion['consumer'],
@ -741,7 +741,7 @@ class Coupon extends Base
$res['list'] ->each(function ($item) use($time){ $res['list'] ->each(function ($item) use($time){
//已使用张数 //已使用张数
$item->usingCount = CouponRepository::getInstance()->getCouponMainUsingCount($item->id); $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; $item->conduct = true;
}else{ }else{
$item->conduct = false; $item->conduct = false;

4
public/static/layuimini/js/lay-module/location/location.js
View File

@ -250,7 +250,7 @@ layui.define(['layer', 'locationX'], function (exports) {
return ; return ;
} }
var htmlList = ''; 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 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-icon-search"><i class="layui-icon layui-icon-search"></i></div>';
htmlList += ' <div class="ew-map-select-search-list-item-title">' + ad.title + '</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>'; htmlList += '</div>';
}); });
$selectTips.html(htmlList); $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'); else $('#ew-map-select-tips').removeClass('layui-hide');
} }
}); });