From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/branch/model/auth/User.php | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/admin/app/branch/model/auth/User.php b/admin/app/branch/model/auth/User.php
index cc389ff..0156dce 100644
--- a/admin/app/branch/model/auth/User.php
+++ b/admin/app/branch/model/auth/User.php
@@ -49,14 +49,14 @@
$this->startTrans();
try {
// 用户是否已绑定
- $user = null;
- if($data['user_id'] > 0){
- $user = UserModel::detail($data['user_id']);
- if($user['user_type'] != 1){
- $this->error = '该用户已绑定，或绑定的商户正在审核';
- return false;
- }
- }
+ // $user = null;
+ // if($data['user_id'] > 0){
+ // $user = UserModel::detail($data['user_id']);
+ // if($user['user_type'] != 1){
+ // $this->error = '该用户已绑定或正在审核';
+ // return false;
+ // }
+ // }
$arr = [
'user_name' => trim($data['user_name']),
'password' => salt_hash($data['password']),
@@ -77,11 +77,11 @@
}
$model->saveAll($add_arr);
// 后台添加的直接算审核通过
- if($user){
- $user->save([
- 'user_type' => 2
- ]);
- }
+ // if($user){
+ // $user->save([
+ // 'user_type' => 2
+ // ]);
+ // }
// 事务提交
$this->commit();
return true;
@@ -110,18 +110,18 @@
$old_user_id = $this['user']['user_id'];
}
$userChange = false;
- if($this['user'] && $data['user_id'] > 0 && $data['user_id'] != $this['user']['user_id']){
- $user = UserModel::detail($data['user_id']);
- if($user['user_type'] != 1){
- $this->error = '该用户已绑定，或绑定的商户正在审核';
- return false;
- }
- $userChange = true;
- }
+ // if($this['user'] && $data['user_id'] > 0 && $data['user_id'] != $this['user']['user_id']){
+ // $user = UserModel::detail($data['user_id']);
+ // if($user['user_type'] != 1){
+ // $this->error = '该用户已绑定，或绑定的商户正在审核';
+ // return false;
+ // }
+ // $userChange = true;
+ // }
$arr = [
'user_name' => $data['user_name'],
- 'user_id' => $data['user_id'],
+ // 'user_id' => $data['user_id'],
'real_name' => $data['real_name'],
];
if (!empty($data['password'])) {
@@ -142,17 +142,17 @@
}
$model->saveAll($add_arr);
// 后台添加的直接算审核通过
- if($userChange){
- $user->save([
- 'user_type' => 2
- ]);
- //取消原来的
- if ($old_user_id > 0){
- (new UserModel())->where('user_id', '=', $old_user_id)->update([
- 'user_type' => 1
- ]);
- }
- }
+ // if($userChange){
+ // $user->save([
+ // 'user_type' => 2
+ // ]);
+ // //取消原来的
+ // if ($old_user_id > 0){
+ // (new UserModel())->where('user_id', '=', $old_user_id)->update([
+ // 'user_type' => 1
+ // ]);
+ // }
+ // }
// 事务提交
$this->commit();
return true;
--
Gitblit v1.9.2