diff --git a/application/admin/controller/Appcenternav.php b/application/admin/controller/Appcenternav.php new file mode 100755 index 000000000..444f04f32 --- /dev/null +++ b/application/admin/controller/Appcenternav.php @@ -0,0 +1,206 @@ +IsLogin(); + + // 权限校验 + $this->IsPower(); + } + + /** + * [Index 手机管理-首页导航列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + // 参数 + $params = input(); + + // 分页 + $number = MyC('admin_page_number', 10, true); + + // 条件 + $where = AppCenterNavService::AppCenterNavListWhere($params); + + // 获取总数 + $total = AppCenterNavService::AppCenterNavTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('admin/appcenternav/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + 'field' => '*', + ); + $data = AppCenterNavService::AppCenterNavList($data_params); + $this->assign('data_list', $data['data']); + + // 是否启用 + $this->assign('common_is_enable_list', lang('common_is_enable_list')); + + // 是否 + $this->assign('common_is_text_list', lang('common_is_text_list')); + + // 所属平台 + $this->assign('common_platform_type', lang('common_platform_type')); + + // app事件类型 + $this->assign('common_app_event_type', lang('common_app_event_type')); + + // 参数 + $this->assign('params', $params); + return $this->fetch(); + } + + /** + * [SaveInfo 添加/编辑页面] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-14T21:37:02+0800 + */ + public function SaveInfo() + { + // 参数 + $params = input(); + + // 数据 + $data = []; + if(!empty($params['id'])) + { + // 获取列表 + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id'=>intval($params['id'])], + 'field' => '*', + ); + $ret = AppCenterNavService::AppCenterNavList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; + } + $this->assign('data', $data); + + // 所属平台 + $this->assign('common_platform_type', lang('common_platform_type')); + + // app事件类型 + $this->assign('common_app_event_type', lang('common_app_event_type')); + + // 参数 + $this->assign('params', $params); + + // 编辑器文件存放地址 + $this->assign('editor_path_type', 'app_center_nav'); + + return $this->fetch(); + } + + /** + * [Save 手机管理-首页导航添加/编辑] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-14T21:37:02+0800 + */ + public function Save() + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + $params = input(); + return AppCenterNavService::AppCenterNavSave($params); + } + + /** + * [Delete 手机管理-首页导航删除] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + */ + public function Delete() + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + $params = input(); + $params['user_type'] = 'admin'; + return AppCenterNavService::AppCenterNavDelete($params); + } + + /** + * [StatusUpdate 状态更新] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-01-12T22:23:06+0800 + */ + public function StatusUpdate() + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + $params = input(); + return AppCenterNavService::AppCenterNavStatusUpdate($params); + } +} +?> \ No newline at end of file diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index 64c37367a..e69ddb3de 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; -use app\service\AppNavService; +use app\service\AppHomeNavService; /** * 手机管理-首页导航管理 @@ -56,10 +56,10 @@ class AppHomeNav extends Common $number = MyC('admin_page_number', 10, true); // 条件 - $where = AppNavService::AppHomeNavListWhere($params); + $where = AppHomeNavService::AppHomeNavListWhere($params); // 获取总数 - $total = AppNavService::AppHomeNavTotal($where); + $total = AppHomeNavService::AppHomeNavTotal($where); // 分页 $page_params = array( @@ -79,7 +79,7 @@ class AppHomeNav extends Common 'where' => $where, 'field' => '*', ); - $data = AppNavService::AppHomeNavList($data_params); + $data = AppHomeNavService::AppHomeNavList($data_params); $this->assign('data_list', $data['data']); // 是否启用 @@ -122,7 +122,7 @@ class AppHomeNav extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $ret = AppNavService::AppHomeNavList($data_params); + $ret = AppHomeNavService::AppHomeNavList($data_params); $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } $this->assign('data', $data); @@ -159,7 +159,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); - return AppNavService::AppHomeNavSave($params); + return AppHomeNavService::AppHomeNavSave($params); } /** @@ -180,7 +180,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); $params['user_type'] = 'admin'; - return AppNavService::AppHomeNavDelete($params); + return AppHomeNavService::AppHomeNavDelete($params); } /** @@ -200,7 +200,7 @@ class AppHomeNav extends Common // 开始处理 $params = input(); - return AppNavService::AppHomeNavStatusUpdate($params); + return AppHomeNavService::AppHomeNavStatusUpdate($params); } } ?> \ No newline at end of file diff --git a/application/admin/view/default/appcenternav/index.html b/application/admin/view/default/appcenternav/index.html new file mode 100755 index 000000000..318e17c59 --- /dev/null +++ b/application/admin/view/default/appcenternav/index.html @@ -0,0 +1,206 @@ +{{include file="public/header" /}} + + +
+
+ +
+
+
+ + + + +
+ +
+ + + + + + + + + + + + + + + +
+ 平台： + + + 类型： + +
+ 启用： + + + 时间： + + + + ~ + + + +
+ + 清除条件 +
+
+ + + +
+ 新增 +
+ + + + + + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + + + {{/foreach}} + {{/if}} + +
名称所属平台导航图标事件值启用更多操作
{{$v.name}}{{$v.platform_text}} + {{if !empty($v['images_url'])}} + + + + {{else /}} + 暂无图片 + {{/if}} + +
+ {{$v.event_value}} + {{if !empty($v['event_value'])}} +
{{$v.event_type_text}} + {{/if}} +
+ 		+ + + 查看更多 +
+
+
+

