wupengfei 2 年之前
父節點
當前提交
fea2990c9a
共有 3 個文件被更改,包括 11 次插入3 次删除
  1. 3 2
      .idea/workspace.xml
  2. 7 1
      application/user/controller/Member.php
  3. 1 0
      application/user/view/member/index_search.html

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <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/user/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Member.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/member/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -269,7 +270,7 @@
       <workItem from="1679359715116" duration="25702000" />
       <workItem from="1679532313623" duration="31448000" />
       <workItem from="1679619041819" duration="29965000" />
-      <workItem from="1679706054685" duration="16581000" />
+      <workItem from="1679706054685" duration="16681000" />
     </task>
     <servers />
   </component>

+ 7 - 1
application/user/controller/Member.php

@@ -61,7 +61,13 @@ class Member extends Controller
         if($phone = input('get.phone')) $where[] = ['m.phone','like','%'.$phone.'%'];
         if($level_id = input('get.level_id')) $where[] = ['m.level_id','=',$level_id];
         if($label_id = input('get.label_id')) $where[] = ['m.label','like','%|'.$label_id."|%"];
-        if($account_type = input('get.account_type')) $where[] = ['m.account_type','=',$account_type];
+        if($account_type = input('get.account_type')) {
+            if($account_type == 3) {
+                $where[] = ['m.is_first','=',1];
+            }else{
+                $where[] = ['m.account_type','=',$account_type];
+            }
+        }
         $field="m.id,m.openid,m.name,m.is_first,m.headimg,m.level_exp,m.phone,m.status,m.create_at,m.account_type,w.growth,w.integral,w.money,m.tag_id,label";
         $create_at = input('create_at');
         $query = $this->_query($this->table)

+ 1 - 0
application/user/view/member/index_search.html

@@ -29,6 +29,7 @@
                     <option  {if $Think.get.account_type eq 0}selected{/if} value="0">全部</option>
                     <option  {if $Think.get.account_type eq 1}selected{/if} value="1">公司</option>
                     <option  {if $Think.get.account_type eq 2}selected{/if} value="2">个人</option>
+                    <option  {if $Think.get.account_type eq 3}selected{/if} value="3">公司代表</option>
                 </select>
             </div>
         </div>