diff --git a/public/pages/admin/integralDetail/integralDetail.html b/public/pages/admin/integralDetail/integralDetail.html
index 251824f29..47a239fea 100644
--- a/public/pages/admin/integralDetail/integralDetail.html
+++ b/public/pages/admin/integralDetail/integralDetail.html
@@ -1,130 +1,156 @@
 <div>
-
-    <div class="ibox ">
-        <div class="ibox-title">
-            <h5>
-                <vc:i18n name="查询条件"></vc:i18n>
-            </h5>
-            <div class="ibox-tools" style="top:10px;">
-            </div>
-        </div>
-        <div class="ibox-content">
-            <div class="row">
-                <div class="col-sm-2">
-                    <div class="form-group">
-                        <input type="text" :placeholder="vc.i18n('请选择账户ID','integralDetail')"
-                            v-model="integralDetailInfo.conditions.integralId" class=" form-control">
-                    </div>
-                </div>
-                <div class="col-sm-2">
-                    <div class="form-group">
-                        <select class="custom-select" v-model="integralDetailInfo.conditions.detailType">
-                            <option selected value="">{{vc.i18n('请选择类型','integralDetail')}}</option>
-                            <option value="1001">{{vc.i18n('转入','integralDetail')}}</option>
-                            <option value="2002">{{vc.i18n('转出','integralDetail')}}</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="col-sm-2">
-                    <div class="form-group">
-                            <select class="custom-select" v-model="integralDetailInfo.conditions.objType">
-                                <option selected value="">{{vc.i18n('请选择对象类型','integralDetail')}}</option>
-                                <option value="6006">{{vc.i18n('用户','integralDetail')}}</option>
-                                <option value="7007">{{vc.i18n('商户','integralDetail')}}</option>
-                            </select>
-                    </div>
-                </div>
-                <div class="col-sm-2">
-                    <div class="form-group">
-                        <input type="text" :placeholder="vc.i18n('请选择交易单号','integralDetail')"
-                            v-model="integralDetailInfo.conditions.orderId" class=" form-control">
-                    </div>
-                </div>
-                <div class="col-sm-1">
-                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryIntegralDetailMethod()">
-                        <i class="glyphicon glyphicon-search"></i> <span>
-                            <vc:i18n name="查询"></vc:i18n>
-                        </span>
-                    </button>
+    <div class="row">
+        <div class="col-md-1 padding-r-0">
+            <div class=" border-radius ">
+                <div class="margin-xs-r  treeview ">
+                    <ul class="list-group text-center border-radius">
+                        <li class="list-group-item node-orgTree " @click="_switchIntegralObjType('')"
+                            :class="{'vc-node-selected':integralDetailInfo.conditions.objType == ''}">
+                            全部
+                        </li>
+                        <li class="list-group-item node-orgTree " @click="_switchIntegralObjType('6006')"
+                            :class="{'vc-node-selected':integralDetailInfo.conditions.objType == '6006'}">
+                            个人
+                        </li>
+                        <li class="list-group-item node-orgTree " @click="_switchIntegralObjType('7007')"
+                            :class="{'vc-node-selected':integralDetailInfo.conditions.objType == '7007'}">
+                            商户
+                        </li>
+                    </ul>
                 </div>
             </div>
         </div>
-    </div>
+        <div class="col-md-11">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>
+                        <vc:i18n name="查询条件"></vc:i18n>
+                    </h5>
+                    <div class="ibox-tools" style="top:10px;">
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请选择账户ID','integralDetail')"
+                                    v-model="integralDetailInfo.conditions.integralId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="integralDetailInfo.conditions.detailType">
+                                    <option selected value="">{{vc.i18n('请选择类型','integralDetail')}}</option>
+                                    <option value="1001">{{vc.i18n('转入','integralDetail')}}</option>
+                                    <option value="2002">{{vc.i18n('转出','integralDetail')}}</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="integralDetailInfo.conditions.objType">
+                                    <option selected value="">{{vc.i18n('请选择对象类型','integralDetail')}}</option>
+                                    <option value="6006">{{vc.i18n('用户','integralDetail')}}</option>
+                                    <option value="7007">{{vc.i18n('商户','integralDetail')}}</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请选择交易单号','integralDetail')"
+                                    v-model="integralDetailInfo.conditions.orderId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_queryIntegralDetailMethod()">
+                                <i class="glyphicon glyphicon-search"></i> <span>
+                                    <vc:i18n name="查询"></vc:i18n>
+                                </span>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
 
