diff --git a/static/images/registerTit_red.png b/static/images/registerTit_red.png new file mode 100644 index 0000000..0717320 Binary files /dev/null and b/static/images/registerTit_red.png differ diff --git a/static/images/register_icon1_red.png b/static/images/register_icon1_red.png new file mode 100644 index 0000000..d3ba3d7 Binary files /dev/null and b/static/images/register_icon1_red.png differ diff --git a/static/images/register_icon2_red.png b/static/images/register_icon2_red.png new file mode 100644 index 0000000..a08a831 Binary files /dev/null and b/static/images/register_icon2_red.png differ diff --git a/static/js/common/tools.js b/static/js/common/tools.js index 876ac2e..3624290 100644 --- a/static/js/common/tools.js +++ b/static/js/common/tools.js @@ -440,7 +440,6 @@ define(['jquery', 'dialog'], function ($, dialog) { if (data.code == 200) { var content = data.data; console.log(content) - content[13].configValue = 'red' if (content[13].configValue == 'red'){ themeColor = 'red'; document.documentElement.style.setProperty('--color', '#e8041f'); diff --git a/static/js/project/index.js b/static/js/project/index.js index c17c771..593bd4d 100644 --- a/static/js/project/index.js +++ b/static/js/project/index.js @@ -543,6 +543,14 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa goSearchKeyWord = function(){ var type = $('input[name="transaction"]:checked').val(); var searchKeyWord = $('#searchKeyWord').val(); + console.log($('#searchKeyWord').val()) + console.log(type) + if($('#searchKeyWord').val() == '' && type== 'warrant'){ + tools.initDialog('提示', '经营权证编号不可为空', function () { + return; + }, '确定') + return; + } if(type == 'warrant'){ tools.skip('view/announcement/warrantDetail.html?type='+type+'&searchKeyWord='+searchKeyWord) }else{ diff --git a/static/js/project/interact/interact.js b/static/js/project/interact/interact.js index 6eb0549..b649fa9 100644 --- a/static/js/project/interact/interact.js +++ b/static/js/project/interact/interact.js @@ -137,11 +137,10 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te module.data.searchType = 'YES'; module.data.turnPage = 'NO'; module.data.pageNum = 1 ; - console.log('aaa') document.getElementById('interact').style.display = 'none'; document.getElementById('search').style.display = 'block'; - tools.doGet(interactSearch, {deptId:100,title:searchTitle,content:searchContent,pageNum:1,pageSize:module.data.pageSize}, module.searchInteractInformation,true) + tools.doGet(interactSearch, {deptId:100,title:searchTitle,content:searchContent,pageNum:1,pageSize:module.data.pageSize,reply:'notnull'}, module.searchInteractInformation,true) } turnThePage = function (pageNum) { diff --git a/static/js/project/user/register.js b/static/js/project/user/register.js index e4ed893..546b96a 100644 --- a/static/js/project/user/register.js +++ b/static/js/project/user/register.js @@ -16,7 +16,29 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.data.type = getQueryVariable("type") //网站配置信息(网站名称 底部联系方式 公安备案号 网站备案号) tools.getWebConfig(); + setTimeout(function(){ + //主题图片切换 + module.switchTheme(); + },500) }; + //主题图片切换 + module.switchTheme = function(){ + if(themeColor == 'red'){ + if (getQueryVariable('type')){ + document.getElementById('registerTit').src = '../../static/images/registerTit_red.png' + }else{ + document.getElementById('icon1').src = '../../static/images/register_icon2_red.png' + document.getElementById('icon2').src = '../../static/images/register_icon1_red.png' + } + }else if(themeColor == 'green'){ + if (getQueryVariable('type')){ + document.getElementById('registerTit').src = '../../static/images/registerTit.png' + }else{ + document.getElementById('icon2').src = '../../static/images/register_icon1.png' + document.getElementById('icon1').src = '../../static/images/register_icon2.png' + } + } + } //底部友情链接 module.bottomFriendsLinks = function (data) { diff --git a/view/login/register.html b/view/login/register.html index f616213..a5d37a8 100644 --- a/view/login/register.html +++ b/view/login/register.html @@ -113,10 +113,10 @@

请选择要注册的用户类型

- + - +

个人用户:参与农村产权交易的自然人;

单位用户:主要是参与农村产权交易的机关单位、社会组织、农业企业、家庭农场、合作社等。

diff --git a/view/login/registerExplain.html b/view/login/registerExplain.html index 473da72..f43d6f8 100644 --- a/view/login/registerExplain.html +++ b/view/login/registerExplain.html @@ -111,7 +111,7 @@
- +

为营造公开、公平、公正的网络交易环境,维护农村产权交易平台(以下简称平台)会员秩序,确保网络交易的顺利进行,特将有关事项告知如下: