合并分支 'li' 到 'master'

Li



查看合并请求 !575

@@ -139,7 +139,7 @@ class FriendController extends HomeBaseController
                                                 'uid' => session('user.id'),
                                                 'create_time' => time(),
                                                 'balance' => $total,
-                                                'type' => 3
+                                                'type' => 4
                                             ]
                                         ];
 

@@ -380,10 +380,10 @@ class CenterController extends HomeBaseController
         $type = request()->param('type');
         if ($type == 1) {
             $title = '积分获取记录';
-            $where['type'] = ['neq', 2];
+            $where['type'] = ['in', "1,3"];
         } else {
             $title = '积分使用记录';
-            $where['type'] = ['neq', 1];
+            $where['type'] = ['in', "2,4"];
         }
         $where['uid'] = ['eq', session('user.id')];
         $log = Db::name('zj_integral_log')->where($where)->order('create_time DESC')->select();

@@ -47,7 +47,10 @@
                     购买商品消费
                 </if>
                 <if condition="$vo['type'] eq '3'">
-                    好友赠送积分
+                    好友赠送收入
+                </if>
+                <if condition="$vo['type'] eq '4'">
+                    好友赠送支出
                 </if>
             </p>
             <p class="good_date">{$vo.create_time|date='Y-m-d', ###}</p>