-    <div class="ibox">
-        <div class="ibox-title">
-            <h5>
-                <vc:i18n name="积分交易" namespace="integralDetail"></vc:i18n>
-            </h5>
-            <div class="ibox-tools" style="top:10px;">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>
+                        <vc:i18n name="积分交易" namespace="integralDetail"></vc:i18n>
+                    </h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                            <tr>
+                                <th class="text-center">
+                                    <vc:i18n name='编号' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='账户名称' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='账户编号' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='类型' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='关联账户' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='积分数' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='对象类型' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='对象ID' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='手机号' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='交易单号' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='交易时间' namespace='integralDetail'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name='备注' namespace='integralDetail'></vc:i18n>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="integralDetail in integralDetailInfo.integralDetails">
+                                <td class="text-center">{{integralDetail.detailId}}</td>
+                                <td class="text-center">{{integralDetail.integralName}}</td>
+                                <td class="text-center">{{integralDetail.integralId}}</td>
+                                <td class="text-center">{{integralDetail.detailType == '2002'?'转出':'转入'}}</td>
+                                <td class="text-center">{{integralDetail.relIntegralId}}</td>
+                                <td class="text-center">{{integralDetail.amount}}</td>
+                                <td class="text-center">{{integralDetail.objType== '7007'?'商户':'用户'}}</td>
+                                <td class="text-center">{{integralDetail.objId}}</td>
+                                <td class="text-center">{{integralDetail.link}}</td>
+                                <td class="text-center">{{integralDetail.orderId}}</td>
+                                <td class="text-center">{{integralDetail.createTime}}</td>
+                                <td class="text-center">{{integralDetail.remark}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
 
             </div>
+
+
         </div>
-        <div class="ibox-content">
-            <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                <thead>
-                    <tr>
-                        <th class="text-center">
-                            <vc:i18n name='编号' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='账户名称' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='账户编号' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='类型' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='关联账户' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='积分数' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='对象类型' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='对象ID' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='手机号' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='交易单号' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='交易时间' namespace='integralDetail'></vc:i18n>
-                        </th>
-                        <th class="text-center">
-                            <vc:i18n name='备注' namespace='integralDetail'></vc:i18n>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="integralDetail in integralDetailInfo.integralDetails">
-                        <td class="text-center">{{integralDetail.detailId}}</td>
-                        <td class="text-center">{{integralDetail.integralName}}</td>
-                        <td class="text-center">{{integralDetail.integralId}}</td>
-                        <td class="text-center">{{integralDetail.detailType == '2002'?'转出':'转入'}}</td>
-                        <td class="text-center">{{integralDetail.relIntegralId}}</td>
-                        <td class="text-center">{{integralDetail.amount}}</td>
-                        <td class="text-center">{{integralDetail.objType== '7007'?'商户':'用户'}}</td>
-                        <td class="text-center">{{integralDetail.objId}}</td>
-                        <td class="text-center">{{integralDetail.link}}</td>
-                        <td class="text-center">{{integralDetail.orderId}}</td>
-                        <td class="text-center">{{integralDetail.createTime}}</td>
-                        <td class="text-center">{{integralDetail.remark}}</td>
-                    </tr>
-                </tbody>
-            </table>
-            <!-- 分页 -->
-            <vc:create path="frame/pagination"></vc:create>
-        </div>
+
+
 
     </div>
-
-
-
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/integralDetail/integralDetail.js b/public/pages/admin/integralDetail/integralDetail.js
index 468ef84fa..48b8cce5f 100644
--- a/public/pages/admin/integralDetail/integralDetail.js
+++ b/public/pages/admin/integralDetail/integralDetail.js
@@ -71,6 +71,10 @@
                 } else {
                     $that.integralDetailInfo.moreCondition = true;
                 }
+            },
+            _switchIntegralObjType:function(_objType){
+                $that.integralDetailInfo.conditions.objType = _objType;
+                $that._listIntegralDetails(DEFAULT_PAGE, DEFAULT_ROWS);
             }