详情内容

+ × +
+
+
+
名称
+
{{$v.name}}
+ +
所属平台
+
{{$v.platform_text}}
+ +
导航图标
+
+ {{if !empty($v['images_url'])}} + + + + {{else /}} + 暂无图片 + {{/if}} +
+ +
事件值
+
+
+ {{$v.event_value}} + {{if !empty($v['event_value'])}} +
{{$v.event_type_text}} + {{/if}} +
+
+ +
启用
+
{{$v.is_enable_text}}
+ +
创建时间
+
{{$v.add_time_time}}
+ +
更新时间
+
{{$v.upd_time_time}}
+
+
+
+
+ 		+ + + + +
+ {{if empty($data_list)}} +
没有相关数据
+ {{/if}} + + + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} + +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/appcenternav/save_info.html b/application/admin/view/default/appcenternav/save_info.html new file mode 100755 index 000000000..64eb382d5 --- /dev/null +++ b/application/admin/view/default/appcenternav/save_info.html @@ -0,0 +1,91 @@ +{{include file="public/header" /}} + + +
+
+ +
+ + + {{if empty($data['id'])}} + 导航添加 + {{else /}} + 导航编辑 + {{/if}} + + 返回 + +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ +

+ WEB页面
   1.以http开头
   2.并在小程序后台加入白名单

内部页面(小程序/APP内部地址)
   1.小程序或APP内部地址
   2.小程序以/pages开始
   3.例如：/pages/user/user
   4.支持带参数 ?x=xx

跳转原生地图查看指定位置
   1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度
   2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843 +

+
+ + +
+ +
+ + +
+ +
+ +
    +
  • + + +
    • +
+
+上传图片
+
+
+ + +
+ +
+ + +
+
+ + +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html index 249005843..edf069dae 100755 --- a/application/admin/view/default/apphomenav/index.html +++ b/application/admin/view/default/apphomenav/index.html @@ -99,12 +99,12 @@ 名称 - 所属平台 + 所属平台 导航图标 - 事件值 - 登录 - 启用 - 创建时间 + 事件值 + 登录 + 启用 + 更多 操作 @@ -113,7 +113,7 @@ {{foreach $data_list as $v}} {{$v.name}} - {{$v.platform_text}} + {{$v.platform_text}}
{{if !empty($v['images_url'])}} @@ -125,7 +125,7 @@ {{/if}}
- + {{$v.event_value}} {{if !empty($v['event_value'])}}
{{$v.event_type_text}} @@ -137,7 +137,60 @@ - {{$v.add_time_time}} + + 查看更多 +
+
+
+

详情内容

