zhangzl
/
nsgk_web
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_web into rongxin_dev

rongxin_dev
张泽亮 3 个月前
父节点
af3c2421c3 d41b494e6f
当前提交
329155c544
共有 19 个文件被更改，包括 563 次插入 和 69 次删除
合并视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +169
    -0
      infoport/discussions.html
  2. +92
    -0
      infoport/discussionsDetail.html
  3. +8
    -0
      infoport/homestead.html
  4. +8
    -0
      infoport/index.html
  5. +8
    -0
      infoport/property.html
  6. +8
    -0
      infoport/resourceNew.html
  7. +17
    -0
      infoport/static/css/index.css
  8. 二进制
      infoport/static/images/nav_10.png
  9. 二进制
      infoport/static/images/nav_9.png
  10. 二进制
      infoport/static/images/news2.jpg
  11. +4
    -0
      infoport/static/js/api/index.js
  12. +103
    -0
      infoport/static/js/project/discussions.js
  13. +83
    -0
      infoport/static/js/project/discussionsDetail.js
  14. +1
    -9
      newBusinessEntities/index.html
  15. +5
    -5
      newBusinessEntities/static/js/project/index.js
  16. +7
    -6
      newBusinessEntities/static/js/project/supply/index.js
  17. +4
    -2
      newBusinessEntities/static/js/project/train/index.js
  18. +41
    -41
      newBusinessEntities/view/price/index.html
  19. +5
    -6
      newBusinessEntities/view/train/index.html

+ 169
- 0
infoport/discussions.html 查看文件

@@ -0,0 +1,169 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">

<head>
<meta charset="utf-8">
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" />
<meta name="description" cxontent="" />
<link href="static/css/main.css" rel="stylesheet" type="text/css" />
<link href="static/css/index.css" rel="stylesheet" type="text/css" />
</head>

<body>
<div class="main" id="page">

<div class="header flex_dom flex_item_between flex_item_mid">
<p id="titContent">
<script id="titData" type="text/html">
{{webList.top.contentValue}}
</script>
</p>
<div class="wid25 flex_dom flex_item_between flex_item_mid">
<div class="header_nav">
<a href="index.html">
<div>
<i class="i1"></i>
</div>
<p>新闻资讯</p>
</a>
</div>
<div class="header_nav">
<a href="property.html">
<div>
<i class="i2"></i>
</div>
<p>资产信息</p>
</a>
</div>
<div class="header_nav">
<a href="resourceNew.html">
<div>
<i class="i3"></i>
</div>
<p>资源信息</p>
</a>
</div>
<div class="header_nav">
<a href="homestead.html">
<div>
<i class="i4"></i>
</div>
<p>宅基地信息</p>
</a>
</div>
<div class="header_nav active">
<a href="homestead.html">
<div>
<i class="i5"></i>
<img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt="">
</div>
<p>四议两公开</p>
</a>
</div>
</div>
</div>

<div class="search">
<input type="search" placeholder="搜索您需要的讯息" id="searchInput" oninput="searchChange()" >
</div>

<div class="new">
<div class="personalTit-banner">
<div class="swiper-container" id="bannerFocusNextWrap">
<div class="swiper-wrapper" id="bannerFocusNextContent">
<script id="newListDataImg" type="text/html">
{{if newImgList.length>0}}
{{each newImgList as value i}}
<div class="swiper-slide">
<a href="#"><img src="/api{{value}}" alt=""></a>
</div>
{{/each}}
{{else}}
<div class="swiper-slide">
<a href="#"><img src="static/images/news2.jpg" alt=""></a>
</div>
{{/if}}
</script>
</div>
<div class="page-pagination a2"></div>
</div>
</div>

<div class="new_list">
<div class="new_list_tit">
<p>四议两公开</p>
<p id="nowDateNYR">2023.03.15</p>
</div>

