Kirin 3 سال پیش
والد
کامیت
89c0abfcd1
2فایلهای تغییر یافته به همراه31 افزوده شده و 31 حذف شده
  1. 2 2
      app/admin/controller/user/User.php
  2. 29 29
      app/admin/model/user/User.php

+ 2 - 2
app/admin/controller/user/User.php

@@ -118,8 +118,8 @@ class User extends AuthController
         $f = array();
         $f[] = Form::radio('money_status', '修改余额', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
         $f[] = Form::number('money', '余额')->min(0);
-        $f[] = Form::radio('integration_status', '修改积分', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
-        $f[] = Form::number('integration', '积分')->min(0);
+//        $f[] = Form::radio('integration_status', '修改积分', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
+//        $f[] = Form::number('integration', '积分')->min(0);
         $form = Form::make_post_form('修改其他', $f, Url::buildUrl('update_other', array('uid' => $uid)));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');

+ 29 - 29
app/admin/model/user/User.php

@@ -694,7 +694,7 @@ class User extends BaseModel
             UserAddress::where('uid', $uid)->field($key_field)->find();
         $UserInfo = self::get($uid);
         return [
-            ['col' => 12, 'name' => '默认收货地址', 'value' => $thisAddress ? '收货人:' . $thisAddress['real_name'] . '邮编:' . $thisAddress['post_code'] . ' 收货人电话:' . $thisAddress['phone'] . ' 地址:' . $thisAddress['province'] . ' ' . $thisAddress['city'] . ' ' . $thisAddress['district'] . ' ' . $thisAddress['detail'] : ''],
+//            ['col' => 12, 'name' => '默认收货地址', 'value' => $thisAddress ? '收货人:' . $thisAddress['real_name'] . '邮编:' . $thisAddress['post_code'] . ' 收货人电话:' . $thisAddress['phone'] . ' 地址:' . $thisAddress['province'] . ' ' . $thisAddress['city'] . ' ' . $thisAddress['district'] . ' ' . $thisAddress['detail'] : ''],
 //            ['name'=>'微信OpenID','value'=>WechatUser::where('uid', $uid)->value('openid'),'col'=>8],
             ['name' => '手机号码', 'value' => $UserInfo['phone']],
 //            ['name'=>'ID','value'=>$uid],
@@ -702,11 +702,11 @@ class User extends BaseModel
             ['name' => '微信昵称', 'value' => $UserInfo['nickname']],
             ['name' => '邮箱', 'value' => ''],
             ['name' => '生日', 'value' => ''],
-            ['name' => '积分', 'value' => $UserInfo['integral']],
-            ['name' => '上级推广人', 'value' => $UserInfo['spread_uid'] ? self::where('uid', $UserInfo['spread_uid'])->value('nickname') : ''],
+//            ['name' => '积分', 'value' => $UserInfo['integral']],
+//            ['name' => '上级推广人', 'value' => $UserInfo['spread_uid'] ? self::where('uid', $UserInfo['spread_uid'])->value('nickname') : ''],
             ['name' => '账户余额', 'value' => $UserInfo['now_money']],
-            ['name' => '佣金总收入', 'value' => UserBill::where('category', 'now_money')->where('type', 'brokerage')->where('uid', $uid)->sum('number')],
-            ['name' => '提现总金额', 'value' => UserExtract::where('uid', $uid)->where('status', 1)->sum('extract_price')],
+//            ['name' => '佣金总收入', 'value' => UserBill::where('category', 'now_money')->where('type', 'brokerage')->where('uid', $uid)->sum('number')],
+//            ['name' => '提现总金额', 'value' => UserExtract::where('uid', $uid)->where('status', 1)->sum('extract_price')],
         ];
     }
 
@@ -714,30 +714,30 @@ class User extends BaseModel
     public static function getHeaderList($uid)
     {
         return [
-            [
-                'title' => '总计订单',
-                'value' => StoreOrder::where('uid', $uid)->count(),
-                'key' => '笔',
-                'class' => '',
-            ],
-            [
-                'title' => '总消费金额',
-                'value' => StoreOrder::where('uid', $uid)->where('paid', 1)->sum('total_price'),
-                'key' => '元',
-                'class' => '',
-            ],
-            [
-                'title' => '本月订单',
-                'value' => StoreOrder::where('uid', $uid)->whereTime('add_time', 'month')->count(),
-                'key' => '笔',
-                'class' => '',
-            ],
-            [
-                'title' => '本月消费金额',
-                'value' => StoreOrder::where('uid', $uid)->where('paid', 1)->whereTime('add_time', 'month')->sum('total_price'),
-                'key' => '元',
-                'class' => '',
-            ]
+//            [
+//                'title' => '总计订单',
+//                'value' => StoreOrder::where('uid', $uid)->count(),
+//                'key' => '笔',
+//                'class' => '',
+//            ],
+//            [
+//                'title' => '总消费金额',
+//                'value' => StoreOrder::where('uid', $uid)->where('paid', 1)->sum('total_price'),
+//                'key' => '元',
+//                'class' => '',
+//            ],
+//            [
+//                'title' => '本月订单',
+//                'value' => StoreOrder::where('uid', $uid)->whereTime('add_time', 'month')->count(),
+//                'key' => '笔',
+//                'class' => '',
+//            ],
+//            [
+//                'title' => '本月消费金额',
+//                'value' => StoreOrder::where('uid', $uid)->where('paid', 1)->whereTime('add_time', 'month')->sum('total_price'),
+//                'key' => '元',
+//                'class' => '',
+//            ]
         ];
     }