rabin 3 years ago
parent
commit
e6f365d7f0
2 changed files with 4 additions and 4 deletions
  1. 1 1
      app/cash/database/shop_sell.php
  2. 3 3
      app/cash/lib/Set.php

+ 1 - 1
app/cash/database/shop_sell.php

@@ -185,7 +185,7 @@ return array
 
 
         	'list' => array('查看详情', '"order&project=cash&id={id}&page_type=1&type=shop_sell"'),
         	'list' => array('查看详情', '"order&project=cash&id={id}&page_type=1&type=shop_sell"'),
 
 
-            'oper'  => array('确认对账金额', '"cash/lib/set.audit?id={id}&type=shop_sell"', '{status} == 1', 'Dever::load("cash/lib/set.statYes", "{id}", "shop_sell", "shop")', '请确认'),
+            'oper'  => array('确认对账金额', '"cash/lib/set.audit?id={id}&type=shop_sell"', '{status} == 1', 'Dever::load("cash/lib/set.statYes", "{id}", "shop_sell")', '请确认'),
         ),
         ),
     ),
     ),
 
 

+ 3 - 3
app/cash/lib/Set.php

@@ -37,11 +37,11 @@ class Set
     {
     {
         $table = 'cash/' . $type;
         $table = 'cash/' . $type;
 
 
-        if (!$source) {
-            $source = $type;
+        if ($type == 'shop_sell') {
+            $type = 'shop';
         }
         }
         $info = is_array($info) ? $info : Dever::db($table)->one($info);
         $info = is_array($info) ? $info : Dever::db($table)->one($info);
-        $other = Dever::db($source . '/info')->find($info[$source . '_id']);
+        $other = Dever::db($type . '/info')->find($info[$type . '_id']);
         if (!$other) {
         if (!$other) {
             return '';
             return '';
         }
         }