commit

app/admin/model/user/Achievement.php

@@ -36,9 +36,9 @@ class Achievement extends BaseModel
     public static function list($where)
     {
         $model = self::field('*')->order('id DESC');
-        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
         $data['count'] = $model->count();
 
+        if ($where['name']) $model = $model->where('uid|province', $where['name']);
         if ($where['type']) $model = $model->where('type', $where['type']);
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/view/user/achievement/index.php

@@ -27,19 +27,19 @@
 <div class="layui-fluid">
     <div class="layui-row layui-col-space15" id="app">
         <!--搜索条件-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-card">-->
-<!--                <div class="layui-card-header">申请列表</div>-->
-<!--                <div class="layui-card-body">-->
-<!--                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">-->
-<!--                        <form class="layui-form layui-form-pane" action="">-->
-<!--                            <div class="layui-form-item">-->
-<!---->
-<!--                                <div class="layui-col-lg12">-->
-<!--                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>-->
-<!--                                    <div class="layui-input-inline">-->
-<!--                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">-->
-<!--                                    </div>-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">申请列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入UID或者省">
+                                    </div>
 <!--                                    <div class="layui-inline">-->
 <!--                                        <label class="layui-form-label" style="top: -4.5px">状态</label>-->
 <!--                                        <div class="layui-input-block">-->
@@ -51,20 +51,20 @@
 <!--                                            </select>-->
 <!--                                        </div>-->
 <!--                                    </div>-->
-<!---->
-<!--                                    <div class="layui-inline">-->
-<!--                                        <div class="layui-input-inline">-->
-<!--                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">-->
-<!--                                                <i class="layui-icon layui-icon-search"></i>搜索</button>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                            </div>-->
-<!--                        </form>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
+                                                <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
 
         <!-- 中间详细信息-->
         <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"

app/models/store/StoreOrder.php

@@ -804,7 +804,7 @@ class StoreOrder extends BaseModel
                 if ($user1){
                     User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1)->update();
                     $user1['brokerage_price'] += $price1;
-                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num).'订单号'.$order['order_id'];
+                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
                 if ($user2){
                     User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3)->update();
@@ -2372,7 +2372,7 @@ class StoreOrder extends BaseModel
                     }
                     $details = User::where('uid', $uid[0])->find();
                     User::where('uid', $details['uid'])->inc('brokerage_price', $price)->update();
-                    UserBill::income('团队奖励管理',$details['uid'], 'now_money', 'team', $price, 0, $details['brokerage_price']+$price, '团队奖励');
+                    UserBill::income('团队奖励',$details['uid'], 'now_money', 'team', $price, 0, $details['brokerage_price']+$price, '团队奖励');
                 }
             }
         }