<div id="review_box" style="height: 36vh;overflow: hidden;margin-top: 2.5vh;">
<div class="new_list_ul" id="newListContent">
<script id="newListData" type="text/html">
{{each newList as value i}}
<div class="new_list_li">
<a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a>
<p>{{value.bookName}}</p>
<p>{{value.jueyiAt}}</p>
</div>
{{/each}}
</script>
</div>
<div class="new_list_ul" id="newListContent2"></div>
</div>

</div>

</div>

<div class="footer" id="webContent">

<script id="webData" type="text/html">
<div class="footer_link">
<!-- <p class="footer_link_tit">友情链接</p>-->
<!-- {{each webList.botoom1 as value i}}-->
<!-- <a class="hotFile" target="_blank" href="{{value.contentUrl}}">{{value.contentValue}}</a>-->
<!-- {{/each}}-->
<img src="static/images/link_00.png" alt="">
<!-- <a href=""><img src="static/images/link_01.png" alt="" ></a>-->
<!-- <a href=""><img src="static/images/link_02.png" alt=""></a>-->
{{each webList.botoom1 as value i}}
<a href="{{value.contentUrl}}" style="background: url('static/images/{{value.contentIcon}}.png') no-repeat center;background-size: 100% 100%;" target="_blank">
<!-- <img src="static/images/{{value.contentIcon}}.png" alt="" >-->
<p class="link_tt">{{value.contentValue}}</p>
</a>
{{/each}}
</div>

<div class="footer_link_filings">
{{each webList.botoom2 as value i}}
<div class="footer_link_filings_left">
<p style="background-image: url('static/images/{{value.contentIcon}}')">{{value.contentTitle}}</p>
<a href="#">{{value.contentValue}}</a>
</div>
{{/each}}
</div>

<div class="footer_link_company">
{{each webList.botoom3 as value i}}
<div>
<p>{{value.contentTitle}}</p>
<a target="{{value.contentUrl ? '_blank' : '_self' }}" href="{{value.contentUrl ? value.contentUrl : 'javascript:void(0)' }}">{{value.contentValue}}</a>
</div>
{{/each}}
</div>
</script>

</div>


<!-- <div class="footer_link_filings_right">-->
<!-- <p>服务热线</p>-->
<!-- <a href="#">{{webList[4].contentValue}}</a>-->
<!-- </div>-->
</div>
</body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussions.js" defer type="text/javascript"></script>
</html>

+ 92
- 0
infoport/discussionsDetail.html 查看文件

@@ -0,0 +1,92 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">

<head>
<meta charset="utf-8">
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" />
<meta name="description" cxontent="" />
<link href="static/css/main.css" rel="stylesheet" type="text/css" />
<link href="static/css/index.css" rel="stylesheet" type="text/css" />
<link href="static/css/newDetail.css" rel="stylesheet" type="text/css" />
</head>

<body>
<div class="main" id="page">

<div class="new_content">
<div class="new_content_left">
<div class="new_content_left_tit">
<a href="discussions.html"><i></i></a>
<p id="name"></p>
</div>
<div class="new_content_left_come">
<p id="creatBy"></p>
<p id="creatTime"></p>
</div>
<div class="new_content_content" id="jueyiAt"></div>
<div class="new_content_content" id="jueyiPic"></div>
<div class="new_content_content" id="shishiAt"></div>
<div class="new_content_content" id="shishiPic"></div>
<div class="new_content_content" id="remark"></div>
</div>
<div class="new_content_right">
<div class="new_content_right_tit">四议两公开列表</div>
<div class="new_content_right_main" id="newListContent">
<script id="newListData" type="text/html">
{{each newList as value i}}
<p><a href="discussionsDetail.html?id={{value.id}}">{{value.openName}}</a></p>
{{/each}}
</script>
</div>
</div>
</div>

<div class="footer" id="webContent">

