diff --git a/addons/shopro/controller/user/User.php b/addons/shopro/controller/user/User.php
index 5997f89..5d9c265 100644
--- a/addons/shopro/controller/user/User.php
+++ b/addons/shopro/controller/user/User.php
@@ -17,6 +17,7 @@ use app\admin\model\shopro\user\User as UserModel;
use app\admin\model\shopro\order\Order as OrderModel;
use app\admin\model\shopro\user\Coupon as UserCouponModel;
use app\admin\model\shopro\order\Aftersale as AftersaleModel;
+use app\admin\model\zy\Club;
use app\admin\model\zy\Menber;
class User extends Common
@@ -90,10 +91,10 @@ class User extends Common
$user->hidden(['password', 'salt', 'createtime', 'updatetime', 'deletetime', 'remember_token', 'login_fail', 'login_ip', 'login_time']);
$user = $user->toArray();
- $user['msg_num'] = Message::where('user_id', $user['id'])->where('status', 0)->count();
- $user['club_list'] = Menber::where('user_id', $user['id'])->where('role','>', 0)->select();
- $user['club_num'] = count($user['club_list']);
- $user['card_num'] = 0;
+ $user['msg_num'] = Message::where('user_id', $user['id'])->where('status', 0)->count();
+ $user['club_list'] = Menber::alias('m')->join([Club::$tableName => 'c'], 'c.id=m.club_id')->field('m.*,c.name')->where('user_id', $user['id'])->where('role', '>', 0)->select();
+ $user['club_num'] = count($user['club_list']);
+ $user['card_num'] = 0;
$this->success('个人详情', $user);
}
diff --git a/addons/shopro/controller/zy/Circle.php b/addons/shopro/controller/zy/Circle.php
index 7274fee..ef5a9f6 100644
--- a/addons/shopro/controller/zy/Circle.php
+++ b/addons/shopro/controller/zy/Circle.php
@@ -44,6 +44,11 @@ class Circle extends Base
'content', m.content,
'create_time', m.create_time
)) AS comment")->group('c.id');
+ if (isset($params['status'])) {
+ $query->where('c.status', $params['status']);
+ } else {
+ $query->where('c.status', 1);
+ }
if (isset($params['club_id'])) {
$query->where('c.club_id', $params['club_id']);
}
@@ -92,7 +97,7 @@ class Circle extends Base
$params['avatar'] = $user['avatar'];
$params['gender'] = $user['gender'];
$params['club_name'] = $club['name'];
- $params['status'] = 1;
+ $params['status'] = 0;
Db::startTrans();
try {
$result = (new CircleModel)->allowField(true)->save($params);
@@ -174,4 +179,26 @@ class Circle extends Base
}
$this->success('Success');
}
+
+ public function approve()
+ {
+ $params = $this->request->param();
+ $model = CircleModel::get($params['id'] ?? NULL);
+ if (empty($model)) {
+ $this->error(__('No rows were found'));
+ }
+ $member = Menber::get(['club_id' => $model->club_id, 'user_id' => $this->auth->id]);
+ if (empty($member) || $member->role < 2) {
+ $this->error('无权审核');
+ }
+ if ($model->status != 0) {
+ $this->error('已审核');
+ }
+ if ($params['status'] != -1 && $params['status'] != 1) {
+ $this->error('status:参数错误');
+ }
+ $model->save(['status' => $params['status']]);
+
+ $this->success('Success');
+ }
}
diff --git a/application/admin/lang/zh-cn/zy/circle/circle.php b/application/admin/lang/zh-cn/zy/circle/circle.php
index 284b628..8893cd0 100644
--- a/application/admin/lang/zh-cn/zy/circle/circle.php
+++ b/application/admin/lang/zh-cn/zy/circle/circle.php
@@ -9,12 +9,18 @@ return [
'Club_name' => '俱乐部名称',
'Content' => '内容',
'Imgs' => '图片',
+ 'Status' => '状态',
'Create_time' => '创建时间',
'Update_time' => '修改时间',
'Club.name' => '俱乐部名称',
'User.nickname' => '昵称',
- 'Male' => '男',
- 'Female' => '女',
+ 'Gender1' => '男',
+ 'Gender0' => '女',
+
+ 'Status-1' => '审核不通过',
+ 'Status0' => '待审核',
+ 'Status1' => '审核通过',
+
];
diff --git a/application/admin/view/zy/circle/circle/add.html b/application/admin/view/zy/circle/circle/add.html
index 88dcfa4..64b41cb 100644
--- a/application/admin/view/zy/circle/circle/add.html
+++ b/application/admin/view/zy/circle/circle/add.html
@@ -12,13 +12,7 @@
-
-
-
+
+
-
-
-
+
+