+ × +
+
+
+
名称
+
{{$v.name}}
+ +
所属平台
+
{{$v.platform_text}}
+ +
导航图标
+
+
+ {{if !empty($v['images_url'])}} + + + + {{else /}} + 暂无图片 + {{/if}} +
+
+ +
事件值
+
+ {{$v.event_value}} + {{if !empty($v['event_value'])}} +
{{$v.event_type_text}} + {{/if}} +
+ +
登录
+
{{$v.is_need_login_text}}
+ +
启用
+
{{$v.is_enable_text}}
+ +
创建时间
+
{{$v.add_time_time}}
+ +
更新时间
+
{{$v.upd_time_time}}
+
+
+
+
+ diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 76814c33e..9ee0dadda 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -12,7 +12,7 @@ namespace app\api\controller; use app\service\GoodsService; use app\service\BannerService; -use app\service\AppNavService; +use app\service\AppHomeNavService; /** * 首页 @@ -46,7 +46,7 @@ class Index extends Common public function Index() { $result = [ - 'navigation' => AppNavService::AppHomeNav(), + 'navigation' => AppHomeNavService::AppHomeNav(), 'banner_list' => BannerService::Banner(), 'data_list' => GoodsService::HomeFloorList(), 'common_shop_notice' => MyC('common_shop_notice', null, true), diff --git a/application/api/controller/Navigation.php b/application/api/controller/Navigation.php index 5b5b34a28..8cc6eab80 100755 --- a/application/api/controller/Navigation.php +++ b/application/api/controller/Navigation.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- namespace app\api\controller; -use app\service\AppNavService; +use app\service\AppHomeNavService; /** * 导航 @@ -44,7 +44,7 @@ class Navigation extends Common public function Index() { // 获取轮播 - $data = AppNavService::AppHomeNav(); + $data = AppHomeNavService::AppHomeNav(); // 返回数据 return DataReturn('success', 0, $data); diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 8885e1a52..ba61600bc 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -14,6 +14,7 @@ use app\service\UserService; use app\service\OrderService; use app\service\GoodsService; use app\service\MessageService; +use app\service\AppCenterNavService; /** * 用户 @@ -282,7 +283,7 @@ class User extends Common 'user_goods_favor_count' => $user_goods_favor_count, 'user_goods_browse_count' => $user_goods_browse_count, 'common_message_total' => $common_message_total, - 'common_app_is_enable_answer' => (int) MyC('common_app_is_enable_answer', 0), + 'navigation' => AppCenterNavService::AppCenterNav(), ); // 返回数据 diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 6093cde9b..82db2ce3c 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -15,7 +15,7 @@ use app\service\BannerService; use app\service\GoodsService; use app\service\ArticleService; use app\service\OrderService; -use app\service\AppNavService; +use app\service\AppHomeNavService; /** * 首页 @@ -52,7 +52,7 @@ class Index extends Common $this->assign('banner_list', BannerService::Banner()); // H5导航 - $this->assign('navigation', AppNavService::AppHomeNav()); + $this->assign('navigation', AppHomeNavService::AppHomeNav()); // 楼层数据 $this->assign('goods_floor_list', GoodsService::HomeFloorList()); diff --git a/application/service/AppCenterNavService.php b/application/service/AppCenterNavService.php new file mode 100755 index 000000000..752a60267 --- /dev/null +++ b/application/service/AppCenterNavService.php @@ -0,0 +1,353 @@ +where($where)->order($order_by)->limit($m, $n)->select(); + if(!empty($data)) + { + $common_platform_type = lang('common_platform_type'); + $common_is_enable_tips = lang('common_is_enable_tips'); + $common_app_event_type = lang('common_app_event_type'); + foreach($data as &$v) + { + // 是否启用 + if(isset($v['is_enable'])) + { + $v['is_enable_text'] = $common_is_enable_tips[$v['is_enable']]['name']; + } + + // 平台类型 + if(isset($v['platform'])) + { + $v['platform_text'] = $common_platform_type[$v['platform']]['name']; + } + + // 事件类型 + if(isset($v['event_type']) && $v['event_type'] != -1) + { + $v['event_type_text'] = $common_app_event_type[$v['event_type']]['name']; + } + + // 图片地址 + if(isset($v['images_url'])) + { + $v['images_url_old'] = $v['images_url']; + $v['images_url'] = ResourcesService::AttachmentPathViewHandle($v['images_url']); + } + + // 时间 + if(isset($v['add_time'])) + { + $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); + $v['add_time_date'] = date('Y-m-d', $v['add_time']); + } + if(isset($v['upd_time'])) + { + $v['upd_time_time'] = date('Y-m-d H:i:s', $v['upd_time']); + $v['upd_time_date'] = date('Y-m-d', $v['upd_time']); + } + } + } + return DataReturn('处理成功', 0, $data); + } + + /** + * 用户中心导航总数 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-10T22:16:29+0800 + * @param [array] $where [条件] + */ + public static function AppCenterNavTotal($where) + { + return (int) Db::name('AppCenterNav')->where($where)->count(); + } + + /** + * 用户中心导航列表条件 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-29 + * @desc description + * @param [array] $params [输入参数] + */ + public static function AppCenterNavListWhere($params = []) + { + $where = []; + + if(!empty($params['keywords'])) + { + $where[] = ['name', 'like', '%'.$params['keywords'].'%']; + } + + // 是否更多条件 + if(isset($params['is_more']) && $params['is_more'] == 1) + { + // 等值 + if(isset($params['is_enable']) && $params['is_enable'] > -1) + { + + $where[] = ['is_enable', '=', intval($params['is_enable'])]; + } + if(isset($params['event_type']) && $params['event_type'] > -1) + { + $where[] = ['event_type', '=', intval($params['event_type'])]; + } + if(!empty($params['platform'])) + { + $where[]= ['platform', '=', $params['platform']]; + } + + if(!empty($params['time_start'])) + { + $where[] = ['add_time', '>', strtotime($params['time_start'])]; + } + if(!empty($params['time_end'])) + { + $where[] = ['add_time', '<', strtotime($params['time_end'])]; + } + } + + return $where; + } + + /** + * 用户中心导航数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-19 + * @desc description + * @param [array] $params [输入参数] + */ + public static function AppCenterNavSave($params = []) + { + // 请求类型 + $p = [ + [ + 'checked_type' => 'length', + 'key_name' => 'name', + 'checked_data' => '2,60', + 'error_msg' => '名称长度 2~60 个字符', + ], + [ + 'checked_type' => 'in', + 'key_name' => 'platform', + 'checked_data' => array_column(lang('common_platform_type'), 'value'), + 'error_msg' => '平台类型有误', + ], + [ + 'checked_type' => 'in', + 'key_name' => 'event_type', + 'checked_data' => array_column(lang('common_app_event_type'), 'value'), + 'is_checked' => 2, + 'error_msg' => '事件值类型有误', + ], + [ + 'checked_type' => 'length', + 'key_name' => 'event_value', + 'checked_data' => '255', + 'error_msg' => '事件值最多 255 个字符', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'images_url', + 'checked_data' => '255', + 'error_msg' => '请上传图片', + ], + [ + 'checked_type' => 'length', + 'key_name' => 'desc', + 'checked_data' => '18', + 'error_msg' => '描述最多 18 个字符', + ], + [ + 'checked_type' => 'length', + 'key_name' => 'sort', + 'checked_data' => '3', + 'error_msg' => '顺序 0~255 之间的数值', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 附件 + $data_fields = ['images_url']; + $attachment = ResourcesService::AttachmentParams($params, $data_fields); + + // 数据 + $data = [ + 'name' => $params['name'], + 'platform' => $params['platform'], + 'event_type' => isset($params['event_type']) ? intval($params['event_type']) : -1, + 'event_value' => $params['event_value'], + 'images_url' => $attachment['data']['images_url'], + 'desc' => empty($params['desc']) ? '' : $params['desc'], + 'sort' => intval($params['sort']), + 'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0, + ]; + + if(empty($params['id'])) + { + $data['add_time'] = time(); + if(Db::name('AppCenterNav')->insertGetId($data) > 0) + { + return DataReturn('添加成功', 0); + } + return DataReturn('添加失败', -100); + } else { + $data['upd_time'] = time(); + if(Db::name('AppCenterNav')->where(['id'=>intval($params['id'])])->update($data)) + { + return DataReturn('编辑成功', 0); + } + return DataReturn('编辑失败', -100); + } + } + + /** + * 用户中心导航删除 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function AppCenterNavDelete($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 删除操作 + if(Db::name('AppCenterNav')->where(['id'=>$params['id']])->delete()) + { + return DataReturn('删除成功'); + } + + return DataReturn('删除失败或资源不存在', -100); + } + + /** + * 用户中心导航状态更新 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + * @param [array] $params [输入参数] + */ + public static function AppCenterNavStatusUpdate($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'field', + 'error_msg' => '操作字段有误', + ], + [ + 'checked_type' => 'in', + 'key_name' => 'state', + 'checked_data' => [0,1], + 'error_msg' => '状态有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 数据更新 + if(Db::name('AppCenterNav')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state'])])) + { + return DataReturn('编辑成功'); + } + return DataReturn('编辑失败或数据未改变', -100); + } + + /** + * APP获取用户中心导航 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-11-19 + * @desc description + * @param array $params [description] + */ + public static function AppCenterNav($params = []) + { + $client_type = (APPLICATION_CLIENT_TYPE == 'pc') ? (IsMobile() ? 'h5' : 'pc') : APPLICATION_CLIENT_TYPE; + $data = Db::name('AppCenterNav')->field('id,name,images_url,event_value,event_type,desc')->where(['platform'=>$client_type, 'is_enable'=>1])->order('sort asc')->select(); + if(!empty($data)) + { + foreach($data as &$v) + { + $v['images_url_old'] = $v['images_url']; + $v['images_url'] = ResourcesService::AttachmentPathViewHandle($v['images_url']); + $v['event_value'] = empty($v['event_value']) ? null : $v['event_value']; + } + } + return $data; + } +} +?> \ No newline at end of file diff --git a/application/service/AppNavService.php b/application/service/AppHomeNavService.php similarity index 99% rename from application/service/AppNavService.php rename to application/service/AppHomeNavService.php index 401d0a2ed..04196a841 100755 --- a/application/service/AppNavService.php +++ b/application/service/AppHomeNavService.php @@ -14,13 +14,13 @@ use think\Db; use app\service\ResourcesService; /** - * APP导航服务层 + * APP首页导航服务层 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class AppNavService +class AppHomeNavService { /** * 首页导航列表 diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 0741d5d79..2261e5e26 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -61,7 +61,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - request_url: 'http://test.shopxo.net/', + //request_url: 'http://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/alipay/images/user-nav-address-icon.png b/public/appmini/old/alipay/images/user-nav-address-icon.png deleted file mode 100755 index dfcf810c5..000000000 Binary files a/public/appmini/old/alipay/images/user-nav-address-icon.png and /dev/null differ diff --git a/public/appmini/old/alipay/images/user-nav-answer-icon.png b/public/appmini/old/alipay/images/user-nav-answer-icon.png deleted file mode 100755 index 37539afa9..000000000 Binary files a/public/appmini/old/alipay/images/user-nav-answer-icon.png and /dev/null differ diff --git a/public/appmini/old/alipay/images/user-nav-cache-icon.png b/public/appmini/old/alipay/images/user-nav-cache-icon.png old mode 100755 new mode 100644 index 782ff89de..307071a03 Binary files a/public/appmini/old/alipay/images/user-nav-cache-icon.png and b/public/appmini/old/alipay/images/user-nav-cache-icon.png differ diff --git a/public/appmini/old/alipay/images/user-nav-customer-service-icon.png b/public/appmini/old/alipay/images/user-nav-customer-service-icon.png old mode 100755 new mode 100644 index 53750e55c..7313d6c97 Binary files a/public/appmini/old/alipay/images/user-nav-customer-service-icon.png and b/public/appmini/old/alipay/images/user-nav-customer-service-icon.png differ diff --git a/public/appmini/old/alipay/images/user-nav-faovr-icon.png b/public/appmini/old/alipay/images/user-nav-faovr-icon.png deleted file mode 100755 index 9d3edcab1..000000000 Binary files a/public/appmini/old/alipay/images/user-nav-faovr-icon.png and /dev/null differ diff --git a/public/appmini/old/alipay/images/user-nav-order-icon.png b/public/appmini/old/alipay/images/user-nav-order-icon.png old mode 100755 new mode 100644 index 14725a888..525142b06 Binary files a/public/appmini/old/alipay/images/user-nav-order-icon.png and b/public/appmini/old/alipay/images/user-nav-order-icon.png differ diff --git a/public/appmini/old/alipay/pages/user/user.axml b/public/appmini/old/alipay/pages/user/user.axml index 7290a3fd3..0e4ceb65a 100755 --- a/public/appmini/old/alipay/pages/user/user.axml +++ b/public/appmini/old/alipay/pages/user/user.axml @@ -49,6 +49,17 @@ + + + + + + {{item.name}} + {{item.desc}} + + + + 清除缓存 diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js index d430c7212..54dec941c 100644 --- a/public/appmini/old/alipay/pages/user/user.js +++ b/public/appmini/old/alipay/pages/user/user.js @@ -24,26 +24,11 @@ Page({ icon: "user-nav-order-icon", is_show: 1, name: "我的订单", - }, - { - url: "user-address", - icon: "user-nav-address-icon", - is_show: 1, - name: "我的地址" - }, - { - url: "user-faovr", - icon: "user-nav-faovr-icon", - is_show: 1, - name: "我的收藏" - }, - { - url: "user-answer-list", - icon: "user-nav-answer-icon", - is_show: 1, - name: "我的留言" } - ] + ], + + // 远程自定义导航 + navigation: [], }, onShow() { @@ -122,7 +107,7 @@ Page({ nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, - 'nav_lists[3].is_show': (data.common_app_is_enable_answer == 1) ? 1 : 0, + navigation: data.navigation || [], }); } else { my.showToast({ @@ -183,4 +168,9 @@ Page({ user_avatar_error(e) { this.setData({avatar: app.data.default_user_head_src}); }, + + // 远程自定义导航事件 + navigation_event(e) { + app.operation_event(e); + }, }); diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index c0a6d50ce..4188557f1 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -61,7 +61,7 @@ App({ // 请求地址 // request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - request_url: 'https://test.shopxo.net/', + //request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/images/user-nav-address-icon.png b/public/appmini/old/weixin/images/user-nav-address-icon.png deleted file mode 100755 index dfcf810c5..000000000 Binary files a/public/appmini/old/weixin/images/user-nav-address-icon.png and /dev/null differ diff --git a/public/appmini/old/weixin/images/user-nav-answer-icon.png b/public/appmini/old/weixin/images/user-nav-answer-icon.png deleted file mode 100755 index 37539afa9..000000000 Binary files a/public/appmini/old/weixin/images/user-nav-answer-icon.png and /dev/null differ diff --git a/public/appmini/old/weixin/images/user-nav-cache-icon.png b/public/appmini/old/weixin/images/user-nav-cache-icon.png old mode 100755 new mode 100644 index 782ff89de..307071a03 Binary files a/public/appmini/old/weixin/images/user-nav-cache-icon.png and b/public/appmini/old/weixin/images/user-nav-cache-icon.png differ diff --git a/public/appmini/old/weixin/images/user-nav-customer-service-icon.png b/public/appmini/old/weixin/images/user-nav-customer-service-icon.png old mode 100755 new mode 100644 index 53750e55c..7313d6c97 Binary files a/public/appmini/old/weixin/images/user-nav-customer-service-icon.png and b/public/appmini/old/weixin/images/user-nav-customer-service-icon.png differ diff --git a/public/appmini/old/weixin/images/user-nav-faovr-icon.png b/public/appmini/old/weixin/images/user-nav-faovr-icon.png deleted file mode 100755 index 9d3edcab1..000000000 Binary files a/public/appmini/old/weixin/images/user-nav-faovr-icon.png and /dev/null differ diff --git a/public/appmini/old/weixin/images/user-nav-order-icon.png b/public/appmini/old/weixin/images/user-nav-order-icon.png old mode 100755 new mode 100644 index 14725a888..525142b06 Binary files a/public/appmini/old/weixin/images/user-nav-order-icon.png and b/public/appmini/old/weixin/images/user-nav-order-icon.png differ diff --git a/public/appmini/old/weixin/pages/user/user.js b/public/appmini/old/weixin/pages/user/user.js index 4359ba8c8..4cd7ed1b5 100755 --- a/public/appmini/old/weixin/pages/user/user.js +++ b/public/appmini/old/weixin/pages/user/user.js @@ -22,28 +22,12 @@ Page({ { url: "user-order", icon: "user-nav-order-icon", - is_show: 1, name: "我的订单", - }, - { - url: "user-address", - icon: "user-nav-address-icon", - is_show: 1, - name: "我的地址" - }, - { - url: "user-faovr", - icon: "user-nav-faovr-icon", - is_show: 1, - name: "我的收藏" - }, - { - url: "user-answer-list", - icon: "user-nav-answer-icon", - is_show: 1, - name: "我的留言" } - ] + ], + + // 远程自定义导航 + navigation: [], }, onShow() { @@ -121,7 +105,7 @@ Page({ nickname: (data.nickname != null) ? data.nickname : this.data.nickname, message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total, head_nav_list: temp_head_nav_list, - 'nav_lists[3].is_show': (data.common_app_is_enable_answer == 1) ? 1 : 0, + navigation: data.navigation || [], }); } else { app.showToast(res.data.msg); @@ -170,4 +154,9 @@ Page({ user_avatar_error(e) { this.setData({avatar: app.data.default_user_head_src}); }, + + // 远程自定义导航事件 + navigation_event(e) { + app.operation_event(e); + }, }); diff --git a/public/appmini/old/weixin/pages/user/user.wxml b/public/appmini/old/weixin/pages/user/user.wxml index 4a54296ae..d02ea71b4 100755 --- a/public/appmini/old/weixin/pages/user/user.wxml +++ b/public/appmini/old/weixin/pages/user/user.wxml @@ -28,14 +28,12 @@ - - - - - {{item.name}} - - - + + + + {{item.name}} + + @@ -51,6 +49,17 @@ + + + + + + {{item.name}} + {{item.desc}} + + + + 清除缓存 diff --git a/public/appmini/old/weixin/pages/user/user.wxss b/public/appmini/old/weixin/pages/user/user.wxss index fde309e31..088bebd15 100755 --- a/public/appmini/old/weixin/pages/user/user.wxss +++ b/public/appmini/old/weixin/pages/user/user.wxss @@ -63,6 +63,11 @@ margin-left: 20rpx; vertical-align: middle; } +.nav-box .nav-item .item-desc { + margin-right: 50rpx; + margin-top: 2rpx; + width: calc(100% - 300rpx); +} .nav-box .nav-item .item-arrow { width: 25rpx; } diff --git a/public/static/admin/default/css/appcenternav.css b/public/static/admin/default/css/appcenternav.css new file mode 100755 index 000000000..54ea293a1 --- /dev/null +++ b/public/static/admin/default/css/appcenternav.css @@ -0,0 +1,19 @@ +/** + * 列表 + */ +.form-keyword { width: 55% !important; display: initial !important; } +.more-submit input { display: none; } +.param-where, .param-date input { display: initial !important; } +@media only screen and (max-width: 641px) { + .param-where { width: 100% !important; margin-left: 0px !important; } + .param-date input { width: 47% !important; } +} +@media only screen and (min-width: 641px) { + .param-where { width: 32% !important; float: left; } + .param-date input { width: 45% !important; } + .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; } +} +@media only screen and (max-width: 321px) { + .view-operation button { margin: 2px 0px; } +} +.event-value { max-width: 260px; word-wrap: break-word; word-break: break-all; } \ No newline at end of file diff --git a/public/static/upload/images/app_center_nav/2019/07/03/1562157390405145.png b/public/static/upload/images/app_center_nav/2019/07/03/1562157390405145.png new file mode 100644 index 000000000..056b0c087 Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/07/03/1562157390405145.png differ diff --git a/public/static/upload/images/app_center_nav/2019/07/03/1562157391428293.png b/public/static/upload/images/app_center_nav/2019/07/03/1562157391428293.png new file mode 100644 index 000000000..f806cf7db Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/07/03/1562157391428293.png differ diff --git a/public/static/upload/images/app_center_nav/2019/07/03/1562157391517979.png b/public/static/upload/images/app_center_nav/2019/07/03/1562157391517979.png new file mode 100644 index 000000000..f040f7db3 Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/07/03/1562157391517979.png differ diff --git a/public/static/upload/images/app_center_nav/2019/07/03/1562157391533252.png b/public/static/upload/images/app_center_nav/2019/07/03/1562157391533252.png new file mode 100644 index 000000000..af11496db Binary files /dev/null and b/public/static/upload/images/app_center_nav/2019/07/03/1562157391533252.png differ