<script id="webData" type="text/html">
<div class="footer_link">
<!-- <p class="footer_link_tit">友情链接</p>-->
<!-- {{each webList.botoom1 as value i}}-->
<!-- <a class="hotFile" target="_blank" href="{{value.contentUrl}}">{{value.contentValue}}</a>-->
<!-- {{/each}}-->
<img src="static/images/link_00.png" alt="">
<!-- <a href=""><img src="static/images/link_01.png" alt="" ></a>-->
<!-- <a href=""><img src="static/images/link_02.png" alt=""></a>-->
{{each webList.botoom1 as value i}}
<a href="{{value.contentUrl}}" style="background: url('static/images/{{value.contentIcon}}.png') no-repeat center;background-size: 100% 100%;" target="_blank">
<!-- <img src="static/images/{{value.contentIcon}}.png" alt="" >-->
<p class="link_tt">{{value.contentValue}}</p>
</a>
{{/each}}
</div>

<div class="footer_link_filings">
{{each webList.botoom2 as value i}}
<div class="footer_link_filings_left">
<p style="background-image: url('static/images/{{value.contentIcon}}')">{{value.contentTitle}}</p>
<a href="#">{{value.contentValue}}</a>
</div>
{{/each}}
</div>

<div class="footer_link_company">
{{each webList.botoom3 as value i}}
<div>
<p>{{value.contentTitle}}</p>
<a target="{{value.contentUrl ? '_blank' : '_self' }}" href="{{value.contentUrl ? value.contentUrl : 'javascript:void(0)' }}">{{value.contentValue}}</a>
</div>
{{/each}}
</div>
</script>

</div>


</div>
</body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/discussionsDetail.js" defer type="text/javascript"></script>
</html>

+ 8
- 0
infoport/homestead.html 查看文件

@@ -86,6 +86,14 @@
<p>宅基地信息</p> <p>宅基地信息</p>
</a> </a>
</div> </div>
<div class="header_nav">
<a href="discussions.html">
<div>
<i class="i5"></i>
</div>
<p>四议两公开</p>
</a>
</div>
</div> </div>
</div> </div>




+ 8
- 0
infoport/index.html 查看文件

@@ -56,6 +56,14 @@
<p>宅基地信息</p> <p>宅基地信息</p>
</a> </a>
</div> </div>
<div class="header_nav">
<a href="discussions.html">
<div>
<i class="i5"></i>
</div>
<p>四议两公开</p>
</a>
</div>
</div> </div>
</div> </div>




+ 8
- 0
infoport/property.html 查看文件

@@ -88,6 +88,14 @@
<p>宅基地信息</p> <p>宅基地信息</p>
</a> </a>
</div> </div>
<div class="header_nav">
<a href="discussions.html">
<div>
<i class="i5"></i>
</div>
<p>四议两公开</p>
</a>
</div>
</div> </div>
</div> </div>




+ 8
- 0
infoport/resourceNew.html 查看文件

@@ -86,6 +86,14 @@
<p>宅基地信息</p> <p>宅基地信息</p>
</a> </a>
</div> </div>
<div class="header_nav">
<a href="discussions.html">
<div>
<i class="i5"></i>
</div>
<p>四议两公开</p>
</a>
</div>
</div> </div>
</div> </div>




+ 17
- 0
infoport/static/css/index.css 查看文件

@@ -56,6 +56,10 @@
background: url("../images/nav_8.png") no-repeat center; background: url("../images/nav_8.png") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.active .i5{
background: url("../images/nav_10.png") no-repeat center;
background-size: 100% 100%;
}
.header .active{ .header .active{
position: relative; position: relative;
} }
@@ -85,6 +89,11 @@
background-size: 100% 100%; background-size: 100% 100%;
transition: all 0.4s ease-in-out; transition: all 0.4s ease-in-out;
} }
.header .header_nav:hover .i5{
background: url("../images/nav_10.png") no-repeat center;
background-size: 100% 100%;
transition: all 0.4s ease-in-out;
}
.header .header_nav{ .header .header_nav{
cursor: pointer; cursor: pointer;
} }
@@ -126,6 +135,10 @@
background: url("../images/nav_4.png") no-repeat center; background: url("../images/nav_4.png") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
} }
.i5{
background: url("../images/nav_9.png") no-repeat center;
background-size: 100% 100%;
}




