dever 3 年之前
父节点
当前提交
0793f2a921
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 4 2
      app/shop/lib/Manage.php
  2. 6 1
      app/shop/src/Excel.php

+ 4 - 2
app/shop/lib/Manage.php

@@ -463,12 +463,14 @@ class Manage
             $type_info = Dever::db('store/info')->one($type_id);
             $sign = Dever::login($type_id);
             $link = Dever::url('home?sign=' . $sign, 'store');
-            return $type_info['name'] . '('.$type_info['mobile'].')<br /><a href="'.$link.'" target="_blank">进入仓库管理</a>';
+            //return $type_info['name'] . '('.$type_info['mobile'].')<br /><a href="'.$link.'" target="_blank">进入仓库管理</a>';
+            return $type_info['name'] . '('.$type_info['mobile'].')';
         } elseif ($type == 3) {
             $sign = Dever::login($type_id);
             $link = Dever::url('home?sign=' . $sign, 'factory');
             $type_info = Dever::db('factory/info')->one($type_id);
-            return $type_info['name'] . '('.$type_info['mobile'].')<br /><a href="'.$link.'" target="_blank">进入工厂管理</a>';
+            //return $type_info['name'] . '('.$type_info['mobile'].')<br /><a href="'.$link.'" target="_blank">进入工厂管理</a>';
+            return $type_info['name'] . '('.$type_info['mobile'].')';
         } else {
             return '无';
         }

+ 6 - 1
app/shop/src/Excel.php

@@ -397,7 +397,12 @@ class Excel
             if (!is_array($v)) {
                 continue;
             }
-            $info = Dever::db($table)->find($v['type_id']);
+            if ($v['type'] == 1) {
+                $info = Dever::db('shop/info')->find($v['type_id']);
+            } elseif ($v['type'] == 2) {
+                $info = Dever::db('store/info')->find($v['type_id']);
+            }
+            
             $goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $v['id']));
             $ps = Dever::db('shop/buy_order_ps')->find(array('order_id' => $v['id']));
             $cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);