@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+ <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -83,7 +83,7 @@ class Mall extends Base
$search_arr = [];
$where_str = 'b.id > 0';
foreach ($search_log as $t){
- $search_arr[] = " b.title like '".'%'.$t."%'" .' ';
+ $search_arr[] = " b.name like '".'%'.$t."%'" .' ';
}
if(!empty($search_arr)) $where_str = implode(' OR ',$search_arr);
$field = 'a.id,name,cover,low_price,IFNULL(is_recommend,0) is_recommend ';
@@ -168,7 +168,7 @@ class Supplier extends Base
$field = 'a.id,a.supplier_id,a.name,a.label,a.cover,read_num,IFNULL(is_recommend,0) is_recommend ';