个人供求项目推荐
-+
更多>
@@ -677,7 +678,7 @@互动交流
-+
更多>
diff --git a/static/css/index.css b/static/css/index.css index 9f8e311..35e60be 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -342,14 +342,23 @@ .centerLeft-center-bottom p:first-child { background: url("../images/icon3.png") 0px no-repeat; padding-left: 16px; - width: 70%; + width: 66%; border-right: 1px solid #e3e3e3; + white-space:nowrap; + text-overflow:ellipsis; + overflow:hidden; + float: left; +} +.centerLeft-center-bottom p:nth-child(2) { + width: 30%; + float: right; + text-align: center; } .centerLeft-center-bottom p { font-size: 12px; color: #adadad; - display: inline-block; + display: block; } .centerLeft-center-bottom { diff --git a/static/css/listingItems/items.css b/static/css/listingItems/items.css index 3aee17a..61ad3b7 100644 --- a/static/css/listingItems/items.css +++ b/static/css/listingItems/items.css @@ -294,10 +294,25 @@ .swiperTit{ font-size: 24px; margin-top: 18px; + margin-bottom: 20px; +} +.swiperTable{ + border-collapse: collapse; } - .swiperTable tr:first-child td{ - color: #737373!important; + color: #FFF!important; + padding: 0 15px; + line-height: 60px; +} + +.swiperTable tr:first-child td:nth-child(1){ + text-align: center; + width: 12%; + background: #c71622; +} + +.swiperTable tr:first-child td:nth-child(2){ + background-image: linear-gradient(to right, #e82d2d , #f6a4ab); } .swiperTable tr td{ @@ -306,7 +321,7 @@ .swiperTable tr td:nth-child(2){ color:#c21f3a; - padding-left: 28px; + /*padding-left: 28px;*/ } .swiperTable tr td:nth-child(2) span{ @@ -315,7 +330,7 @@ .swiperInput{ padding: 12px 14px; - background-color: #f3f3f3; + background-color: #f3f3f3;margin-top: 20px; } nput::-webkit-outer-spin-button, input::-webkit-inner-spin-button { @@ -390,6 +405,10 @@ input::-webkit-inner-spin-button { margin-left: 10px; } +.tableTime{ + margin-top: 20px; +} + .tableTime tr td{ padding: 6px 0px; } @@ -545,12 +564,13 @@ input::-webkit-inner-spin-button { padding: 5px 0px; } .bondTable tr td:nth-child(odd){ + width: 10%; text-align: right; } .bondTable input[type='text']{ border: 1px solid #e3e3e3; - width: 90%; + width: 30%; height: 30px; margin-left: 10px; padding-left: 10px; @@ -564,10 +584,11 @@ input::-webkit-inner-spin-button { color: #ffffff; background: #007b76; border-radius: 0; - width: 20%; + width: 30%; margin: 0 auto; border: none; padding: 8px; + margin-left: 10px; } .rule p{ diff --git a/static/css/main.css b/static/css/main.css index 36d60a7..faa50a6 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -286,8 +286,9 @@ body { .clear { clear: both; - height: 0; - !important; + height: 0 !important; + padding: 0 !important; + margin: 0 !important; } /*三角形*/ diff --git a/static/js/api/items.js b/static/js/api/items.js index 426c7cc..0ecbbdd 100644 --- a/static/js/api/items.js +++ b/static/js/api/items.js @@ -76,3 +76,10 @@ var signupSubmit = '/transaction/signup'//项目报名接口 id: 主键ID */ var biddingSubmit = '/transaction/bidding'//出价 + +/* +@purl /common/base64Attach +@param + id: 主键ID +*/ +var base64Upload = '/common/base64Attach'//上传凭证 diff --git a/static/js/api/user.js b/static/js/api/user.js index 7abe8f9..b41c511 100644 --- a/static/js/api/user.js +++ b/static/js/api/user.js @@ -66,4 +66,22 @@ var userDemandUpdate = '/transaction/demand' //通过ID查询个人供求 @purl /transaction/website/data/type @param */ -var dictionaries = '/transaction/website/data/type' //数据字典 \ No newline at end of file +var dictionaries = '/transaction/website/data/type' //数据字典 + +/* +@purl /common/base64Attach +@param +*/ +var base64Attach = '/common/base64Attach' //数据字典 + +/* +@purl /common/base64Attach +@param +*/ +var showUserImg = 'transaction/member/showImg/memberId' //用户图片展示 + +/* +@purl /common/base64Attach +@param +*/ +var deleteUserImg = 'transaction/member/deleteImg/attachId' //用户图片展示 \ No newline at end of file diff --git a/static/js/common/tools.js b/static/js/common/tools.js index 0ef9f34..8ba8bb2 100644 --- a/static/js/common/tools.js +++ b/static/js/common/tools.js @@ -1,4 +1,4 @@ -var serverApi = '' +var serverApi = ''; define(['jquery', 'dialog'], function ($, dialog) { // 工具类 function Tool() { @@ -18,7 +18,7 @@ define(['jquery', 'dialog'], function ($, dialog) { doPost: function (url, data, cb, Bearer) { var _this = this; // data.deptId = 100 ; - // console.log(JSON.stringify(data)) + // console.log(data) var headAttribute = ''; if (Bearer && Bearer == true || _this.getCookie('Admin-Token') == '') { headAttribute = function (xhr) { @@ -56,6 +56,55 @@ define(['jquery', 'dialog'], function ($, dialog) { } }); }, + /** + * ajax post + * @param url (String) + * @param data (Json) 需要提交的数据 + * @param cb(Function) 回调函数 + * @param Bearer(Boolean) 是否需要Bearer,不需要传true + */ + doPostImg: function (url, data, cb, Bearer) { + var _this = this; + // data.deptId = 100 ; + // console.log(data) + var headAttribute = ''; + if (Bearer && Bearer == true || _this.getCookie('Admin-Token') == '') { + headAttribute = function (xhr) { + xhr.setRequestHeader("Content-Type", 'application/json;charset=utf-8'); + } + } else { + headAttribute = function (xhr) { + xhr.setRequestHeader("Content-Type", 'application/json;charset=utf-8'); + xhr.setRequestHeader('Authorization', 'Bearer ' + _this.getCookie('Admin-Token')) + } + } + $.ajax({ + url: ajaxJsUrl + url + '?=' + Math.random(), + type: 'POST', + data: JSON.stringify(data), + dataType: 'json', + traditional:true, + contentType: "application/json", + beforeSend: headAttribute, + success: function (data) { + var code = data.code; + var msg = data.msg; + if (code === 401) { + _this.removeAllCookie(); + _this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () { + _this.skip('/view/login/login.html') + }, '重新登录', function () { }, "取消") + } else if (code === 500) { + _this.initError(msg) + cb(data); + } else if (code != 200) { + _this.initError(msg) + } else { + cb(data); + } + } + }); + }, /** * ajax put * @param url (String) diff --git a/static/js/lib/cupload/cupload.js b/static/js/lib/cupload/cupload.js index c1874ff..62a0310 100644 --- a/static/js/lib/cupload/cupload.js +++ b/static/js/lib/cupload/cupload.js @@ -1,3 +1,4 @@ +var deleteNum = 0; (function(window, document) { //定义上传类 @@ -567,41 +568,43 @@ //删除图片 deleteImage: function(n) { this.imageBox[n].remove() + deleteNum = n ; this.removeUploadBox() if (this.imageList.children.length < this.opt.num) { this.createUploadBox() } - if(this.opt.deleteUrl) { - var xhr = null; - var key = this.opt.name - var data = {} - data[key] = this.imageArr[n] - if(window.XMLHttpRequest){ - xhr = new XMLHttpRequest() - } else { - xhr = new ActiveXObject('Microsoft.XMLHTTP') - } - if(typeof data == 'object'){ - var str = ''; - for(var key in data){ - str += key+'='+data[key]+'&'; - } - data = str.replace(/&$/, ''); - } - xhr.open('POST', this.opt.deleteUrl, true); - xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - xhr.send(data); - xhr.onreadystatechange = function(){ - if(xhr.readyState == 4){ - if(xhr.status == 200){ - console.log(xhr.response) - } else { - alert(((xhr.responseText).split("")[0]).split("")[1]) - return false - } - } - } - } + deleteList() + // if(this.opt.deleteUrl) { + // var xhr = null; + // var key = this.opt.name + // var data = {} + // data[key] = this.imageArr[n] + // if(window.XMLHttpRequest){ + // xhr = new XMLHttpRequest() + // } else { + // xhr = new ActiveXObject('Microsoft.XMLHTTP') + // } + // if(typeof data == 'object'){ + // var str = ''; + // for(var key in data){ + // str += key+'='+data[key]+'&'; + // } + // data = str.replace(/&$/, ''); + // } + // xhr.open('POST', this.opt.deleteUrl, true); + // xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + // xhr.send(data); + // xhr.onreadystatechange = function(){ + // if(xhr.readyState == 4){ + // if(xhr.status == 200){ + // console.log(xhr.response) + // } else { + // alert(((xhr.responseText).split("
")[0]).split("")[1])
+ // return false
+ // }
+ // }
+ // }
+ // }
},
sortLeft: function(event, n) {
diff --git a/static/js/project/demand/demand.js b/static/js/project/demand/demand.js
index ab8eead..2414bfe 100644
--- a/static/js/project/demand/demand.js
+++ b/static/js/project/demand/demand.js
@@ -149,5 +149,8 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp
);
}
}
+ goUserDemand = function () {
+ tools.skip('../user/user.html?type=goDemand')
+ }
return module;
});
\ No newline at end of file
diff --git a/static/js/project/index.js b/static/js/project/index.js
index cd7ae1d..6358e67 100644
--- a/static/js/project/index.js
+++ b/static/js/project/index.js
@@ -162,8 +162,12 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
//土地挂牌价格走势统计图
tools.doGet(statistics, {deptId: 100}, module.statisticsContent, true);
+ setTimeout(function(){
+ module.supplyImages();
+ },2000)
+
//竞价大厅-滚动
- //module.hallRolling();
+ module.hallRolling();
};
@@ -413,22 +417,6 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
if (data.code == 200) {
console.log(data)
var content = data.data;
- var focusListNext = module.data.focusListNext;
- for (var i = 0; i < content.length; i++) {
- var imgStrs = content[i].projectContent.match(/ 个人供应 个人需求 内容: 项目名称：管家堡乡左云村500亩水田出租 需缴纳保证新：1000元 · 已阅读并知晓：已阅读并同意《竞拍服务协议》 本人已知晓并同意以上所有事项 挂牌项目>产权交易>三屯乡黄家村土地经营权流转 重要提示：竞买人在竞价前请务必遵照左云县农村产权交易网的《平台竞价交易规则》、《左云县农村产权交易网平台农村产权交易操作指南》的要求，了解的情况、竞买资格、注册报名、保证金缴纳、竞买操作及款项支付方式等内容。如未全面了解相关内容，违反相关规定，您将承担无法参与项目竞买、保证金不予退还等不利后果，请审慎参与竞买。
{{value.projectName}}
{{value.biddingType}}
- {{value.signupStopTime.substr(0,10)}}
- {{value.biddingStartTime.substr(0,10)}}
+ {{value.signupStopTime}}
+ {{value.biddingStartTime}}
{{value.price}}
{{value.money}}
进行中
diff --git a/view/demand/demand.html b/view/demand/demand.html
index 21f4dda..4d6a5c7 100644
--- a/view/demand/demand.html
+++ b/view/demand/demand.html
@@ -128,7 +128,7 @@
+
1.竞买人请确认以下事项并勾选
@@ -139,9 +139,9 @@
2.竞买人身份确认
-
+
-
+
diff --git a/view/listingItems/itemsDetail.html b/view/listingItems/itemsDetail.html
index c022b87..8bc7f7f 100644
--- a/view/listingItems/itemsDetail.html
+++ b/view/listingItems/itemsDetail.html
@@ -132,11 +132,12 @@
*姓名:
@@ -164,11 +164,15 @@
+ *上传相关凭证:
- 
+
+
+
- 我的供求
+ 我的供求
- 我的咨询
+ 我的咨询
- 我的竞价
+ 我的竞价
* 身份证照片、本人和身份证的合影
-
-
+
@@ -301,7 +300,7 @@