diff --git a/service/Application/Admin/Controller/AlipayLifeController.class.php b/service/Application/Admin/Controller/AlipayLifeController.class.php old mode 100644 new mode 100755 index 8b9be1c46..1388a92a5 --- a/service/Application/Admin/Controller/AlipayLifeController.class.php +++ b/service/Application/Admin/Controller/AlipayLifeController.class.php @@ -2,6 +2,8 @@ namespace Admin\Controller; +use Service\AlipayLifeService; + /** * 生活号管理 * @author Devil @@ -205,9 +207,6 @@ class AlipayLifeController extends CommonController // id为空则表示是新增 $m = D('AlipayLife'); - // 公共额外数据处理 - $_POST['is_shelves'] = intval(I('is_shelves', 0)); - // 开启事务 $m->startTrans(); @@ -330,19 +329,21 @@ class AlipayLifeController extends CommonController */ public function StatusUpdate() { - // 参数 - if(empty($_POST['id']) || !isset($_POST['state'])) + // 是否ajax请求 + if(!IS_AJAX) { - $this->ajaxReturn(L('common_param_error'), -1); + $this->error(L('common_unauthorized_access')); } - // 数据更新 - if(M('AlipayLife')->where(array('id'=>I('id')))->save(array('is_shelves'=>I('state')))) + // 开始处理 + $params = $_POST; + $params['alipay_life_id'] = isset($params['id']) ? $params['id'] : 0; + if(isset($params['state'])) { - $this->ajaxReturn(L('common_operation_edit_success')); - } else { - $this->ajaxReturn(L('common_operation_edit_error'), -100); + $params['status'] = $params['state']; } + $ret = AlipayLifeService::LifeStatus($params); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } } ?> \ No newline at end of file diff --git a/service/Application/Admin/Controller/AlipayLifeMenuController.class.php b/service/Application/Admin/Controller/AlipayLifeMenuController.class.php new file mode 100755 index 000000000..f6fa381b3 --- /dev/null +++ b/service/Application/Admin/Controller/AlipayLifeMenuController.class.php @@ -0,0 +1,458 @@ +Is_Login(); + + // 权限校验 + $this->Is_Power(); + } + + /** + * [Index 生活号菜单列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + // 参数 + $params = array_merge($_POST, $_GET); + + // 模型对象 + $m = M('AlipayLifeMenu'); + + // 条件 + $where = $this->GetIndexWhere(); + + // 分页 + $number = MyC('admin_page_number'); + $page_param = array( + 'number' => $number, + 'total' => $m->where($where)->count(), + 'where' => $params, + 'url' => U('Admin/AlipayLifeMenu/Index'), + ); + $page = new \Library\Page($page_param); + + // 获取列表 + $list = $m->where($where)->limit($page->GetPageStarNumber(), $number)->order('id desc')->select(); + $list = $this->SetDataHandle($list); + + // 参数 + $this->assign('params', $params); + + // 分页 + $this->assign('page_html', $page->GetPageHtml()); + + // 发布状态 + $this->assign('common_release_status_list', L('common_release_status_list')); + + // 菜单类型 + $this->assign('common_alipay_life_menu_type_list', L('common_alipay_life_menu_type_list')); + + // 数据列表 + $this->assign('list', $list); + $this->display('Index'); + } + + /** + * [SetDataHandle 数据处理] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-29T21:27:15+0800 + * @param [array] $data [轮播图片数据] + * @return [array] [处理好的数据] + */ + private function SetDataHandle($data) + { + if(!empty($data)) + { + $common_release_status_list = L('common_release_status_list'); + $common_alipay_life_menu_type_list = L('common_alipay_life_menu_type_list'); + foreach($data as &$v) + { + // 状态 + $v['status_name'] = $common_release_status_list[$v['status']]['name']; + + // 类型 + $v['type_name'] = $common_alipay_life_menu_type_list[$v['type']]['name']; + + // 生活号 + $v['alipay_life_all'] = empty($v['alipay_life_ids']) ? '' : M('AlipayLife')->where(['id'=>['in', json_decode($v['alipay_life_ids'], true)]])->getField('name', true); + + // 时间 + $v['startup_time'] = empty($v['startup_time']) ? '' : date('Y-m-d H:i:s', $v['startup_time']); + $v['success_time'] = empty($v['success_time']) ? '' : date('Y-m-d H:i:s', $v['success_time']); + $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); + $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); + } + } + return $data; + } + + /** + * [GetIndexWhere 列表条件] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-10T22:16:29+0800 + */ + private function GetIndexWhere() + { + $where = array(); + + // 模糊 + if(!empty($_REQUEST['keyword'])) + { + $where['name'] = array('like', '%'.I('keyword').'%'); + } + + // 是否更多条件 + if(I('is_more', 0) == 1) + { + if(I('status', -1) > -1) + { + $where['status'] = intval(I('status', 0)); + } + if(I('type', -1) > -1) + { + $where['type'] = intval(I('type', 0)); + } + + // 表达式 + if(!empty($_REQUEST['time_start'])) + { + $where['add_time'][] = array('gt', strtotime(I('time_start'))); + } + if(!empty($_REQUEST['time_end'])) + { + $where['add_time'][] = array('lt', strtotime(I('time_end'))); + } + } + return $where; + } + + /** + * [SaveInfo 添加/编辑页面] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-14T21:37:02+0800 + */ + public function SaveInfo() + { + // 数据 + $data = empty($_REQUEST['id']) ? array() : M('AlipayLifeMenu')->find(I('id')); + $this->assign('data', $data); + + // 菜单类型 + $this->assign('common_alipay_life_menu_type_list', L('common_alipay_life_menu_type_list')); + + // 生活号 + $alipay_life_list = []; + $alipay_life_ids_all = []; + if(!empty($_GET['alipay_life_id'])) + { + $alipay_life_ids_all = [intval(I('alipay_life_id'))]; + } + if(!empty($data['alipay_life_ids'])) + { + $alipay_life_ids_all = json_decode($data['alipay_life_ids'], true); + } + if(!empty($alipay_life_ids_all)) + { + $alipay_life_list = M('AlipayLife')->field('id,name')->where(['id'=>['in', $alipay_life_ids_all]])->select(); + } + $this->assign('alipay_life_ids_all', $alipay_life_ids_all); + $this->assign('alipay_life_list', $alipay_life_list); + + // 生活号分类 + $alipay_life_category = M('AlipayLifeCategory')->where(['is_enable'=>1])->field('id,name')->select(); + $this->assign('alipay_life_category', $alipay_life_category); + + // 参数 + $this->assign('params', array_merge($_POST, $_GET)); + $this->assign('msg_type', I('msg_type', 0)); + $this->display('SaveInfo'); + } + + + /** + * [Index 消息内容列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function ContentIndex() + { + // 参数 + $params = array_merge($_POST, $_GET); + + // 条件 + $where = ['alipay_life_menu_id' => intval($params['menu_id']), 'pid'=>0]; + + // 获取列表 + $list = $this->SetDataHandleContent(M('AlipayLifeMenuContent')->where($where)->order('sort asc')->select()); + if(!empty($list)) + { + foreach($list as &$v) + { + $v['items'] = $this->SetDataHandleContent(M('AlipayLifeMenuContent')->where(['pid'=>$v['id']])->order('sort asc')->select()); + } + } + + // 主数据 + $menu = empty($_REQUEST['menu_id']) ? array() : M('AlipayLifeMenu')->find(I('menu_id')); + $this->assign('menu', $menu); + + // 参数 + $this->assign('params', $params); + + // 数据列表 + $this->assign('list', $list); + $this->assign('list_count', count($list)); + $this->display('ContentIndex'); + } + + /** + * 消息内容处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-29 + * @desc description + * @param [array] $data [数据] + * @return [array] [处理好的数据] + */ + private function SetDataHandleContent($data) + { + if(!empty($data)) + { + $common_alipay_life_menu_action_type_list = L('common_alipay_life_menu_action_type_list'); + foreach($data as &$v) + { + // 事件类型 + $v['action_type_name'] = $common_alipay_life_menu_action_type_list[$v['action_type']]['name']; + + // 图标 + $v['icon'] = empty($v['icon']) ? '' : C('IMAGE_HOST').$v['icon']; + + // 时间 + $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); + $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); + } + } + return $data; + } + + /** + * 内容添加/编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-29 + * @desc description + */ + public function ContentSaveInfo() + { + // 主数据 + $menu = empty($_REQUEST['menu_id']) ? array() : M('AlipayLifeMenu')->find(I('menu_id')); + $this->assign('menu', $menu); + + // 数据 + $data = empty($_REQUEST['id']) ? array() : M('AlipayLifeMenuContent')->find(I('id')); + $this->assign('data', $data); + + // 事件类型 + $this->assign('common_alipay_life_menu_action_type_list', L('common_alipay_life_menu_action_type_list')); + + // 获取父级分类 + $this->assign('alipay_life_menu_list', M('AlipayLifeMenuContent')->field('id,name')->where(['pid'=>0, 'alipay_life_menu_id'=>$menu['id']])->select()); + + // 参数 + $this->assign('params', array_merge($_POST, $_GET)); + $this->display('ContentSaveInfo'); + } + + /** + * 消息详情 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-30 + * @desc description + */ + public function Detail() + { + // 参数 + $params = array_merge($_POST, $_GET); + + // 获取列表 + $list = AlipayLifeService::MenuDetailList($params); + + // 参数 + $this->assign('params', $params); + + // 数据列表 + $this->assign('list', $list); + $this->display('Detail'); + } + + /** + * [Save 生活号菜单保存] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function Save() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + $ret = AlipayLifeService::MenuSave($_POST); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); + } + + /** + * [ContentSave 生活号菜单内容保存] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function ContentSave() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + $ret = AlipayLifeService::MenuContentSave($_POST); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); + } + + /** + * [Delete 生活号菜单删除] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function Delete() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + // 删除 + $id = intval(I('id')); + $m = M('AlipayLifeMenu'); + $m->startTrans(); + if($m->delete($id) && M('AlipayLifeMenuContent')->where(['alipay_life_message_id'=>$id])->delete()) + { + $m->commit(); + $this->ajaxReturn(L('common_operation_delete_success')); + } + $m->rollback(); + $this->ajaxReturn(L('common_operation_delete_error'), -100); + } + + /** + * [Delete 生活号菜单内容删除] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function ContentDelete() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + // 删除 + if(M('AlipayLifeMenuContent')->delete(intval(I('id')))) + { + $this->ajaxReturn(L('common_operation_delete_success')); + } + $this->ajaxReturn(L('common_operation_delete_error'), -100); + } + + /** + * 发送菜单 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-24 + * @desc description + */ + public function Release() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + $ret = AlipayLifeService::MenuSubmit($_POST); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); + } + + /** + * 生活号搜索 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-29 + * @desc description + */ + public function Search() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + $ret = AlipayLifeService::AlipayLifeSearch($_POST); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); + } +} +?> \ No newline at end of file diff --git a/service/Application/Admin/Controller/AlipayLifeMessageController.class.php b/service/Application/Admin/Controller/AlipayLifeMessageController.class.php old mode 100644 new mode 100755 index 0162e585c..d549a50da --- a/service/Application/Admin/Controller/AlipayLifeMessageController.class.php +++ b/service/Application/Admin/Controller/AlipayLifeMessageController.class.php @@ -108,7 +108,7 @@ class AlipayLifeMessageController extends CommonController // 消息类型 $v['type_name'] = $alipay_life_message_msg_type_list[$v['msg_type']]['name']; - // 发送状态 + // 发送类型 $v['send_type_name'] = $alipay_life_message_send_type_list[$v['send_type']]['name']; // 生活号 @@ -118,8 +118,8 @@ class AlipayLifeMessageController extends CommonController $v['alipay_openid'] = empty($v['user_id']) ? '' : M('User')->where(['id'=>$v['user_id']])->getField('alipay_openid'); // 时间 - $v['send_startup_time'] = empty($v['send_startup_time']) ? '' : date('Y-m-d H:i:s', $v['send_startup_time']); - $v['send_success_time'] = empty($v['send_success_time']) ? '' : date('Y-m-d H:i:s', $v['send_success_time']); + $v['startup_time'] = empty($v['startup_time']) ? '' : date('Y-m-d H:i:s', $v['startup_time']); + $v['success_time'] = empty($v['success_time']) ? '' : date('Y-m-d H:i:s', $v['success_time']); $v['add_time'] = date('Y-m-d H:i:s', $v['add_time']); $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']); } @@ -339,6 +339,30 @@ class AlipayLifeMessageController extends CommonController $this->display('ContentSaveInfo'); } + /** + * 消息详情 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-30 + * @desc description + */ + public function Detail() + { + // 参数 + $params = array_merge($_POST, $_GET); + + // 获取列表 + $list = AlipayLifeService::MessageDetailList($params); + + // 参数 + $this->assign('params', $params); + + // 数据列表 + $this->assign('list', $list); + $this->display('Detail'); + } + /** * [Save 生活号消息保存] * @author Devil @@ -354,7 +378,7 @@ class AlipayLifeMessageController extends CommonController $this->error(L('common_unauthorized_access')); } - $ret = AlipayLifeService::MessageAdd($_POST); + $ret = AlipayLifeService::MessageSave($_POST); $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } @@ -373,7 +397,7 @@ class AlipayLifeMessageController extends CommonController $this->error(L('common_unauthorized_access')); } - $ret = AlipayLifeService::MessageContentAdd($_POST); + $ret = AlipayLifeService::MessageContentSave($_POST); $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } diff --git a/service/Application/Admin/Lang/zh-cn/alipaylifemenu.php b/service/Application/Admin/Lang/zh-cn/alipaylifemenu.php new file mode 100755 index 000000000..740787a1c --- /dev/null +++ b/service/Application/Admin/Lang/zh-cn/alipaylifemenu.php @@ -0,0 +1,48 @@ + '生活号菜单创建', + 'alipay_life_menu_content_title' => '生活号菜单内容', + + 'alipay_life_menu_life_text' => '生活号', + 'alipay_life_menu_life_format' => '请选择生活号', + + 'alipay_life_menu_pid_text' => '父级', + 'alipay_life_menu_pid_format' => '请选择父级', + + 'alipay_life_menu_name_text' => '名称', + 'alipay_life_menu_name_format' => '名称格式 1~5 个字符', + + 'alipay_life_menu_type_text' => '菜单类型', + 'alipay_life_menu_type_format' => '请选择菜单类型', + + 'alipay_life_menu_action_type_text' => '事件类型', + 'alipay_life_menu_action_type_format'=> '请选择事件类型', + + 'alipay_life_menu_action_value_text' => '事件值', + 'alipay_life_menu_action_value_format'=> '事件值格式最多 250 个字符', + + 'alipay_life_menu_icon_text' => '图标', + 'alipay_life_menu_icon_format' => '请上传图标', + + 'alipay_life_menu_startup_time_text' => '发布启动时间', + 'alipay_life_menu_success_time_text' => '发布完成时间', + + 'alipay_life_menu_optional_text' => '可选', + 'alipay_life_menu_selected_text' => '已选', + 'alipay_life_menu_selected_all_text' => '全选', + 'alipay_life_menu_content_text' => '内容', + 'alipay_life_menu_detail_text' => '详情', + + 'alipay_life_menu_send_time_text' => '发布时间', + 'alipay_life_menu_return_msg_text' => '发布描述', +); +?> \ No newline at end of file diff --git a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php index 425a4e92f..dd4cfe304 100755 --- a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php +++ b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php @@ -58,5 +58,8 @@ return array( 'alipay_life_message_selected_all_text' => '全选', 'alipay_life_message_content_text' => '内容', 'alipay_life_message_detail_text' => '详情', + + 'alipay_life_message_send_time_text' => '发送时间', + 'alipay_life_message_return_msg_text' => '发送描述', ); ?> \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLife/SaveInfo.html b/service/Application/Admin/View/Default/AlipayLife/SaveInfo.html index f8837063c..89b98ed9b 100755 --- a/service/Application/Admin/View/Default/AlipayLife/SaveInfo.html +++ b/service/Application/Admin/View/Default/AlipayLife/SaveInfo.html @@ -47,20 +47,15 @@
- +
- +
- -
- -
- - checked="true" /> +
value="{{$data.id}}" /> diff --git a/service/Application/Admin/View/Default/AlipayLifeMenu/ContentIndex.html b/service/Application/Admin/View/Default/AlipayLifeMenu/ContentIndex.html new file mode 100755 index 000000000..b6fdd59a1 --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMenu/ContentIndex.html @@ -0,0 +1,185 @@ + + + +
+
+ + + {{:L('alipay_life_menu_content_title')}} + {{:L('common_operation_back')}} + + + + +
+ {{:L('common_operation_add')}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{:L('alipay_life_menu_name_text')}}{{:L('alipay_life_menu_action_type_text')}}{{:L('alipay_life_menu_action_value_text')}}{{:L('alipay_life_menu_icon_text')}}{{:L('common_more_name')}}{{:L('common_operation_name')}}
+ {{:L('common_on_fill_in_the_text')}}{{$v.name}} + + {{:L('common_on_fill_in_the_text')}}{{$v.action_type_name}} + + {{:L('common_on_fill_in_the_text')}}{{$v.action_value}} + + + + + + + {{:L('common_on_fill_in_images')}} + + + {{:L('common_see_more_name')}} +
+
+
+

{{:L('common_detail_content')}}

+ × +
+
+
+
{{:L('alipay_life_menu_name_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.name}}
+ +
{{:L('alipay_life_menu_action_type_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.action_type_name}}
+ +
{{:L('alipay_life_menu_action_value_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.action_value}}
+ +
{{:L('alipay_life_menu_icon_text')}}
+
+ + + + {{:L('common_on_fill_in_images')}} + +
+ +
{{:L('common_create_time_name')}}
+
{{$v.add_time}}
+ +
{{:L('common_upd_time_name')}}
+
{{$v.upd_time}}
+
+
+
+
+ 		+ + + + + + + +
+ {{:L('common_on_fill_in_the_text')}}{{$vs.name}} + + {{:L('common_on_fill_in_the_text')}}{{$vs.action_type_name}} + + {{:L('common_on_fill_in_the_text')}}{{$vs.action_value}} + + + + + + + {{:L('common_on_fill_in_images')}} + + + {{:L('common_see_more_name')}} +
+
+
+

{{:L('common_detail_content')}}

+ × +
+
+
+
{{:L('alipay_life_menu_name_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$vs.name}}
+ +
{{:L('alipay_life_menu_action_type_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$vs.action_type_name}}
+ +
{{:L('alipay_life_menu_action_value_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$vs.action_value}}
+ +
{{:L('alipay_life_menu_icon_text')}}
+
+ + + + {{:L('common_on_fill_in_images')}} + +
+ +
{{:L('common_create_time_name')}}
+
{{$vs.add_time}}
+ +
{{:L('common_upd_time_name')}}
+
{{$vs.upd_time}}
+
+
+
+
+ 		+ + + + + + + +
{{:L('common_not_data_tips')}}
+ +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMenu/ContentSaveInfo.html b/service/Application/Admin/View/Default/AlipayLifeMenu/ContentSaveInfo.html new file mode 100755 index 000000000..8b305b1e5 --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMenu/ContentSaveInfo.html @@ -0,0 +1,81 @@ + + + +
+
+ +
+ + + {{:L('alipay_life_menu_add_name')}} + {{:L('common_operation_back')}} + + + +
+ + +
+ + +
+ + {{$data.name}}" required /> +
+ +
+ + +
+ +
+ + {{$data.action_value}}" /> +
+ + +
+ + + {{$data.icon}}" required /> + +
+ + + + + + +
+ + +
+ + {{$data.sort}}0" required /> +
+ +
+ + + +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMenu/Detail.html b/service/Application/Admin/View/Default/AlipayLifeMenu/Detail.html new file mode 100644 index 000000000..cde0131c4 --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMenu/Detail.html @@ -0,0 +1,78 @@ + + + +
+
+ + + {{:L('alipay_life_menu_detail_text')}} + {{:L('common_operation_back')}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{:L('alipay_life_menu_life_text')}}{{:L('common_view_status_title')}}{{:L('alipay_life_menu_send_time_text')}}{{:L('alipay_life_menu_return_msg_text')}}{{:L('common_more_name')}}
{{$v.alipay_life_name}}{{$v.status_name}}{{$v.send_time}}{{$v.return_msg}} + {{:L('common_see_more_name')}} +
+
+
+

{{:L('common_detail_content')}}

+ × +
+
+
+
{{:L('alipay_life_menu_life_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.alipay_life_name}}
+ +
{{:L('common_view_status_title')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.status_name}}
+ +
{{:L('alipay_life_menu_send_time_text')}}
+
{{$v.send_time}}
+ +
{{:L('alipay_life_menu_return_msg_text')}}
+
{{$v.return_msg}}
+ +
{{:L('common_create_time_name')}}
+
{{$v.add_time}}
+ +
{{:L('common_upd_time_name')}}
+
{{$v.upd_time}}
+
+
+
+
+
{{:L('common_not_data_tips')}}
+ +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMenu/Index.html b/service/Application/Admin/View/Default/AlipayLifeMenu/Index.html new file mode 100755 index 000000000..0129e0385 --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMenu/Index.html @@ -0,0 +1,145 @@ + + + +
+
+ +
+
+ value="{{$params.keyword}}" /> + + + +
none"> + + +
+ value="{{$params.time_start}}"/> + ~ + value="{{$params.time_end}}"/> +
+
+
+
+ + + +
+ {{:L('common_operation_add')}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{:L('alipay_life_menu_name_text')}}{{:L('alipay_life_menu_type_text')}}{{:L('alipay_life_menu_life_text')}}{{:L('common_view_status_title')}}{{:L('common_more_name')}}{{:L('common_operation_name')}}
{{$v.name}}{{$v.type_name}}{{:implode('，', $v['alipay_life_all'])}}{{$v.status_name}} + {{:L('common_see_more_name')}} +
+
+
+

{{:L('common_detail_content')}}

+ × +
+
+
+
{{:L('alipay_life_menu_name_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.name}}
+ +
{{:L('alipay_life_menu_type_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.type_name}}
+ +
{{:L('alipay_life_menu_life_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{:implode('，', $v['alipay_life_all'])}}
+ +
{{:L('common_view_status_title')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.status_name}}
+ +
{{:L('alipay_life_menu_startup_time_text')}}
+
{{$v.startup_time}}
+ +
{{:L('alipay_life_menu_success_time_text')}}
+
{{$v.success_time}}
+ +
{{:L('common_create_time_name')}}
+
{{$v.add_time}}
+ +
{{:L('common_upd_time_name')}}
+
{{$v.upd_time}}
+
+
+
+
+ 		+ + + + + + + + + + + + + + + + + + + +
{{:L('common_not_data_tips')}}
+ + + + + {{$page_html}} + + +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMenu/SaveInfo.html b/service/Application/Admin/View/Default/AlipayLifeMenu/SaveInfo.html new file mode 100755 index 000000000..6e4ad374c --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMenu/SaveInfo.html @@ -0,0 +1,78 @@ + + + +
+
+ +
+ + + {{:L('alipay_life_menu_add_name')}} + {{:L('common_operation_back')}} + + +
+ + {{$data.name}}" required /> +
+ +
+ + +
+ + +
+ +
+ + + +
+
+ {{:implode(',', json_decode($data['alipay_life_ids'], true))}}" data-validation-message="{{:L('alipay_life_menu_life_format')}}" required /> +
+
{{:L('alipay_life_menu_optional_text')}}
+
    +
    {{:L('common_not_data_tips')}}
    +
+
+ +
+
{{:L('alipay_life_menu_selected_text')}}
+
    +
    none">{{:L('common_not_data_tips')}}
    + +
  • + {{$v.name}} + +
    • +     +
+
+
+
+ +
+ {{$params.id}}" /> + +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/ContentIndex.html b/service/Application/Admin/View/Default/AlipayLifeMessage/ContentIndex.html old mode 100644 new mode 100755 index f3246030f..9d167d307 --- a/service/Application/Admin/View/Default/AlipayLifeMessage/ContentIndex.html +++ b/service/Application/Admin/View/Default/AlipayLifeMessage/ContentIndex.html @@ -3,10 +3,12 @@
+ {{:L('alipay_life_message_content_title')}} {{:L('common_operation_back')}} + @@ -112,12 +114,6 @@ - - - - {{$page_html}} - -
diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/ContentSaveInfo.html b/service/Application/Admin/View/Default/AlipayLifeMessage/ContentSaveInfo.html old mode 100644 new mode 100755 index 4d6d63cd2..2a4b674c5 --- a/service/Application/Admin/View/Default/AlipayLifeMessage/ContentSaveInfo.html +++ b/service/Application/Admin/View/Default/AlipayLifeMessage/ContentSaveInfo.html @@ -29,7 +29,7 @@ {{$data.image_url}}" required /> - +
diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/Detail.html b/service/Application/Admin/View/Default/AlipayLifeMessage/Detail.html new file mode 100755 index 000000000..1a7544afe --- /dev/null +++ b/service/Application/Admin/View/Default/AlipayLifeMessage/Detail.html @@ -0,0 +1,83 @@ + + + +
+
+ + + {{:L('alipay_life_message_detail_text')}} + {{:L('common_operation_back')}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{:L('alipay_life_message_life_text')}}{{:L('alipay_life_message_user_text')}}{{:L('common_view_status_title')}}{{:L('alipay_life_message_send_time_text')}}{{:L('alipay_life_message_return_msg_text')}}{{:L('common_more_name')}}
{{$v.alipay_life_name}}{{$v.alipay_openid}}{{$v.status_name}}{{$v.send_time}}{{$v.return_msg}} + {{:L('common_see_more_name')}} +
+
+
+

{{:L('common_detail_content')}}

+ × +
+
+
+
{{:L('alipay_life_message_life_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.alipay_life_name}}
+ +
{{:L('alipay_life_message_user_text')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.alipay_openid}}
+ +
{{:L('common_view_status_title')}}
+
{{:L('common_on_fill_in_the_text')}}{{$v.status_name}}
+ +
{{:L('alipay_life_message_send_time_text')}}
+
{{$v.send_time}}
+ +
{{:L('alipay_life_message_return_msg_text')}}
+
{{$v.return_msg}}
+ +
{{:L('common_create_time_name')}}
+
{{$v.add_time}}
+ +
{{:L('common_upd_time_name')}}
+
{{$v.upd_time}}
+
+
+
+
+
{{:L('common_not_data_tips')}}
+ +
+
+ + + + + \ No newline at end of file diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html index 6fa54418c..9dc74f90c 100755 --- a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html +++ b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html @@ -6,7 +6,7 @@
- value="{{$params.keyword}}" /> + value="{{$params.keyword}}" />