.search{ .search{
@@ -198,6 +211,10 @@
cursor: pointer; cursor: pointer;
} }


.new_list_li a{
width: 50%;
}

.new_list_li:first-child{ .new_list_li:first-child{


/*margin-top: 2.5vh;*/ /*margin-top: 2.5vh;*/


二进制
infoport/static/images/nav_10.png 查看文件

之前 之后
宽度: 28  |  高度: 26  |  大小: 712 B

二进制
infoport/static/images/nav_9.png 查看文件

之前 之后
宽度: 28  |  高度: 26  |  大小: 528 B

二进制
infoport/static/images/news2.jpg 查看文件

之前 之后
宽度: 620  |  高度: 420  |  大小: 184 KiB

+ 4
- 0
infoport/static/js/api/index.js 查看文件

@@ -105,3 +105,7 @@ var webGet = '/open/house/policy/get/' //查询落款
dictType：project_type dictType：project_type
*/ */
var webDeptType = '/transaction/website/transfer/'//标的物类型查询接口 var webDeptType = '/transaction/website/transfer/'//标的物类型查询接口

var listSiyigongkai = '/open/villageAffairs/public/siyigongkaiList'//查询四议两公开列表

var siyigongkaiDetail = '/open/villageAffairs/public/siyigongkaiDetail'//查询四议两公开列表

+ 103
- 0
infoport/static/js/project/discussions.js 查看文件

@@ -0,0 +1,103 @@
/**
* Created by Administrator on 2021/4/5.
*/
define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, swiper) {
//数据存储
var module = {
data: {
//服务器地址
serverApi:'',
//焦点图数据
focusList: [],
communicateList: [],
newImgList:[]
},
};
var tools = new Tools();

module.init = function (page) {
//新闻列表
tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList , true);
tools.doGet(webList, {}, module.webList , true);
// new Swiper('#bannerFocusNextWrap', {
// paginationClickable: true,
// pagination: '.a2',
// autoplay : 2000,
// loop:true
// })

$("#nowDateNYR").html(new Date().getFullYear()+'-'+(new Date().getMonth()+1)+'-'+new Date().getDate());

};

module.newsList = function (data) {
if (data.code == 200) {
var content = data.rows;
module.data.newList = content;
var newListData = template('newListData', module.data);
$("#newListContent").html(newListData);

var newImgList = [];
// content.map(rr=>{
// if (rr.jueyiPic!=null&&rr.jueyiPic!=""){
// rr.jueyiPic.split(',');
// newImgList.push(rr.jueyiPic);
// }
// })
module.data.newImgList = newImgList;
var newListDataImg = template('newListDataImg', module.data);
$("#bannerFocusNextContent").html(newListDataImg);
// roll(20)
}
}

module.webList = function (data) {
if (data.code == 200) {
var content = data.data;
module.data.webList = content;
var webData = template('webData', module.data);
$("#webContent").html(webData);
var titData = template('titData', module.data);
$("#titContent").html(titData);
}
}

searchChange = function () {
console.log(1111111111);
tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8,openName:$("#searchInput").val()}, module.newsList , true);
}

function roll(t) {
var ul1 = document.getElementById("newListContent");
var ul2 = document.getElementById("newListContent2");
var ulbox = document.getElementById("review_box");
ul2.innerHTML = ul1.innerHTML;
ulbox.scrollTop = 0; // 开始无滚动时设为0
var timer = setInterval(rollStart, t); // 设置定时器，参数t用在这为间隔时间（单位毫秒），参数t越小，滚动速度越快
// 鼠标移入div时暂停滚动
ulbox.onmouseover = function () {
clearInterval(timer);
}
// 鼠标移出div后继续滚动
ulbox.onmouseout = function () {
timer = setInterval(rollStart, t);
}
}

