|
|
@@ -251,15 +251,15 @@ class Api extends Core
|
|
|
$this->data['card'][$k]['minfo'][] = $config_type[$tv];
|
|
|
}
|
|
|
}
|
|
|
- $this->data['card'][$k]['minfo'] = implode(',', $this->data['card'][$k]['minfo']) . '可用';
|
|
|
+ //$this->data['card'][$k]['minfo'] = implode('、', $this->data['card'][$k]['minfo']) . '可用';
|
|
|
|
|
|
- /*
|
|
|
+
|
|
|
if ($info['shop_type'] && strstr($info['shop_type'], ',')) {
|
|
|
$this->data['card'][$k]['minfo'] = '全部店铺可用';
|
|
|
} elseif ($info['shop_type'] && isset($config_type[$info['shop_type']])) {
|
|
|
$this->data['card'][$k]['minfo'] = $config_type[$info['shop_type']] . '可用';
|
|
|
}
|
|
|
- */
|
|
|
+
|
|
|
} elseif ($info['type'] == 2 && $v['shop_id']) {
|
|
|
$shop = Dever::db('shop/info')->find($v['shop_id']);
|
|
|
if ($shop) {
|
|
|
@@ -384,7 +384,13 @@ class Api extends Core
|
|
|
$v['minfo'][] = $config_type[$tv];
|
|
|
}
|
|
|
}
|
|
|
- $v['minfo'] = implode(',', $v['minfo']) . '可用';
|
|
|
+ //$v['minfo'] = implode('、', $v['minfo']) . '可用';
|
|
|
+
|
|
|
+ if ($type['shop_type'] && strstr($type['shop_type'], ',')) {
|
|
|
+ $v['minfo'] = '全部店铺可用';
|
|
|
+ } elseif ($type['shop_type'] && isset($config_type[$type['shop_type']])) {
|
|
|
+ $v['minfo'] = $config_type[$type['shop_type']] . '可用';
|
|
|
+ }
|
|
|
|
|
|
if (in_array($shop_type, $type['shop_type'])) {
|
|
|
|
rabin