server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of 123.207.203.228:server/manghe into dev

Browse Source
This commit is contained in:
youda 2025-04-25 02:30:31 +08:00
commit 46c335207b
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/view/Goods/goods_edit.html
View File

@ -454,7 +454,7 @@
$(".integral_is").hide(); $(".integral_is").hide();
$(".show_is").hide(); $(".show_is").hide();
$(".sale_time").hide(); $(".sale_time").hide();
$("#div_daily_xiangou").hide(); $("#div_daily_xiangou").show();
$(".rage_is").hide(); $(".rage_is").hide();
$(".rage").hide(); $(".rage").hide();

2
app/api/controller/Goods.php
View File

@ -169,7 +169,7 @@ class Goods extends Base
]; ];
// 缓存空结果，避免重复查询 // 缓存空结果，避免重复查询
$redis->set($cache_key, json_encode($new_data), 300); $redis->set($cache_key, json_encode($new_data), 10);
return $this->renderSuccess('请求成功', $new_data); return $this->renderSuccess('请求成功', $new_data);
} }

16
app/api/controller/Index.php
View File

@ -29,10 +29,22 @@ class Index extends Base
foreach ($advert as &$advert_value) { foreach ($advert as &$advert_value) {
$advert_value['imgurl'] = imageUrl($advert_value['imgurl']); $advert_value['imgurl'] = imageUrl($advert_value['imgurl']);
} }
$tuijian = Advert::field('imgurl,ttype,coupon_id,goods_id,url')->where(['type' => 5])->order('sort desc,id desc')->select(); $tuijian = Advert::field('id,imgurl,ttype,coupon_id,goods_id,url')->where(['type' => 5])->order('sort desc,id desc')->select();
foreach ($tuijian as &$advert_value) { $tuijian_list = [];
foreach ($tuijian as $key => &$advert_value) {
$advert_value['imgurl'] = imageUrl($advert_value['imgurl']); $advert_value['imgurl'] = imageUrl($advert_value['imgurl']);
if ($advert_value['goods_id']) {
$goods = Goods::where('id', '=', $advert_value['goods_id'])->find();
$status = $goods['status'];
// if (!$goods || $status == 2) {
// // 商品不存在或已下架或卖完，不显示此推荐位
// // unset($tuijian[$key]);
// continue;
// }
$tuijian_list[] = $advert_value;
} }
}
$tuijian = $tuijian_list;
#公告 #公告
$notice = Danye::field('title,content')->where(['id' => 3])->find(); $notice = Danye::field('title,content')->where(['id' => 3])->find();
$notice['content'] = contentUrl($notice['content']); $notice['content'] = contentUrl($notice['content']);