diff --git a/app/admin/view/Goods/goods_edit.html b/app/admin/view/Goods/goods_edit.html
index b39efcb..440ae8c 100755
--- a/app/admin/view/Goods/goods_edit.html
+++ b/app/admin/view/Goods/goods_edit.html
@@ -454,7 +454,7 @@
$(".integral_is").hide();
$(".show_is").hide();
$(".sale_time").hide();
- $("#div_daily_xiangou").hide();
+ $("#div_daily_xiangou").show();
$(".rage_is").hide();
$(".rage").hide();
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index bf4da4f..ef082b9 100755
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -169,8 +169,8 @@ 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);
}
diff --git a/app/api/controller/Index.php b/app/api/controller/Index.php
index 6b24fae..9293389 100755
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@@ -29,10 +29,22 @@ class Index extends Base
foreach ($advert as &$advert_value) {
$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();
- foreach ($tuijian as &$advert_value) {
+ $tuijian = Advert::field('id,imgurl,ttype,coupon_id,goods_id,url')->where(['type' => 5])->order('sort desc,id desc')->select();
+ $tuijian_list = [];
+ foreach ($tuijian as $key => &$advert_value) {
$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['content'] = contentUrl($notice['content']);