|
|
@@ -355,8 +355,8 @@ class User extends AuthController
|
|
|
['integration_status', 0],
|
|
|
['integration', 0],
|
|
|
['status', 0],
|
|
|
- ['area_admin']
|
|
|
- ['area_address']
|
|
|
+ ['area_admin'],
|
|
|
+ ['area_address', []]
|
|
|
]);
|
|
|
if (!$uid) return $this->failed('数据不存在');
|
|
|
$user = UserModel::get($uid);
|
|
|
@@ -418,6 +418,26 @@ class User extends AuthController
|
|
|
$edit['birthday'] = strtotime($data['birthday']);
|
|
|
$edit['mark'] = $data['mark'];
|
|
|
$edit['is_promoter'] = $data['is_promoter'];
|
|
|
+ $edit['area_admin'] = $data['area_admin'];
|
|
|
+
|
|
|
+ if ($edit['area_admin'] == 1 && (!$data['area_address'][0] || !$data['area_address'][1] || !$data['area_address'][2])) {
|
|
|
+ return Json::fail('请选择代理地区');
|
|
|
+ }
|
|
|
+ if ($edit['area_admin'] == 2 && (!$data['area_address'][0] || !$data['area_address'][1])) {
|
|
|
+ return Json::fail('请选择代理地区');
|
|
|
+ }
|
|
|
+ if ($edit['area_admin'] == 3 && (!$data['area_address'][0])) {
|
|
|
+ return Json::fail('请选择代理地区');
|
|
|
+ }
|
|
|
+ if ($edit['area_admin'] == 0) {
|
|
|
+ $edit['area_province'] = '';
|
|
|
+ $edit['area_city'] = '';
|
|
|
+ $edit['area_district'] = '';
|
|
|
+ } else {
|
|
|
+ $edit['area_province'] = $data['area_address'][0];
|
|
|
+ $edit['area_city'] = $data['area_address'][1];
|
|
|
+ $edit['area_district'] = $data['area_address'][2];
|
|
|
+ }
|
|
|
if ($edit) $res3 = UserModel::edit($edit, $uid);
|
|
|
else $res3 = true;
|
|
|
if ($res1 && $res2 && $res3) $res = true;
|
Kirin