diff --git a/application/index/controller/User.php b/application/index/controller/User.php index fd3836f846339da567ab6428b8437c85eeace5c0..61465d90b289493301d72f8af636c064bcf958e6 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -139,8 +139,8 @@ class User extends Common $this->assign('goods_browse_list', $data['data']); // 订单页面订单状态form key - $this->assign('form_search_order_status_form_key', 'f2p'); - $this->assign('form_search_order_user_is_comments_form_key', 'f21p'); + $this->assign('form_search_order_status_form_key', 'status'); + $this->assign('form_search_order_user_is_comments_form_key', 'user_is_comments'); // 钩子 $this->PluginsHook(); diff --git a/application/module/FormHandleModule.php b/application/module/FormHandleModule.php index 63e919868dab8439d0d1e192d2a3486413ff3188..24312eb0421448a781bb9f4df3e2cd12b99cfb88 100644 --- a/application/module/FormHandleModule.php +++ b/application/module/FormHandleModule.php @@ -373,6 +373,13 @@ class FormHandleModule $form_key = $fk.'p'; $v['form_key'] = $form_key; + // 是否指定了数据/表单唯一key作为条件、则复制当前key数据 + // 用于根据key指定条件(指定不宜使用这里拼接的key) + if(array_key_exists($form_name, $this->out_params) && $this->out_params[$form_name] !== null && $this->out_params[$form_name] !== '') + { + $this->out_params[$form_key] = $this->out_params[$form_name]; + } + // 根据组件类型处理 switch($v['search_config']['form_type']) { diff --git a/changelog.txt b/changelog.txt index cadf1f72232433edd36ea7cfe128c4a481929099..025cbe2446982d8800e8ac99f44c13b13379da3b 100755 --- a/changelog.txt +++ b/changelog.txt @@ -15,6 +15,7 @@ web端 5. 分页组件新增自定义页码跳转 6. 后端动态表格数据列表组件优化高度固定 7. 首页轮播左侧商品分类和右侧聚合内容新增开关控制 + 8. 动态表格数据列表自定义条件bug修复 小程序 1. 支付订单0金额错误修复