diff --git a/src/addon/personnel/model/Personnel.php b/src/addon/personnel/model/Personnel.php index bb353680c..41cb97840 100644 --- a/src/addon/personnel/model/Personnel.php +++ b/src/addon/personnel/model/Personnel.php @@ -9,8 +9,8 @@ class Personnel extends BaseModel { - - /** + + /** * 获取名片设置 * @param $site_id * @param $app_module @@ -18,16 +18,20 @@ class Personnel extends BaseModel */ public function getPersonnelSet($site_id, $app_module) { + $DEFAULT_CONFIG_VALUE = '{"is_kefu":1,"is_mp":1,"is_file":1,"is_channel":1,"is_video":1,"is_map":1}'; $config = new ConfigModel(); - $res = $config->getConfig([ [ 'site_id', '=', $site_id ], [ 'app_module', '=', $app_module ], [ 'config_key', '=', 'DIY_PERSONNEL' ] ]); - if (empty($res[ 'data' ][ 'value' ])){ - $res[ 'data' ][ 'value' ] = [ + $res = $config->getConfig([['site_id', '=', $site_id], ['app_module', '=', $app_module], ['config_key', '=', 'DIY_PERSONNEL']]); + if (empty($res['data']['value'])) { + $res['data']['value'] = [ 'personnel_bg' => '', - 'value'=>'{"is_kefu":1,"is_mp":1,"is_file":1,"is_video":1,"is_map":1}' + 'value' => $DEFAULT_CONFIG_VALUE ]; - }else{ - if(!isset($res['data']['value']['value'])) $res['data']['value']['value'] = '{"is_kefu":1,"is_mp":1,"is_file":1,"is_video":1,"is_map":1}'; + } else { + if (!isset($res['data']['value']['value'])) + $res['data']['value']['value'] = $DEFAULT_CONFIG_VALUE; } + + //public/static/img/diy_view/member_info_bg.png return $res; } @@ -42,7 +46,7 @@ class Personnel extends BaseModel public function setPersonnelSet($data, $site_id, $app_module) { $config = new ConfigModel(); - $res = $config->setConfig($data, '名片设置', 1, [ [ 'site_id', '=', $site_id ], [ 'app_module', '=', $app_module ], [ 'config_key', '=', 'DIY_PERSONNEL' ] ]); + $res = $config->setConfig($data, '名片设置', 1, [['site_id', '=', $site_id], ['app_module', '=', $app_module], ['config_key', '=', 'DIY_PERSONNEL']]); return $res; } @@ -63,9 +67,9 @@ class Personnel extends BaseModel public function getMessagePageList($condition = [], $field = true, $order = '', $page = 1, $list_rows = PAGE_LIST_ROWS, $alias = 'a', $join = []) { $data = model('personnel_message')->pageList($condition, $field, $order, $page, $list_rows, $alias, $join); - if (!empty($data[ 'list' ])) { - foreach ($data[ 'list' ] as $k => $item) { - $data[ 'list' ][ $k ][ 'createtime' ] = date('Y-m-d H:i:s',$item['createtime']); + if (!empty($data['list'])) { + foreach ($data['list'] as $k => $item) { + $data['list'][$k]['createtime'] = date('Y-m-d H:i:s', $item['createtime']); } } return $this->success($data); @@ -87,9 +91,9 @@ class Personnel extends BaseModel * 编辑人员 * @param $param */ - public function editPersonnel($condition,$data) + public function editPersonnel($condition, $data) { - $result = model('personnel')->update($condition,$data); + $result = model('personnel')->update($condition, $data); return $this->success($result); } @@ -100,13 +104,14 @@ class Personnel extends BaseModel */ public function deletePersonnel($id, $site_id) { - $info = model('personnel')->getInfo([ [ 'site_id', '=', $site_id ], [ 'id', '=', $id ] ], 'id'); - if (empty($info)) return $this->error('', '未获取到人员信息'); - $res = model('personnel')->delete([ [ 'site_id', '=', $site_id ], [ 'id', '=', $id ] ]); + $info = model('personnel')->getInfo([['site_id', '=', $site_id], ['id', '=', $id]], 'id'); + if (empty($info)) + return $this->error('', '未获取到人员信息'); + $res = model('personnel')->delete([['site_id', '=', $site_id], ['id', '=', $id]]); return $this->success($res); } - /** + /** * 获取电子名片人员列表 * @param array $condition * @param bool $field @@ -123,16 +128,17 @@ class Personnel extends BaseModel return $this->success($data); } - /** + /** * 删除留言 * @param $id * @param $site_id */ public function deleteMessage($id, $site_id) { - $info = model('personnel_message')->getInfo([ [ 'site_id', '=', $site_id ], [ 'id', '=', $id ] ], 'id'); - if (empty($info)) return $this->error('', '未获取到留言信息'); - $res = model('personnel_message')->delete([ [ 'site_id', '=', $site_id ], [ 'id', '=', $id ] ]); + $info = model('personnel_message')->getInfo([['site_id', '=', $site_id], ['id', '=', $id]], 'id'); + if (empty($info)) + return $this->error('', '未获取到留言信息'); + $res = model('personnel_message')->delete([['site_id', '=', $site_id], ['id', '=', $id]]); return $this->success($res); } } \ No newline at end of file diff --git a/src/addon/personnel/shop/view/enterprise/channel/add.html b/src/addon/personnel/shop/view/enterprise/channel/add.html index 5a87c4342..b6e9af293 100644 --- a/src/addon/personnel/shop/view/enterprise/channel/add.html +++ b/src/addon/personnel/shop/view/enterprise/channel/add.html @@ -54,8 +54,7 @@

点击上传

- - + x @@ -70,14 +69,14 @@
- +
- +
@@ -85,14 +84,14 @@
- +
- +
@@ -101,8 +100,7 @@

点击上传

- - + x
@@ -152,6 +150,7 @@ if(avatarImg){ if(avatarImageType == 'upload'){ $("#avatarImg").html("头像"); + $("input[name='avatar_url_upload']").val(avatarImg); imageCollection.push(avatarImg); }else{ $("#avatarImg").html("头像"); @@ -162,6 +161,7 @@ if(coverImg){ if(coverImageType == 'upload'){ $("#coverImg").html("封面"); + $("input[name='cover_url_upload']").val(coverImg); }else{ $("#coverImg").html("封面"); } @@ -315,6 +315,8 @@ delete field.avatar_url_upload; delete field.cover_url_upload; field.status = 1; + + console.log('添加:提交的数据', field) formSubmit(field) }); }); diff --git a/src/addon/personnel/shop/view/enterprise/channel/edit.html b/src/addon/personnel/shop/view/enterprise/channel/edit.html index a86b17d68..d8727d3c2 100644 --- a/src/addon/personnel/shop/view/enterprise/channel/edit.html +++ b/src/addon/personnel/shop/view/enterprise/channel/edit.html @@ -54,8 +54,7 @@

点击上传

- - + x @@ -91,7 +90,7 @@ -
+
@@ -101,8 +100,7 @@

点击上传

- - + x
@@ -152,6 +150,7 @@ if(avatarImg){ if(avatarImageType == 'upload'){ $("#avatarImg").html("头像"); + $("input[name='avatar_url_upload']").val(avatarImg); imageCollection.push(avatarImg); }else{ $("#avatarImg").html("头像"); @@ -162,6 +161,7 @@ if(coverImg){ if(coverImageType == 'upload'){ $("#coverImg").html("封面"); + $("input[name='cover_url_upload']").val(coverImg); }else{ $("#coverImg").html("封面"); } @@ -315,6 +315,8 @@ delete field.avatar_url_upload; delete field.cover_url_upload; field.status = 1; + + console.log('编辑:提交的数据', field) formSubmit(field) }); }); diff --git a/src/addon/personnel/shop/view/enterprise/channel/lists.html b/src/addon/personnel/shop/view/enterprise/channel/lists.html index 06c041400..b243bb764 100644 --- a/src/addon/personnel/shop/view/enterprise/channel/lists.html +++ b/src/addon/personnel/shop/view/enterprise/channel/lists.html @@ -48,11 +48,11 @@ - + + + + +