dever 3 jaren geleden
bovenliggende
commit
c41e4b1372
2 gewijzigde bestanden met toevoegingen van 17 en 19 verwijderingen
  1. 14 17
      app/goods/lib/Info.php
  2. 3 2
      app/shop/database/sell_order.php

+ 14 - 17
app/goods/lib/Info.php

@@ -403,7 +403,7 @@ class Info
                         $v['value_string'] = Dever::load('attr/api')->getValue($v);
                         
                         if ($v['ename'] == 'price') {
-                            $info['price'] = $v['value_string'];
+                            $info['price_array'] = $v['value_string'];
                         } else {
                             $v['bg'] = 'background-image: url('.$v['icon'].')';
                             $v['pic'] = '<img src="'.$v['icon'].'" width="18" />';
@@ -422,22 +422,19 @@ class Info
                 }
             }
 
-            if (isset($info['price']['min']['price'])) {
-                $info['price']['value'] = $info['price']['min']['price'];
-                $info['sku_id'] = $info['price']['min']['id'];
+            if (isset($info['price_array']['min']['price'])) {
+                $info['price'] = $info['price_array']['min']['price'];
+                $info['sku_id'] = $info['price_array']['min']['id'];
             }
         } else {
-            $price = $info['price'];
-            $s_price = $info['s_price'];
-            $info['price'] = array();
-            $info['price']['list'] = array();
-            $info['price']['min'] = array
+            $info['price_array'] = array();
+            $info['price_array']['list'] = array();
+            $info['price_array']['min'] = array
             (
-                'price' => $price,
-                's_price' => $s_price
+                'price' => $info['price'],
+                's_price' => $info['s_price'],
             );
-            $info['price']['value'] = $price;
-            $info['price']['max'] = array();
+            $info['price_array']['max'] = array();
         }
        
         if (isset($info['cdate']) && $info['cdate']) {
@@ -573,10 +570,10 @@ class Info
 
             # 获取最便宜的价格
             $where['info_id'] = $info['id'];
-            $info['price'] = array();
-            $info['price']['list'] = Dever::db('goods/info_sku')->getData($where);
-            $info['price']['min'] = Dever::db('goods/info_sku')->getMinOne($where);
-            $info['price']['max'] = Dever::db('goods/info_sku')->getMaxOne($where);
+            $info['price_array'] = array();
+            $info['price_array']['list'] = Dever::db('goods/info_sku')->getData($where);
+            $info['price_array']['min'] = Dever::db('goods/info_sku')->getMinOne($where);
+            $info['price_array']['max'] = Dever::db('goods/info_sku')->getMaxOne($where);
         } elseif ($data['is_sell'] == 3) {
             $info['option_attr'][] = $data;
         }

+ 3 - 2
app/shop/database/sell_order.php

@@ -181,9 +181,9 @@ return array
         'order_num'      => array
         (
             'type'      => 'varchar-100',
-            'name'      => '订单号',
+            'name'      => '订单号',
             'default'   => '',
-            'desc'      => '订单号',
+            'desc'      => '订单号',
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
@@ -419,6 +419,7 @@ return array
             'desc'      => '状态',
             'match'     => 'is_numeric',
             'option'    => $status,
+            'search'    => 'select',
             'list'      => true,
         ),