rabin 2 years ago
parent
commit
1f0cdcf5fe
2 changed files with 8 additions and 2 deletions
  1. 1 1
      service/agent/database/member_goods.php
  2. 7 1
      service/agent/lib/Manage.php

+ 1 - 1
service/agent/database/member_goods.php

@@ -188,7 +188,7 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => '"{name}" ? "{name}({type_id})" : Dever::load("agent/lib/manage.getGoods#name", "{type}", "{type_id}", "{sku_id}")',
+            'list'      => 'Dever::load("agent/lib/manage.getGoods#name", "{type}", "{type_id}", "{sku_id}", "{name}")',
             'list_order' => 5,
         ),
 

+ 7 - 1
service/agent/lib/Manage.php

@@ -783,9 +783,12 @@ class Manage
     }
 
     # 获取权益名称
-    public function getGoods($type, $type_id, $sku_id)
+    public function getGoods($type, $type_id, $sku_id, $name = '')
     {
         if ($type == 1) {
+            if ($name) {
+                return array('name' => $name . '('.$type_id.')');
+            }
             if ($sku_id == -2) {
                 return '商品';
             }
@@ -802,6 +805,9 @@ class Manage
             $card = Dever::db('card/info')->find($code['card_id']);
             return array('name' => $card['name'] . '('.$type_id.') <br /> ' . $code['card'], 'price' => $code['total_cash']);
         } elseif ($type == 3) {
+            if ($name) {
+                return array('name' => $name . '('.$type_id.')');
+            }
             $prize = Dever::db('setting/prize')->find($type_id);
 
             return array('name' => $prize['name'] . '('.$type_id.')', 'price' => $prize['price']);