|
|
@@ -27,7 +27,9 @@ if (!function_exists('attr_format')) {
|
|
|
//替代变量1
|
|
|
$rep1 = [];
|
|
|
foreach ($data as $v) {
|
|
|
+ $v = trim($v);
|
|
|
foreach ($arr[$i + 1]['detail'] as $g) {
|
|
|
+ $g = trim($g);
|
|
|
//替代变量2
|
|
|
$rep2 = ($i != 0 ? '' : $arr[$i]['value'] . '_$_') . $v . '-$-' . $arr[$i + 1]['value'] . '_$_' . $g;
|
|
|
$tmp[] = $rep2;
|
|
|
@@ -49,6 +51,7 @@ if (!function_exists('attr_format')) {
|
|
|
$dataArr = [];
|
|
|
foreach ($arr as $k => $v) {
|
|
|
foreach ($v['detail'] as $kk => $vv) {
|
|
|
+ $vv = trim($vv);
|
|
|
$dataArr[$kk] = $v['value'] . '_' . $vv;
|
|
|
$res[$kk]['detail'][$v['value']] = $vv;
|
|
|
}
|