|
@@ -277,38 +277,26 @@ class Api
|
|
|
|
|
|
if ($info['type'] == 7) {
|
|
|
$info['value'] = Dever::load("area/api.string", $info['value']);
|
|
|
+
|
|
|
$info['value'] = explode(',', $info['value']);
|
|
|
$temp = end($info['value']);
|
|
|
$info['value'] = $temp;
|
|
|
+ */
|
|
|
} elseif ($info['type'] == 9 && $info['value']) {
|
|
|
$info['value'] = explode(',', $info['value']);
|
|
|
- $info['value'] = $info['value'][0];
|
|
|
+ $info['value'] = $info['value'][0] . $info['unit'];
|
|
|
} elseif ($info['type'] > 9 && $info['value']) {
|
|
|
- $value = Dever::db('attr/value')->getData(array('info_id' => $info['id']));
|
|
|
+ $value = Dever::db('attr/value')->getData(array('ids' => $info['value']));
|
|
|
if ($value) {
|
|
|
- if (isset($value[$info['value']])) {
|
|
|
- $info['value'] = $value[$info['value']]['name'];
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- $temp = explode("\n", $info['type_option']);
|
|
|
- if ($temp) {
|
|
|
- $info['value'] = $info['value'] - 1;
|
|
|
- if (isset($temp[$info['value']])) {
|
|
|
- $info['value'] = $temp[$info['value']];
|
|
|
- if (strstr($info['value'], ',')) {
|
|
|
- $temp = explode(',', $info['value']);
|
|
|
- $info['value'] = $temp[0];
|
|
|
- }
|
|
|
+ $name = array();
|
|
|
+ foreach ($value as $k => $v) {
|
|
|
+ $name[] = $v['name'] . $info['unit'];
|
|
|
}
|
|
|
+ $info['value'] = implode(',', $name);
|
|
|
}
|
|
|
- */
|
|
|
- }
|
|
|
-
|
|
|
- if ($info['unit']) {
|
|
|
+ } elseif ($info['unit']) {
|
|
|
$info['value'] = $info['value'] . $info['unit'];
|
|
|
}
|
|
|
-
|
|
|
return $info['value'];
|
|
|
}
|
|
|
|