333
This commit is contained in:
parent
34ac9dd399
commit
98c111816d
|
|
@ -22,11 +22,24 @@ class Config extends Base
|
|||
->select()
|
||||
->toArray();
|
||||
$app_setting = getConfig('app_setting');
|
||||
#客服
|
||||
$base_rule = getConfig('base');
|
||||
// 'is_shou_tan' => $rule['is_shou_tan'],
|
||||
// 'jump_appid' => $rule['jump_appid'],
|
||||
// 'corpid' => $rule['corpid'],
|
||||
// 'wx_link' => $rule['wx_link'],
|
||||
$base_config = [
|
||||
'is_shou_tan' => $base_rule['is_shou_tan'],
|
||||
'jump_appid' => $base_rule['jump_appid'],
|
||||
'corpid' => $base_rule['corpid'],
|
||||
'wx_link' => $base_rule['wx_link']
|
||||
];
|
||||
// 返回数据
|
||||
return $this->renderSuccess('获取成功', [
|
||||
'good_type' => $goodsTypeList,
|
||||
'app_setting' => $app_setting,
|
||||
'version' => '115'
|
||||
'base_config' => $base_config,
|
||||
'version' => '116'
|
||||
]);
|
||||
}
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ class Index extends Base
|
|||
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'];
|
||||
// $goods = Goods::where('id', '=', $advert_value['goods_id'])->find();
|
||||
// $status = $goods['status'];
|
||||
// if (!$goods || $status == 2) {
|
||||
// // 商品不存在或已下架或卖完,不显示此推荐位
|
||||
// // unset($tuijian[$key]);
|
||||
|
|
@ -113,11 +113,11 @@ class Index extends Base
|
|||
$content = '';
|
||||
}
|
||||
|
||||
// 存入Redis缓存,设置过期时间为60秒(10分钟)
|
||||
$cacheData = [
|
||||
'content' => $content,
|
||||
'is_image_optimizer' => $is_image_optimizer
|
||||
];
|
||||
// // 存入Redis缓存,设置过期时间为60秒(10分钟)
|
||||
// $cacheData = [
|
||||
// 'content' => $content,
|
||||
// 'is_image_optimizer' => $is_image_optimizer
|
||||
// ];
|
||||
// $redis->setex($cacheKey, 600, json_encode($cacheData));
|
||||
|
||||
// return $this->renderSuccess("请求成功", $content);
|
||||
|
|
@ -139,7 +139,8 @@ class Index extends Base
|
|||
}
|
||||
return $this->renderSuccess("请求成功", [
|
||||
'content' => $content,
|
||||
'title' => $info['title']
|
||||
'title' => $info['title'],
|
||||
'is_image_optimizer'=>$info['is_image_optimizer']
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class AppPlatform extends BasePlatform
|
|||
];
|
||||
$configVersion = (int) preg_replace('/[^0-9]/', '', $config['version']);
|
||||
if ($versionNumber >= $configVersion) {
|
||||
$config['isCheck'] = true;
|
||||
$config['isCheck'] = false;
|
||||
}
|
||||
return $config;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user