Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Purchin.php

@@ -55,7 +55,7 @@ class Purchin extends BaseController
         }
         $good_type_code=isset($this->post['good_type_code']) && $this->post['good_type_code']!==""? trim($this->post['good_type_code']):"";
         if($good_type_code !=""){
-            $where[]= ["b.good_type_code",'like',"%$good_type_code%"];
+            $where[]= ["b.spuCode",'like',"%$good_type_code%"];
         }
         $good_name=isset($this->post['good_name']) && $this->post['good_name']!==""? trim($this->post['good_name']):"";
         if($good_name !=""){

app/admin/controller/Reorder.php

@@ -180,11 +180,11 @@ class Reorder extends \app\BaseController
             return error_show(1003, "未找到商品数据");
         }
         $int = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
-        $info['good_code'] = isset($orderinfo['good_code'])?$orderinfo['good_code']:'';
+       $info['good_code'] = isset($orderinfo['good_code'])?$orderinfo['good_code']:'';
        $info['good_name'] = isset($orderinfo['good_name'])?$orderinfo['good_name']:'';
        $info['good_num'] = isset($orderinfo['good_num'])?$orderinfo['good_num']:'';
        $info['sale_price'] = isset($orderinfo['sale_price'])?$orderinfo['sale_price']:'0';
-        $info['origin_price'] = isset($orderinfo['origin_price'])?$orderinfo['origin_price']:'0';
+       $info['origin_price'] = isset($orderinfo['origin_price'])?$orderinfo['origin_price']:'0';
        $info['return_total'] = $info['sale_price']*$info['num'] ;
        $info['send_num'] = isset($orderinfo['send_num'])?$orderinfo['send_num']:'0';
        $info['wsend_num'] = isset($orderinfo['wsend_num'])?$orderinfo['wsend_num']:'0';

app/admin/route/app.php

@@ -11,14 +11,10 @@
 use think\facade\Route;
 
 Route::rule('menu', 'admin/Menu/list');
-
-//Route::rule('menuadd', 'admin/Menu/MenuAdd');
 Route::rule('menusave', 'admin/Menu/MenuEdit');
 Route::rule('menudel', 'admin/Menu/MenuDel');
 Route::rule('menustatus', 'admin/Menu/MenuStatus');
 Route::rule("menulist","admin/Menu/MenuAllList");
-
-
 Route::rule('menuaction', 'admin/Action/ActionList');
 Route::rule('menuactionsave', 'admin/Action/ActionSave');
 Route::rule('menuactionstatus', 'admin/Action/ActionStatus');
@@ -32,7 +28,6 @@ Route::rule("actionstatus","admin/Action/ActionStatus");
 Route::rule("actioninfo","admin/Action/ActionInfo");
 Route::rule("actionlist","admin/Action/ActionList");
 
-
 Route::rule('grouplist', 'admin/Group/GroupList');
 Route::rule('groupall', 'admin/Group/GroupAll');
 Route::rule('groupinfo', 'admin/Group/GroupInfo');
@@ -47,7 +42,6 @@ Route::rule('roleadd', 'admin/Role/RoleAdd');
 Route::rule('rolesave', 'admin/Role/RoleSave');
 Route::rule('rolestatus', 'admin/Role/RoleStatus');
 
-
 Route::rule('ulist','admin/Newfill/list');
 Route::rule('add','admin/Newfill/add');
 Route::rule('refresh',"admin/Newfill/refresh");