// 开始滚动函数
function rollStart() {
// 上面声明的DOM对象为局部对象需要再次声明
var ul1 = document.getElementById("newListContent");
var ul2 = document.getElementById("newListContent2");
var ulbox = document.getElementById("review_box");
// 正常滚动不断给scrollTop的值+1,当滚动高度大于列表内容高度时恢复为0
console.log(ulbox.scrollTop+'--------'+ul1.scrollHeight)
if (ulbox.scrollTop >= ul1.scrollHeight) {
ulbox.scrollTop = 0;
} else {
ulbox.scrollTop += 1;
}
}

return module;
});

+ 83
- 0
infoport/static/js/project/discussionsDetail.js 查看文件

@@ -0,0 +1,83 @@
/**
* Created by Administrator on 2021/4/5.
*/
define(['jquery', "template", "Tools"], function ($, template, Tools) {
//数据存储
var module = {
data: {
//服务器地址
serverApi:'',
//焦点图数据
focusList: [],
communicateList: [],
},
};
var tools = new Tools();

module.init = function (page) {
//新闻详情
tools.doGet(siyigongkaiDetail, {id:getQueryVariable('id')}, module.newsDetail , true);
//新闻列表
tools.doGet(listSiyigongkai, {pageNum:1,pageSize:8}, module.newsList , true);
tools.doGet(webList, {}, module.webList , true);
};

//获取地址栏参数
function getQueryVariable(variable){
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}

module.webList = function (data) {
if (data.code == 200) {
var content = data.data;
module.data.webList = content;
var webData = template('webData', module.data);
$("#webContent").html(webData);
var titData = template('titData', module.data);
$("#titContent").html(titData);
}
}

module.newsDetail = function (data) {
if (data.code == 200) {
var content = data.data;
$('#name')[0].innerHTML = content.openName;
$('#jueyiAt')[0].innerHTML = '決议公开日期：'+content.jueyiAt;

let arr = content.jueyiPic.split(',');
console.log(arr)
$('#jueyiPic')[0].innerHTML = '决议公开图片：<br/>';
for (let i = 0;i < arr.length; i++){
$('#jueyiPic')[0].innerHTML += '<img src="/api'+arr[i]+'" style="width: 200px;height: 150px;margin-right: 10px;">';
}

let arr2 = content.shishiPic.split(',');
$('#shishiPic')[0].innerHTML = '实施公开图片：<br/>';
for (let i = 0;i < arr2.length; i++){
$('#shishiPic')[0].innerHTML += '<img src="/api'+arr2[i]+'" style="width: 200px;height: 150px;margin-right: 10px;">';
}

$('#shishiAt')[0].innerHTML = '实施公开日期：'+content.shishiAt;

$('#remark')[0].innerHTML = '备注：'+content.remark;

}
}

module.newsList = function (data) {
if (data.code == 200) {
var content = data.rows;
module.data.newList = content;
var newListData = template('newListData', module.data);
$("#newListContent").html(newListData);
}
}

return module;
});

+ 1
- 9
newBusinessEntities/index.html 查看文件

@@ -38,7 +38,7 @@
</div> </div>
<div class="partition"></div> <div class="partition"></div>
<!-- 轮播图 --> <!-- 轮播图 -->
<img src="static/images/banner.jpg" alt=""/>
<img src="static/images/banner.jpg" style="width: 100%;" alt=""/>
<!-- 新闻模块 --> <!-- 新闻模块 -->
<div class="newBox w-1200"> <div class="newBox w-1200">
<p class="crumbs">首页 ></p> <p class="crumbs">首页 ></p>
@@ -389,14 +389,6 @@
<ul id="managementContent"></ul> <ul id="managementContent"></ul>
</div> </div>
<div class="supplyBox m-t-15"> <div class="supplyBox m-t-15">
<div class="titBox">
<div class="fl">
<p class="font36 newBox_list_titBg">SUPPLY</p>
<p class="newBox_list_tit">供应信息</p>
</div>
<a href="view/supply/index.html?type=gongying" class="fr font16 more">更多<span class="jiantou"></span></a>
<div class="clear"></div>
</div>
<div class="titBox"> <div class="titBox">
<div class="fl"> <div class="fl">
<p class="font36 newBox_list_titBg">SERVICE</p> <p class="font36 newBox_list_titBg">SERVICE</p>


