diff --git a/application/admin/controller/Answer.php b/application/admin/controller/Answer.php index 7648b3dda..67a3f0065 100755 --- a/application/admin/controller/Answer.php +++ b/application/admin/controller/Answer.php @@ -53,7 +53,7 @@ class Answer extends Common $params = input(); // 分页 - $number = 10; + $number = MyC('admin_page_number', 10, true); // 条件 $where = AnswerService::AnswerListWhere($params); diff --git a/application/common.php b/application/common.php index be5a6fc3e..695926d8a 100755 --- a/application/common.php +++ b/application/common.php @@ -242,10 +242,12 @@ function MyUrl($path, $params=[]) */ function PluginsHomeUrl($plugins_name, $plugins_control, $plugins_action, $params=[]) { - $params['pluginsname'] = $plugins_name; - $params['pluginscontrol'] = $plugins_control; - $params['pluginsaction'] = $plugins_action; - $url = url('index/plugins/index', $params, true, true); + $plugins = [ + 'pluginsname' => $plugins_name, + 'pluginscontrol' => $plugins_control, + 'pluginsaction' => $plugins_action, + ]; + $url = url('index/plugins/index', $plugins+$params, true, true); // 是否根目录访问项目 if(defined('IS_ROOT_ACCESS')) @@ -270,10 +272,12 @@ function PluginsHomeUrl($plugins_name, $plugins_control, $plugins_action, $param */ function PluginsAdminUrl($plugins_name, $plugins_control, $plugins_action, $params=[]) { - $params['pluginsname'] = $plugins_name; - $params['pluginscontrol'] = $plugins_control; - $params['pluginsaction'] = $plugins_action; - $url = url('admin/plugins/index', $params, true, true); + $plugins = [ + 'pluginsname' => $plugins_name, + 'pluginscontrol' => $plugins_control, + 'pluginsaction' => $plugins_action, + ]; + $url = url('admin/plugins/index', $plugins+$params, true, true); // 是否根目录访问项目 if(defined('IS_ROOT_ACCESS')) diff --git a/application/index/controller/Answer.php b/application/index/controller/Answer.php new file mode 100755 index 000000000..e7d7ef248 --- /dev/null +++ b/application/index/controller/Answer.php @@ -0,0 +1,95 @@ +IsLogin(); + } + + /** + * 问答/留言列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-28 + * @desc description + */ + public function Index() + { + // 参数 + $params = input(); + $params['user'] = $this->user; + + // 分页 + $number = 10; + + // 条件 + $where = AnswerService::AnswerListWhere($params); + + // 获取总数 + $total = AnswerService::AnswerTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('admin/answer/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = AnswerService::AnswerList($data_params); + $this->assign('data_list', $data['data']); + + // 状态 + $this->assign('common_is_show_list', lang('common_is_show_list')); + + // 是否 + $this->assign('common_is_text_list', lang('common_is_text_list')); + + // 参数 + $this->assign('params', $params); + return $this->fetch(); + } + +} +?> \ No newline at end of file diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php index dd95bc78c..4a217880d 100755 --- a/application/index/lang/zh-cn.php +++ b/application/index/lang/zh-cn.php @@ -94,6 +94,13 @@ return array( 'is_show' => 1, 'icon' => 'am-icon-lastfm', ), + array( + 'control' => 'answer', + 'action' => 'index', + 'name' => '问答/留言', + 'is_show' => 1, + 'icon' => 'am-icon-question', + ), array( 'control' => 'user', 'action' => 'logout', diff --git a/application/index/view/default/answer/index.html b/application/index/view/default/answer/index.html new file mode 100755 index 000000000..c46df43a5 --- /dev/null +++ b/application/index/view/default/answer/index.html @@ -0,0 +1,129 @@ +{{include file="public/header" /}} + + +{{include file="public/header_top_nav" /}} + + +{{include file="public/nav_search" /}} + + +{{include file="public/header_nav" /}} + + +{{include file="public/goods_category" /}} + + +
+ + + {{include file="public/user_menu" /}} + + + +
+
+
+
+
+ + + + +
+ +
+ + + + + + + + + + +
+ 显示： + + + 状态： + +
+ + 清除条件 +
+
+ + +
+ + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
姓名电话内容回复是否显示时间
{{$v.name}}{{$v.tel}}{{$v.content}} + {{if $v['is_reply'] eq 1}} + {{$v.reply}} + {{else /}} + 未回复 + {{/if}} + {{$v.is_show_text}}{{$v.add_time}}
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+ +
+ + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/index/view/default/message/index.html b/application/index/view/default/message/index.html index 21c424fcb..cfbce7f25 100755 --- a/application/index/view/default/message/index.html +++ b/application/index/view/default/message/index.html @@ -83,7 +83,7 @@ - +
diff --git a/application/index/view/default/userintegral/index.html b/application/index/view/default/userintegral/index.html index 0f54124a7..45eac4992 100755 --- a/application/index/view/default/userintegral/index.html +++ b/application/index/view/default/userintegral/index.html @@ -59,7 +59,7 @@
- +
diff --git a/application/plugins/answers/Hook.php b/application/plugins/answers/Hook.php index 502854699..2fa9566ca 100644 --- a/application/plugins/answers/Hook.php +++ b/application/plugins/answers/Hook.php @@ -1,4 +1,13 @@ fetch('../../../plugins/view/answers/index/index'); } + /** + * 详情入口 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-07 + * @desc description + * @param [array] $params [输入参数] + */ + public function detail($params = []) + { + // 基础数据 + $base = PluginsService::PluginsData('answers', ['images']); + $this->assign('plugins_answers_data', isset($base['data']) ? $base['data'] : []); + + // 商品数据 + $goods = Service::GoodsList(); + $this->assign('plugins_answers_goods_list', $goods['data']['goods']); + + // 推荐问答 + if(!empty($base['data']['category_ids'])) + { + $answers = Service::AnswerList(['n'=>100, 'category_ids'=> $base['data']['category_ids']]); + $this->assign('plugins_answers_rc_list', $answers['data']); + } else { + $this->assign('plugins_answers_rc_list', []); + } + + // 获取问答数据 + $detail = Service::AnswerRow($params); + $this->assign('plugins_answers_detail', $detail); + + return $this->fetch('../../../plugins/view/answers/index/detail'); + } + /** * 提问 * @author Devil diff --git a/application/plugins/answers/Service.php b/application/plugins/answers/Service.php index 4d056a3e6..c5a3c63e3 100644 --- a/application/plugins/answers/Service.php +++ b/application/plugins/answers/Service.php @@ -349,5 +349,45 @@ class Service ); return AnswerService::AnswerList($data_params); } + + /** + * 获取一条问答 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + * @param [array] $params [输入参数] + */ + public static function AnswerRow($params = []) + { + // 参数 + if(empty($params['id'])) + { + return DataReturn('问答id有误', -1); + } + // 条件 + $where = [ + ['is_delete_time', '=', 0], + ['is_show', '=', 1], + ['id', '=', intval($params['id'])], + ]; + + // 字段 + $field = 'content,reply,is_reply,add_time'; + + // 获取列表 + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => $where, + 'field' => $field, + ); + $ret = AnswerService::AnswerList($data_params); + if(isset($ret['data'][0])) + { + $ret['data'] = $ret['data'][0]; + } + return $ret; + } } ?> \ No newline at end of file diff --git a/application/plugins/view/answers/index/detail.html b/application/plugins/view/answers/index/detail.html new file mode 100644 index 000000000..00b31b773 --- /dev/null +++ b/application/plugins/view/answers/index/detail.html @@ -0,0 +1,111 @@ +{{include file="public/header" /}} + + +{{include file="public/header_top_nav" /}} + + +{{include file="public/nav_search" /}} + + +{{include file="public/header_nav" /}} + + +{{include file="public/goods_category" /}} + + +
+ +
+ {{if isset($plugins_answers_detail['code']) and $plugins_answers_detail['code'] eq 0}} + {{if !empty($plugins_answers_detail['data']['content'])}} +
+

{{$plugins_answers_detail.data.content}}

+

{{$plugins_answers_detail.data.add_time_date}}

+
+
+
+ {{if isset($plugins_answers_detail['data']['is_reply']) and $plugins_answers_detail['data']['is_reply'] eq 1}} + 已回答 + {{$plugins_answers_detail.data.reply}} + {{else /}} + 待回答 + {{/if}} +
+
+ {{else /}} +
没有相关数据
+ {{/if}} + {{else /}} +
{{$plugins_answers_detail.msg}}
+ {{/if}} +
+ + +
+ +
+ 我要提问 + 我的提问 +
+ + +
+
+

+ {{if empty($plugins_answers_data['right_top_rec_name'])}} + 推荐问答 + {{else /}} + {{$plugins_answers_data.right_top_rec_name}} + {{/if}} +

+
+
+ {{if !empty($plugins_answers_rc_list)}} +
    + {{foreach $plugins_answers_rc_list as $answers}} +
  • + {{$answers.content}} + {{$answers.add_time_date}} +
    • + {{/foreach}} +
+ {{/if}} +
+
+ + +
+
+

+ {{if empty($plugins_answers_data['right_top_goods_name'])}} + 推荐商品 + {{else /}} + {{$plugins_answers_data.right_top_goods_name}} + {{/if}} +

+
+ {{if !empty($plugins_answers_goods_list)}} + + {{/if}} +
+
+ + + {{include file="../../../plugins/view/answers/index/popup" /}} +
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/answers/index/index.html b/application/plugins/view/answers/index/index.html index 2aef80042..0ea11c573 100644 --- a/application/plugins/view/answers/index/index.html +++ b/application/plugins/view/answers/index/index.html @@ -22,14 +22,14 @@ @@ -41,12 +41,12 @@
- 我要提问 - 我的提问 + 我要提问 + 我的提问
-
+

{{if empty($plugins_answers_data['right_top_rec_name'])}} @@ -61,8 +61,8 @@ @@ -98,7 +98,7 @@

- -
-
-
-

提问

- × -
-
-
-
- - -
-
- - -
-
- - -
-
- -
- -
-
-
+ + {{include file="../../../plugins/view/answers/index/popup" /}}
diff --git a/application/plugins/view/answers/index/popup.html b/application/plugins/view/answers/index/popup.html new file mode 100644 index 000000000..018c5d95b --- /dev/null +++ b/application/plugins/view/answers/index/popup.html @@ -0,0 +1,27 @@ +
+
+
+

提问

+ × +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
\ No newline at end of file diff --git a/application/service/AnswerService.php b/application/service/AnswerService.php index 31cdfdaf6..92345b88c 100755 --- a/application/service/AnswerService.php +++ b/application/service/AnswerService.php @@ -135,6 +135,10 @@ class AnswerService { $where[] = ['is_show', '=', intval($params['is_show'])]; } + if(isset($params['is_reply']) && $params['is_reply']> -1) + { + $where[] = ['is_reply', '=', intval($params['is_reply'])]; + } if(!empty($params['time_start'])) { diff --git a/config/shopxo.sql b/config/shopxo.sql index 35c2b26de..dbea096db 100755 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 03/07/2019 18:27:27 PM + Date: 03/08/2019 17:36:16 PM */ SET NAMES utf8mb4; @@ -69,7 +69,7 @@ CREATE TABLE `s_answer` ( -- Records of `s_answer` -- ---------------------------- BEGIN; -INSERT INTO `s_answer` VALUES ('1', '0', '测试名字', '1322222222', '请问新版本什么时候发布呀？非常期待哦~', '', '0', '1', '0', '1551941748', '0'), ('2', '0', 'test', '13555555555', '男女薪酬差距过大，你怎么看？', '很正常的现象，毕竟大多数人是拖后腿的。\n\n女性工资高于男性的有，但是就平均来讲，却是另一种情况。原因就在于岗位不同，自然薪酬就不一样。女性由于身体各方面条件的限制，可以说是选择工作岗位比男性少了不少，女性可以做销售，可以做文职，当然也可以做互联网，但是有的女生身体素质不太适用于熬夜加班，毕竟女生担当了生儿育女这一项风险极大的活动，自然受到很多的限制，所以在岗位的选择，工作时间的适应上，女性并不占优势，薪酬的比例自然就降低了。', '1', '1', '0', '1551948802', '1551948854'), ('3', '0', '测试2', '13444556666', '为什么电影《绿皮书》三天票房能破亿？', '', '0', '1', '0', '1551948896', '0'), ('4', '0', '测试3', '13222666666', '詹姆斯总得分超乔丹，怎么评价这一纪录？', '', '0', '1', '0', '1551948947', '0'), ('5', '0', '测试5', '13222335555', '植物奶油和动物奶油的区别是？', '', '0', '1', '0', '1551948985', '0'), ('6', '0', '测试6', '13222333333', '既然彩虹是圆形的，那为什么我们看到的都是拱形的?', '', '0', '1', '0', '1551949040', '0'), ('7', '0', '测试7', '13277888888', '给我家孩子投一票”，绑架了近一半人的朋友圈', '', '0', '1', '0', '1551949065', '0'), ('8', '0', '测试8', '13233222222', '秃如其来的年轻人，这是怎么了？', '', '0', '1', '0', '1551949100', '0'), ('9', '0', '测试的', '13445555555', '小学生异地转学籍需要什么手续？', '', '0', '1', '0', '1551949178', '0'), ('10', '0', '测试a', '13222112222', '巴厘岛旅游出入境及免签流程？', '', '0', '1', '0', '1551949200', '0'), ('11', '0', 'cessss', '13444555555', '日常生活中哪些物品需要缴纳消费税？', '', '0', '1', '0', '1551949219', '0'), ('12', '0', 'tttstt', '13566666666', '申请更换机动车车身颜色需要办理哪些手续？', '', '0', '1', '0', '1551949243', '0'), ('13', '0', 'ttvvvkkkk', '13555666666', '房产税与契税有什么区别?', '', '0', '1', '0', '1551949326', '0'), ('14', '0', 'Cesd', '13566666666', '家庭聚会时，可以做哪些自制饮料？', '', '0', '1', '0', '1551949382', '0'), ('15', '0', '测试的订', '13455667777', '一个狗喝了我家的洗手盆里的水，水扔了，洗手盆还能用吗？会不会感染病？', '', '0', '1', '0', '1551949425', '0'), ('16', '0', 'rrttt', '13455667777', '古代中国朴素唯物主义自然观有哪些作用?', '', '0', '1', '0', '1551949762', '0'), ('17', '0', '你好', '13455666666', '一部耽美漫画男主家穷从小就去了攻的家里作为玩具陪伴攻受长大回到家里攻搅黄受家里的生意让受再回到身边', '', '0', '1', '0', '1551949840', '0'), ('18', '0', '122天天', '13455555555', '6吨粮食酒里加20公斤冰糖可以吗？', '', '0', '1', '0', '1551949870', '0'), ('19', '0', 'v看见', '13455222222', '単位与个人无解除劳动关系手续转入社保个人窗口合法吗', '', '0', '1', '0', '1551949947', '0'), ('20', '77', '', '', '如果你是汉献帝被挟曹操天子以令诸侯你会怎么做？', '', '0', '1', '0', '1551954351', '0'); +INSERT INTO `s_answer` VALUES ('1', '0', '测试名字', '1322222222', '请问新版本什么时候发布呀？非常期待哦~', '', '0', '1', '0', '1551941748', '0'), ('2', '77', 'test', '13555555555', '男女薪酬差距过大，你怎么看？', '很正常的现象，毕竟大多数人是拖后腿的。\n\n女性工资高于男性的有，但是就平均来讲，却是另一种情况。原因就在于岗位不同，自然薪酬就不一样。女性由于身体各方面条件的限制，可以说是选择工作岗位比男性少了不少，女性可以做销售，可以做文职，当然也可以做互联网，但是有的女生身体素质不太适用于熬夜加班，毕竟女生担当了生儿育女这一项风险极大的活动，自然受到很多的限制，所以在岗位的选择，工作时间的适应上，女性并不占优势，薪酬的比例自然就降低了。', '1', '1', '0', '1551948802', '1551948854'), ('3', '0', '测试2', '13444556666', '为什么电影《绿皮书》三天票房能破亿？', '', '0', '1', '0', '1551948896', '0'), ('4', '0', '测试3', '13222666666', '詹姆斯总得分超乔丹，怎么评价这一纪录？', '', '0', '1', '0', '1551948947', '0'), ('5', '0', '测试5', '13222335555', '植物奶油和动物奶油的区别是？', '', '0', '1', '0', '1551948985', '0'), ('6', '0', '测试6', '13222333333', '既然彩虹是圆形的，那为什么我们看到的都是拱形的?', '', '0', '1', '0', '1551949040', '0'), ('7', '0', '测试7', '13277888888', '给我家孩子投一票”，绑架了近一半人的朋友圈', '', '0', '1', '0', '1551949065', '0'), ('8', '0', '测试8', '13233222222', '秃如其来的年轻人，这是怎么了？', '', '0', '1', '0', '1551949100', '0'), ('9', '0', '测试的', '13445555555', '小学生异地转学籍需要什么手续？', '', '0', '1', '0', '1551949178', '0'), ('10', '0', '测试a', '13222112222', '巴厘岛旅游出入境及免签流程？', '', '0', '1', '0', '1551949200', '0'), ('11', '0', 'cessss', '13444555555', '日常生活中哪些物品需要缴纳消费税？', '', '0', '1', '0', '1551949219', '0'), ('12', '0', 'tttstt', '13566666666', '申请更换机动车车身颜色需要办理哪些手续？', '', '0', '1', '0', '1551949243', '0'), ('13', '0', 'ttvvvkkkk', '13555666666', '房产税与契税有什么区别?', '', '0', '1', '0', '1551949326', '0'), ('14', '0', 'Cesd', '13566666666', '家庭聚会时，可以做哪些自制饮料？', '', '0', '1', '0', '1551949382', '0'), ('15', '0', '测试的订', '13455667777', '一个狗喝了我家的洗手盆里的水，水扔了，洗手盆还能用吗？会不会感染病？', '', '0', '1', '0', '1551949425', '0'), ('16', '0', 'rrttt', '13455667777', '古代中国朴素唯物主义自然观有哪些作用?', '', '0', '1', '0', '1551949762', '0'), ('17', '0', '你好', '13455666666', '一部耽美漫画男主家穷从小就去了攻的家里作为玩具陪伴攻受长大回到家里攻搅黄受家里的生意让受再回到身边', '', '0', '1', '0', '1551949840', '0'), ('18', '7', '122天天', '13455555555', '6吨粮食酒里加20公斤冰糖可以吗？', '', '0', '1', '0', '1551949870', '0'), ('19', '77', 'v看见', '13455222222', '単位与个人无解除劳动关系手续转入社保个人窗口合法吗', '', '0', '1', '0', '1551949947', '0'), ('20', '77', '', '', '如果你是汉献帝被挟曹操天子以令诸侯你会怎么做？', '', '0', '1', '0', '1551954351', '0'); COMMIT; -- ---------------------------- @@ -615,7 +615,7 @@ CREATE TABLE `s_message` ( -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551952686'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'); COMMIT; -- ---------------------------- @@ -1112,13 +1112,13 @@ CREATE TABLE `s_search_history` ( `ymd` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '日期 ymd', `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'); +INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'); COMMIT; -- ---------------------------- diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 17dccbd1d..2fbd0d114 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -79,7 +79,8 @@ iframe { width: 100%; height: 100%; border: 0; } background: #f6f9fc; } form.am-form .am-form-group, .plug-images-list, .goods-specifications, .content-app-items, .plug-file-upload-view { - border-bottom: 1px dotted #DFE4EA; + border-bottom: 1px dashed transparent; + background: linear-gradient(white,white) padding-box, repeating-linear-gradient(-45deg, #ccc 0, #ccc 0.25em, white 0, white 0.5em); padding: 10px 20% 10px 5px; } .am-popup form.am-form .am-form-group { diff --git a/public/static/index/default/css/answer.css b/public/static/index/default/css/answer.css new file mode 100755 index 000000000..528be271a --- /dev/null +++ b/public/static/index/default/css/answer.css @@ -0,0 +1,37 @@ +/* 筛选 */ +.thin, .pay-list { overflow:hidden; } +.thin .so { width:66%; } +.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; } +.so-list { width:100%; margin-top: 20px; } +.so-list * { font-size:1.2rem !important; } +.so-list input { height:28px; display:inline !important; } +.time input, .so-list .chosen-container { background:#FFF !important; } +.time input { width:100px !important; } +.time i { position:absolute; margin:4px 0px 0px -15px; } +.price input { width:101px !important; } +.time, .time { width:50%; } +.so-list tr+tr>td:first-child { padding-top:10px; } +.so-list .chosen-container { border-radius:2px; } +.text-grey { color: #999; } +.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; } +.reset-submit { margin-left: 20px; } +.so-list select { padding: 0 0 0 8px; } +@media only screen and (min-width: 641px){ + .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; } + .thin_sub:hover { color:#F60; } +} +@media only screen and (max-width: 641px){ + .so-list input { width:40% !important; } + .so-list td { width:100%; display:block; } + .so-list tr td:last-child { margin-top:10px; } + .so-list .chosen-container { width:85%; } + .so-list .chosen-container { width:100%; } + .so-list tr td:last-child { padding-top:0px !important; } + .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; } + .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; } +} + +/** + * 列表 + */ +.data-list table.am-table .reply-content { max-width: 200px; } \ No newline at end of file diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 8ed3a6059..94aeb203b 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -403,6 +403,11 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23 color: #666; } +/** + * 灰色文字标记 + */ +.gray-text { color: #999; } + /* 价格颜色 */ .price strong {color: #E4393C; font-weight: 600; } diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index.css index 9ed4e7841..d83089144 100644 --- a/public/static/plugins/css/answers/index.css +++ b/public/static/plugins/css/answers/index.css @@ -36,8 +36,16 @@ @media only screen and (min-width:640px) { .plugins-answers .am-gallery-bordered .am-gallery-item:hover { - box-shadow: 0 0 3px rgb(251, 180, 187); - -webkit-box-shadow: 0 0 3px rgb(251, 180, 187); + -webkit-box-shadow: 0px 12px 12px -10px rgba(0,0,0,.4); + box-shadow: 0px 12px 12px -10px rgba(0,0,0,.4); + border: 1px solid #d2364c; + } + .plugins-answers .am-gallery-bordered .am-gallery-item:hover a { + text-decoration: none; + } + .plugins-answers .am-gallery-bordered .am-gallery-item a h3:hover { + color: #d2364c; + text-decoration: underline; } .plugins-answers .answers-top, .plugins-answers .answers-middle-banner, .plugins-answers .answers-goods { margin-top: 10px; @@ -82,4 +90,26 @@ .plugins-answers .answers-btn-list .am-btn { margin-top: 15px; } +} + +/** + * 详情 + */ +.plugins-answers-detail { + padding-top: 10px; +} +.plugins-answers-detail .base-content { + border: 1px dashed transparent; + background: linear-gradient(white,white) padding-box, + repeating-linear-gradient(-45deg, #ccc 0, #ccc 0.25em, white 0, white 0.6em); + padding: 10px; +} +.plugins-answers-detail .base-date { + text-align: right; + margin-top: 5px; +} +.plugins-answers-detail .base { + margin-top: 10px; + box-shadow: none; + -webkit-box-shadow: none; } \ No newline at end of file