+ 5
- 5
newBusinessEntities/static/js/project/index.js 查看文件

@@ -106,9 +106,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa


for ( var i = 0 ; i < content.length ; i++ ){ for ( var i = 0 ; i < content.length ; i++ ){


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
// content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -127,7 +127,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -146,7 +146,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -171,7 +171,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
content[i].industryClassificationType = secondArray; content[i].industryClassificationType = secondArray;
} }
console.log(content[i].industryClassificationType) console.log(content[i].industryClassificationType)
content[i].masterMap = serverApi + content[i].masterMap ;
content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null') ;


} }




+ 7
- 6
newBusinessEntities/static/js/project/supply/index.js 查看文件

@@ -55,6 +55,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
}); });
tools.doGet(dictType + '/supply_demand_unit', {}, module.dictType , true); tools.doGet(dictType + '/supply_demand_unit', {}, module.dictType , true);
tools.doGet(productCategories , {}, module.projectList , true); tools.doGet(productCategories , {}, module.projectList , true);
tools.getWebConfig();
}; };


module.dictType = function (data) { module.dictType = function (data) {
@@ -93,7 +94,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -112,7 +113,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -130,7 +131,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }
module.data.recommendList = content; module.data.recommendList = content;
@@ -189,9 +190,9 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp


for ( var i = 0 ; i < content.length ; i++ ){ for ( var i = 0 ; i < content.length ; i++ ){


content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);
// content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit);


content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ;
content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ;


} }


@@ -238,4 +239,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
} }


return module; return module;
})
})

+ 4
- 2
newBusinessEntities/static/js/project/train/index.js 查看文件

@@ -36,6 +36,8 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
//console.log(res) //console.log(res)
} }
}) })

tools.getWebConfig();
}; };


//新闻列表 //新闻列表
@@ -61,7 +63,7 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
var content = data.data; var content = data.data;
for ( var i = 0 ; i < content.length ; i++ ){ for ( var i = 0 ; i < content.length ; i++ ){
content[i].trainingType = module.selectDictLabel(module.data.trainingTypeOptions,content[i].trainingType); content[i].trainingType = module.selectDictLabel(module.data.trainingTypeOptions,content[i].trainingType);
content[i].masterMap = serverApi + content[i].masterMap;
content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null');
} }
module.data.technologyList = content; module.data.technologyList = content;
var technologyData = template('technologyData', module.data); var technologyData = template('technologyData', module.data);
@@ -147,4 +149,4 @@ define(['jquery', "template", "Tools", 'LeftNav', 'dateTime'], function ($, temp
} }


return module; return module;
})
})

+ 41
- 41
newBusinessEntities/view/price/index.html 查看文件

@@ -78,59 +78,59 @@
<table width="100%" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="0">
<tr> <tr>
<td></td> <td></td>
<td>山芋粉</td>
<td>大果</td>
<td>中果</td>
<td>小果</td>
<td>小果</td>
<td>小果</td>
<td>小果</td>
<td>小果</td>
<td>小果</td>
<td>小果</td>
<td>玉米</td>
<td>小麦</td>
<td>大豆</td>
<td>水稻</td>
<td>梨</td>
<td>苹果</td>
<td>葡萄</td>
<td>大白菜</td>
<td>生菜</td>
<td>空心菜</td>
</tr> </tr>
<tr> <tr>
<td>指导价格</td> <td>指导价格</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>26元/500g</td>
<td>1.58元/500g</td>
<td>1.21元/500g</td>
<td>1.2元/500g</td>
<td>6.2元/500g</td>
<td>8元/500g</td>
<td>9元/500g</td>
<td>3.2元/500g</td>
<td>3.5元/500g</td>
<td>5.1元/500g</td>
</tr> </tr>
<tr> <tr>
<td>最新价格</td> <td>最新价格</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>27元/500g</td>
<td>1.58元/500g</td>
<td>1.2元/500g</td>
<td>1.2元/500g</td>
<td>6元/500g</td>
<td>8元/500g</td>
<td>8元/500g</td>
<td>3.5元/500g</td>
<td>3.8元/500g</td>
<td>5元/500g</td>
</tr> </tr>
<tr> <tr>
<td>日均价格</td> <td>日均价格</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>2.5/500g</td>
<td>25.6元/500g</td>
<td>1.6元/500g</td>
<td>1.21元/500g</td>
<td>1.22元/500g</td>
<td>5.94元/500g</td>
<td>7.64元/500g</td>
<td>7.75元/500g</td>
<td>3元/500g</td>
<td>4元/500g</td>
<td>4.8元/500g</td>
</tr> </tr>
</table> </table>
</div> </div>
<div style="height: 200px;"></div>
<div style="height: 30px;"></div>
<div class="recommendTit "> <div class="recommendTit ">
<p class="fl"><i class="lvd"></i>产品分类</p> <p class="fl"><i class="lvd"></i>产品分类</p>
<div class="clear"></div> <div class="clear"></div>


+ 5
- 6
newBusinessEntities/view/train/index.html 查看文件

@@ -214,8 +214,7 @@
<img src="../../static/images/img2.jpg" width="25%" height="128" alt="" class="fl"/> <img src="../../static/images/img2.jpg" width="25%" height="128" alt="" class="fl"/>
<table class="fl informationTable"> <table class="fl informationTable">
<tr> <tr>
<td colspan="2"><p class="font16 color-333">{{value.title}}<i class="bq">{{value.techniqueType}}</i></p></td>
<td><p class="supplyList_time">{{value.handleTime}}</p></td>
<td colspan="3"><p class="font16 color-333">{{value.seekTitle}}<i class="bq">{{value.techniqueType}}</i></p></td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
@@ -223,13 +222,13 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td width="190"><p class="font16"><span class="color-666 font14">发布人</span>&nbsp;&nbsp;{{value.submitName}}</p></td>
<td width="190"><p class="font16"><span class="color-666 font14">发布人</span>&nbsp;&nbsp;{{value.createBy}}</p></td>
<td colspan="2"><p class="font16"><span class="color-666 font14">发布时间</span>&nbsp;&nbsp;{{value.createTime.substr(0,10)}}</p></td> <td colspan="2"><p class="font16"><span class="color-666 font14">发布时间</span>&nbsp;&nbsp;{{value.createTime.substr(0,10)}}</p></td>
</tr> </tr>
<tr> <tr>
<td><p class="font16"><span class="color-666 font14">答复专家</span>&nbsp;&nbsp;{{value.handleName}}</p></td>
<td><p class="font16"><span class="color-666 font14">答复时间</span>&nbsp;&nbsp;{{value.handleTime}}</p></td>
<td><p class="supplyList_tel"><i class="icon_tel"></i>{{value.phone}}</p></td>
<td><p class="font16"><span class="color-666 font14">答复专家</span>&nbsp;&nbsp;{{value.seekName}}</p></td>
<td><p class="font16"><span class="color-666 font14">答复时间</span>&nbsp;&nbsp;{{value.seekDate}}</p></td>
<td><p class="supplyList_tel"><i class="icon_tel"></i>{{value.seekPhone}}</p></td>
</tr> </tr>
</table> </table>
<div class="clear"></div> <div class="clear"></div>


撰写 预览
正在加载...
取消
保存