前端接口对接

index.html

@@ -82,7 +82,7 @@
 <!--                    </ul>-->
 <!--                </div>-->
                 <div class="fr">
-                    <a href="view/user/user.html">请登录</a>
+                    <a href="view/login/login.html">请登录</a>
                     <a href="view/login/register.html">免费注册</a>
                 </div>
                 <div class="clear"></div>

static/css/listingItems/items.css

@@ -50,8 +50,8 @@
 }
 
 .auction_hall_table_tab_select {
-    color: #FFFFFF;
-    background: #007b76;
+    color: #FFFFFF!important;
+    background: #007b76!important;
 }
 
 .data_input, .data_input2, .data_input3, .data_input4 {

static/css/user/user.css

@@ -32,15 +32,30 @@
 }
 
 .userTable input[type='button']{
+    background: #e1e1e1;
+    padding: 8px 15px;
+    color: #848484;
+    border: none;
+    border-radius: 20px;
+}
+
+.userTable .active{
+    background: #007b76!important;
+    color: #FFFFFF!important;
+}
+
+.userTable input[type='button']:hover{
     background: #007b76;
     padding: 8px 15px;
-    color: #ffffff;
+    color: #FFFFFF;
     border: none;
     border-radius: 20px;
+    cursor: pointer;
 }
 
 .userTable table tr td span{
     color: red;
+    cursor: pointer;
 }
 
 .userTable table tr td{
@@ -56,6 +71,7 @@
     width: 90%;
     height: 36px;
     margin-left: 10px;
+    padding-left: 10px;
 }
 
 .userTable table tr:first-child td{

static/js/api/index.js

@@ -2,7 +2,7 @@
 *  获取用户、登录、注册相关
 -----------------*/
 var captchaImage_get = '/captchaImage';  //图形验证码接口
-var login_post = '/login';    //用户登录接口       
+var login_post = '/login';    //用户登录接口
 var getInfo_get = '/getInfo'  //获取用户信息
 
 

static/js/api/user.js

@@ -0,0 +1,39 @@
+/*--------------
+*  用户类
+-----------------*/
+
+/*
+@purl /transaction/website/member/{id}
+@param
+*/
+var userUpdate = '/transaction/website/member'  //修改用户信息类接口
+
+/*
+@purl /getInfo
+@param
+*/
+var userData = '/getInfo'  //修改用户信息类接口
+
+/*
+@purl /transaction/website/member/{id}
+@param
+*/
+var userMember = '/transaction/member/userId'  //用户信息类接口
+
+/*
+@purl /transaction/demand/supplyDemandList/member
+@param
+*/
+var userSupply = '/transaction/demand/supplyDemandList/member'  //我的供求类接口
+
+/*
+@purl /transaction/communicate/communicateList/member
+@param
+*/
+var userConsulting = '/transaction/communicate/communicateList/member'  //我的咨询类接口
+
+/*
+@purl /transaction/outproject/biddinglist/member
+@param
+*/
+var userBidding = '/transaction/outproject/biddinglist/member'  //我的竞价类接口

static/js/common/main.js

@@ -29,6 +29,7 @@ requirejs.config({
         demandApi: 'api/demand', //个人供求接口
         policyApi: 'api/policy',//政策法规接口
         interactApi: 'api/interact',//互动交流接口
+        user: 'api/user'//用户信息接口
     },
     shim: {
         bootstrap: {
@@ -52,6 +53,10 @@ requirejs.config({
         paging: {
             deps: ['jquery'],
             exports: 'paging'
+        },
+        uploader:{
+            deps: ['jquery','webuploader','flashonly','flashonlyMin'],
+            exports: 'uploader'
         }
     }
 });

static/js/common/tools.js

@@ -39,7 +39,52 @@ define(['jquery', 'dialog'], function ($, dialog) {
 					var msg = data.msg;
 					if (code === 401) {
 						_this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () {
-							_this.skip('/user/login.html')
+							_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)
+		 * @param data (Json) 需要提交的数据
+		 * @param cb(Function) 回调函数
+		 * @param Bearer(Boolean) 是否需要Bearer,不需要传true
+		 */
+		doPut: function (url, data, cb, Bearer) {
+			var _this = this;
+			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: 'put',
+				data: JSON.stringify(data),
+				dataType: 'json',
+				contentType: "application/json",
+				beforeSend: headAttribute,
+				success: function (data) {
+					var code = data.code;
+					var msg = data.msg;
+					if (code === 401) {
+						_this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () {
+							_this.skip('/view/login/login.html')
 						}, '重新登录', function () { }, "取消")
 					} else if (code === 500) {
 						_this.initError(msg)
@@ -92,7 +137,7 @@ define(['jquery', 'dialog'], function ($, dialog) {
 					var msg = data.msg;
 					if (code === 401) {
 						_this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () {
-							_this.skip('/user/login.html')
+							_this.skip('/view/login/login.html')
 						}, '重新登录', function () { }, "取消")
 					} else if (code === 500) {
 						_this.initError(msg)

static/js/lib/webUploader/webUploader.js

@@ -0,0 +1,240 @@
+jQuery(function () {
+    var $ = jQuery,
+        $list = $('#thelist'),
+        $btn = $('#ctlBtn'),
+        state = 'pending',
+        uploader;
+
+    uploader = WebUploader.create({
+
+        // 不压缩image
+        resize: false,
+
+        // swf文件路径
+        swf: 'js/Uploader.swf',
+
+        // 文件接收服务端。
+        server: 'http://webuploader.duapp.com/server/fileupload.php',
+
+        // 选择文件的按钮。可选。
+        // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+        pick: '#picker',
+        // 只允许选择.xls,xlsx文件。
+        accept: {
+            title: 'Excel',
+            extensions: 'xls,xlsx',
+            mimeTypes: 'application/vnd.ms-excel'
+        }
+    });
+
+    // 当有文件添加进来的时候
+    uploader.on('fileQueued', function (file) {
+        $list.append('<div id="' + file.id + '" class="item">' +
+            '<h4 class="info">' + file.name + '</h4>' +
+            '<p class="state">等待上传...</p>' +
+            '</div>');
+    });
+
+    // 文件上传过程中创建进度条实时显示。
+    uploader.on('uploadProgress', function (file, percentage) {
+        var $li = $('#' + file.id),
+            $percent = $li.find('.progress .progress-bar');
+
+        // 避免重复创建
+        if (!$percent.length) {
+            $percent = $('<div class="progress progress-striped active">' +
+                '<div class="progress-bar" role="progressbar" style="width: 0%">' +
+                '</div>' +
+                '</div>').appendTo($li).find('.progress-bar');
+        }
+
+        $li.find('p.state').text('上传中');
+
+        $percent.css('width', percentage * 100 + '%');
+    });
+
+    uploader.on('uploadSuccess', function (file) {
+        $('#' + file.id).find('p.state').text('已上传');
+    });
+
+    uploader.on('uploadError', function (file) {
+        $('#' + file.id).find('p.state').text('上传出错');
+    });
+
+    uploader.on('uploadComplete', function (file) {
+        $('#' + file.id).find('.progress').fadeOut();
+    });
+
+    uploader.on('all', function (type) {
+        if (type === 'startUpload') {
+            state = 'uploading';
+        } else if (type === 'stopUpload') {
+            state = 'paused';
+        } else if (type === 'uploadFinished') {
+            state = 'done';
+        }
+
+        if (state === 'uploading') {
+            $btn.text('暂停上传');
+        } else {
+            $btn.text('开始上传');
+        }
+    });
+
+    $btn.on('click', function () {
+        if (state === 'uploading') {
+            uploader.stop();
+        } else {
+            uploader.upload();
+        }
+    });
+});
+
+/*// 图片上传demo
+jQuery(function () {
+    var $ = jQuery,
+    $list = $('#fileList'),
+    // 优化retina, 在retina下这个值是2
+    ratio = window.devicePixelRatio || 1,
+
+    // 缩略图大小
+    thumbnailWidth = 100 * ratio,
+    thumbnailHeight = 100 * ratio,
+
+    // Web Uploader实例
+    uploader;
+
+    // 初始化Web Uploader
+    uploader = WebUploader.create({
+
+        // 自动上传。
+        auto: true,
+
+        // swf文件路径
+        swf: '/js/Uploader.swf',
+
+        // 文件接收服务端。
+        server: 'http://webuploader.duapp.com/server/fileupload.php',
+
+        // 选择文件的按钮。可选。
+        // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+        pick: '#filePicker',
+
+        // 只允许选择文件，可选。
+        accept: {
+            title: 'Images',
+            extensions: 'gif,jpg,jpeg,bmp,png',
+            mimeTypes: 'image/!*'
+        }
+    });
+
+    // 当有文件添加进来的时候
+    uploader.on('fileQueued', function (file) {
+        var $li = $(
+            '<div id="' + file.id + '" class="file-item thumbnail">' +
+            '<img>' +
+            '<div class="info">' + file.name + '</div>' +
+            '</div>'
+            ),
+            $img = $li.find('img');
+
+        $list.append($li);
+
+        // 创建缩略图
+        uploader.makeThumb(file, function (error, src) {
+            if (error) {
+                $img.replaceWith('<span>不能预览</span>');
+                return;
+            }
+
+            $img.attr('src', src);
+        }, thumbnailWidth, thumbnailHeight);
+    });
+
+    // 文件上传过程中创建进度条实时显示。
+    uploader.on('uploadProgress', function (file, percentage) {
+        var $li = $('#' + file.id),
+            $percent = $li.find('.progress span');
+
+        // 避免重复创建
+        if (!$percent.length) {
+             $percent = $('<p class="progress"><span></span></p>')
+            .appendTo($li)
+            .find('span');
+        }
+        $percent.css('width', percentage * 100 + '%');
+    });
+
+    // 文件上传成功，给item添加成功class, 用样式标记上传成功。
+    uploader.on('uploadSuccess', function (file) {
+        $('#' + file.id).addClass('upload-state-done');
+    });
+
+    // 文件上传失败，现实上传出错。
+    uploader.on('uploadError', function (file) {
+        var $li = $('#' + file.id),
+            $error = $li.find('div.error');
+
+        // 避免重复创建
+        if (!$error.length) {
+            $error = $('<div class="error"></div>').appendTo($li);
+         }
+        $error.text('上传失败');
+    });
+
+    // 完成上传完了，成功或者失败，先删除进度条。
+    uploader.on('uploadComplete', function (file) {
+        $('#' + file.id).find('.progress').remove();
+    });
+});
+
+/*var $ = jQuery,
+    $list = $('#thelist'),
+    $btn = $('#ctlBtn'),
+    state = 'pending';
+var uploader = WebUploader.create({
+    // swf文件路径
+    swf: 'js/Uploader.swf',
+    // 文件接收服务端。
+    server: 'http://webuploader.duapp.com/server/fileupload.php',
+    // 选择文件的按钮。可选。
+    // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+    pick: '#picker',
+    // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
+    resize: false
+});
+// 当有文件被添加进队列的时候
+uploader.on( 'fileQueued', function( file ) {
+    $list.append( '<div id="' + file.id + '" class="item">' +
+        '<h4 class="info">' + file.name + '</h4>' +
+        '<p class="state">等待上传...</p>' +
+        '</div>' );
+});
+// 文件上传过程中创建进度条实时显示。
+uploader.on( 'uploadProgress', function( file, percentage ) {
+    var $li = $( '#'+file.id ),
+        $percent = $li.find('.progress .progress-bar');
+
+    // 避免重复创建
+    if ( !$percent.length ) {
+        $percent = $('<div class="progress progress-striped active">' +
+            '<div class="progress-bar" role="progressbar" style="width: 0%">' +
+            '</div>' +
+            '</div>').appendTo( $li ).find('.progress-bar');
+    }
+
+    $li.find('p.state').text('上传中');
+
+    $percent.css( 'width', percentage * 100 + '%' );
+});
+uploader.on( 'uploadSuccess', function( file ) {
+    $( '#'+file.id ).find('p.state').text('已上传');
+});
+
+uploader.on( 'uploadError', function( file ) {
+    $( '#'+file.id ).find('p.state').text('上传出错');
+});
+
+uploader.on( 'uploadComplete', function( file ) {
+    $( '#'+file.id ).find('.progress').fadeOut();
+});*/

static/js/project/announcementList/announcementDetail.js

@@ -13,7 +13,7 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     module.init = function (page) {
 
         //成交公告
-        tools.doGet(announDetail+'/'+getQueryVariable('id'), {}, module.announInformation);
+        tools.doGet(announDetail+'/'+getQueryVariable('id'), {}, module.announInformation,true);
 
     };
 
@@ -37,13 +37,13 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
             var announcementInformationData = template('announcementInformationData', module.data);
             $("#announcementInformationContent").html(announcementInformationData);
             //流转方向字典
-            tools.doGet(Dictionaries+'/rollout_type', {}, module.circulationDictionaries);
+            tools.doGet(Dictionaries+'/rollout_type', {}, module.circulationDictionaries,true);
             //交易方式字典
-            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries);
+            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries,true);
             //面积单位字典
-            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries);
+            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries,true);
             //成交价格字典
-            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries);
+            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries,true);
         }
     }
 

static/js/project/announcementList/announcementList.js

@@ -26,10 +26,10 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     module.init = function (page) {
 
         //成交公告
-        tools.doGet(announList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.announInformation);
+        tools.doGet(announList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.announInformation,true);
 
         //鉴证公告
-        tools.doGet(attestationList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation);
+        tools.doGet(attestationList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
 
 
     };
@@ -109,10 +109,10 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
         if(module.data.clickType == 'attestation'){
-            tools.doGet(attestationList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.attestationInformation);
+            tools.doGet(attestationList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
         }
         if(module.data.clickType == 'announcement'){
-            tools.doGet(announList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.announInformation);
+            tools.doGet(announList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.announInformation,true);
         }
     }
     return module;

static/js/project/announcementList/attestation.js

@@ -13,7 +13,7 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     module.init = function (page) {
 
         //鉴证公告
-        tools.doGet(attestationDetail+'/'+getQueryVariable('id'), {}, module.announInformation);
+        tools.doGet(attestationDetail+'/'+getQueryVariable('id'), {}, module.announInformation,true);
 
     };
 
@@ -37,15 +37,15 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
             var announcementInformationData = template('announcementInformationData', module.data);
             $("#announcementInformationContent").html(announcementInformationData);
             //公司性质字典
-            tools.doGet(Dictionaries+'/company_nature', {}, module.companyDictionaries);
+            tools.doGet(Dictionaries+'/company_nature', {}, module.companyDictionaries,true);
             //流转方向字典
-            tools.doGet(Dictionaries+'/rollout_type', {}, module.circulationDictionaries);
+            tools.doGet(Dictionaries+'/rollout_type', {}, module.circulationDictionaries,true);
             //交易方式字典
-            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries);
+            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries,true);
             //面积单位字典
-            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries);
+            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries,true);
             //成交价格字典
-            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries);
+            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries,true);
         }
     }
 

static/js/project/bidding/biddingList.js

@@ -26,13 +26,13 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
     module.init = function (page) {
 
         //新闻资讯
-        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.biddingList);
+        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.biddingList,true);
 
         //标的物类型
-        tools.doGet(webDeptType+"/project_type", {}, module.deptType);
+        tools.doGet(webDeptType+"/project_type", {}, module.deptType,true);
 
         //标的物所在地
-        tools.doGet(webDept + '/0', {}, module.deptLocation);
+        tools.doGet(webDept + '/0', {}, module.deptLocation,true);
     };
 
     //挂牌项目列表
@@ -93,7 +93,7 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList,true);
     }
     return module;
 });

static/js/project/demand/demand.js

@@ -36,7 +36,7 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp
                 pageSize:module.data.pageSize,
                 supplyDemandType:1
             },
-            module.supplyInformation
+            module.supplyInformation,true
         );
 
         //个人需求
@@ -48,7 +48,7 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp
                 pageSize:module.data.pageSize,
                 supplyDemandType:2
             },
-            module.demandInformation
+            module.demandInformation,true
         );
 
     };
@@ -130,7 +130,7 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp
                     pageSize:module.data.pageSize,
                     supplyDemandType:1
                 },
-                module.supplyInformation
+                module.supplyInformation,true
             );
         }
         if(module.data.clickType == 'demand'){
@@ -143,7 +143,7 @@ define(['jquery', "template", "Tools", "demandApi", "paging"], function ($, temp
                     pageSize:module.data.pageSize,
                     supplyDemandType:2
                 },
-                module.demandInformation
+                module.demandInformation,true
             );
         }
     }

static/js/project/index.js

@@ -97,55 +97,55 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
 
     module.init = function (page) {
         //获取焦点图信息
-        tools.doGet(websiteNew + '/1/0/4', {}, module.focusNews);
+        tools.doGet(websiteNew + '/1/0/4', {}, module.focusNews , true);
 
         //新闻资讯
-        tools.doGet(websiteNew + '/2/0/6', {}, module.NewsInformation);
+        tools.doGet(websiteNew + '/2/0/6', {}, module.NewsInformation , true);
 
         //政策法规
-        tools.doGet(websiteNew + '/3/0/6', {}, module.policiesRegulations);
+        tools.doGet(websiteNew + '/3/0/6', {}, module.policiesRegulations , true);
 
         //交易规则
-        tools.doGet(websiteNew + '/4/0/6', {}, module.tradingRules);
+        tools.doGet(websiteNew + '/4/0/6', {}, module.tradingRules , true);
 
         //资料下载
-        tools.doGet(websiteNew + '/5/0/6', {}, module.dataDownload);
+        tools.doGet(websiteNew + '/5/0/6', {}, module.dataDownload, true);
 
         //标的物所在地
-        tools.doGet(webDept + '/0', {}, module.deptLocation);
+        tools.doGet(webDept + '/0', {}, module.deptLocation , true);
 
         //标的物类型
-        tools.doGet(webDeptType+"/project_type", {}, module.deptType);
+        tools.doGet(webDeptType+"/project_type", {}, module.deptType, true);
 
         //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
-        tools.doGet(webConfig, {}, module.webConfigInformation);
+        tools.doGet(webConfig, {}, module.webConfigInformation, true);
 
         //底部友情链接
-        tools.doGet(friendsLinks, {}, module.bottomFriendsLinks);
+        tools.doGet(friendsLinks, {}, module.bottomFriendsLinks, true);
 
         //土地
-        tools.doGet(webListing + '/1,2,3/0/3', {}, module.landList);
+        tools.doGet(webListing + '/1,2,3/0/3', {}, module.landList, true);
 
         //集体资产
-        tools.doGet(webListing + '/4/0/3', {}, module.collectiveAssets);
+        tools.doGet(webListing + '/4/0/3', {}, module.collectiveAssets, true);
 
         //农业生产设备
-        tools.doGet(webListing + '/5/0/3', {}, module.productionEquipment);
+        tools.doGet(webListing + '/5/0/3', {}, module.productionEquipment, true);
 
         //小型水利设施
-        tools.doGet(webListing + '/6/0/3', {}, module.waterConservancyFacilities);
+        tools.doGet(webListing + '/6/0/3', {}, module.waterConservancyFacilities, true);
 
         //查询挂牌项目浏览总次数
-        tools.doGet(allViewCount + '/100', {}, module.allViewCount);
+        tools.doGet(allViewCount + '/100', {}, module.allViewCount, true);
 
         //查询挂牌项目浏览总次数
-        tools.doGet(announcementList + '/0/4', {}, module.announcementList);
+        tools.doGet(announcementList + '/0/4', {}, module.announcementList, true);
 
         //查询挂牌项目浏览总次数
-        tools.doGet(biddingHallList + '/0/10', {}, module.biddingHallList);
+        tools.doGet(biddingHallList + '/0/10', {}, module.biddingHallList, true);
 
         //查询挂牌项目浏览总次数
-        tools.doGet(attestationList + '/0/5', {}, module.attestationList);
+        tools.doGet(attestationList + '/0/5', {}, module.attestationList, true);
 
         //竞价大厅-滚动
         //module.hallRolling();

static/js/project/interact/interact.js

@@ -22,7 +22,7 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
     module.init = function (page) {
 
         //互动交流
-        tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.interactInformation);
+        tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.interactInformation,true);
 
 
     };
@@ -57,7 +57,7 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(interactList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.interactInformation);
+        tools.doGet(interactList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.interactInformation,true);
     }
     return module;
 });

static/js/project/listingItems/items.js

@@ -13,16 +13,16 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
     module.init = function (page) {
 
         //项目基本信息
-        tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation);
+        tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
 
         //焦点图
         module.swiperBanner();
 
         //项目基本信息
-        tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation);
+        tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
 
         //挂牌项目竞价记录
-        tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation);
+        tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
 
     };
 
@@ -48,37 +48,37 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
 
             //挂牌价格字典
-            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries);
+            tools.doGet(Dictionaries+'/price_unit', {}, module.unitDictionaries,true);
 
             //经济类型字典
-            tools.doGet(Dictionaries+'/economic_type', {}, module.economicTypeDictionaries);
+            tools.doGet(Dictionaries+'/economic_type', {}, module.economicTypeDictionaries,true);
 
             //项目类型字典
-            tools.doGet(Dictionaries+'/project_type', {}, module.projectNumberDictionaries);
+            tools.doGet(Dictionaries+'/project_type', {}, module.projectNumberDictionaries,true);
 
             //农地性质字典
-            tools.doGet(Dictionaries+'/sub_object_type', {}, module.projectTypeDictionaries);
+            tools.doGet(Dictionaries+'/sub_object_type', {}, module.projectTypeDictionaries,true);
 
             //前次转出方式
-            tools.doGet(Dictionaries+'/rollout_type', {}, module.oneoutDictionaries);
+            tools.doGet(Dictionaries+'/rollout_type', {}, module.oneoutDictionaries,true);
 
             //面积单位字典
-            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries);
+            tools.doGet(Dictionaries+'/area_unit', {}, module.areaDictionaries,true);
 
             //支付方式字典
-            tools.doGet(Dictionaries+'/payment_type', {}, module.paymentTypeDictionaries);
+            tools.doGet(Dictionaries+'/payment_type', {}, module.paymentTypeDictionaries,true);
 
             //缴纳形式字典
-            tools.doGet(Dictionaries+'/deposit_payment_type', {}, module.depositPaymentTypeDictionaries);
+            tools.doGet(Dictionaries+'/deposit_payment_type', {}, module.depositPaymentTypeDictionaries,true);
 
             //交易方式字典
-            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries);
+            tools.doGet(Dictionaries+'/deal_type', {}, module.transactionDictionaries,true);
 
             //竞价方式字典
-            tools.doGet(Dictionaries+'/bidding_type', {}, module.biddingTypeDictionaries);
+            tools.doGet(Dictionaries+'/bidding_type', {}, module.biddingTypeDictionaries,true);
 
             //期满处理字典
-            tools.doGet(Dictionaries+'/expire_type', {}, module.expireTypeDictionaries);
+            tools.doGet(Dictionaries+'/expire_type', {}, module.expireTypeDictionaries,true);
 
         }
     }

static/js/project/listingItems/itemsList.js

@@ -20,13 +20,15 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 50,
+            pageSize: 1,
             //总页数
             pageCount:0,
             //标的物集合长度
             deptSize:24,
             //标的物选中项id
-            deptId:''
+            deptId:'',
+            //标的所在地选中
+            secondDeptId:''
         },
     };
     var tools = new Tools();
@@ -34,13 +36,13 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
     module.init = function (page) {
 
         //新闻资讯
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList, true);
 
         //标的物类型
-        tools.doGet(webDeptType+"/project_type", {}, module.deptType);
+        tools.doGet(webDeptType+"/project_type", {}, module.deptType, true);
 
         //标的物所在地
-        tools.doGet(webDept + '/0', {}, module.deptLocation);
+        tools.doGet(webDept, {deptId:''}, module.deptLocation, true);
     };
 
     //挂牌项目列表
@@ -80,6 +82,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
             for (var i = 0 ; i < 4 ; i++){
                 content[i] = data.data[i];
             }
+            console.log(content)
             module.data.deptTypeList = content;
             var deptTypeData = template('deptTypeData', module.data);
             $("#deptTypeContent").html(deptTypeData);
@@ -89,15 +92,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
     //标的物所在地
     module.deptLocation = function (data) {
         if (data.code == 200) {
-            var content = [] ;
-            console.log(module.data.deptSize)
-            var deptSize = module.data.deptSize;
-            if (deptSize>24){
-                deptSize = data.data.length
-            }
-            for (var i = 0 ; i < deptSize ; i++){
-                content[i] = data.data[i];
-            }
+            var content = data.data ;
             module.data.deptLocationList = content;
             var deptLocationData = template('deptLocationData', module.data);
             $("#deptLocationContent").html(deptLocationData);
@@ -126,30 +121,44 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
         console.log(deptId)
         module.data.deptId = deptId;
         for (var i = 0 ; i < module.data.deptLocationList.length ; i++){
-            console.log(i)
-            document.getElementById('locInfoall'+(100+i)).className = 'auction_hall_table_tab auction_loc'
+            document.getElementById('locInfoall'+(101+i)).className = 'auction_hall_table_tab auction_loc'
         }
         document.getElementById('locInfoall'+deptId).className = 'auction_hall_table_tab auction_loc auction_hall_table_tab_select'
-        tools.doGet(webDept + '/' + deptId, {}, module.deptSecondLocation);
+        tools.doGet(webDept, {deptId:deptId}, module.deptSecondLocation, true);
+    }
+
+    secondCheck = function(id,secondDeptId){
+        document.getElementById('locInfoSecondall').className = 'auction_hall_table_tab  auction_loc'
+        for (var i = 0 ; i < module.data.deptSecondLocationList.length ; i++){
+            document.getElementById('locInfoall'+i).className = 'auction_hall_table_tab  auction_loc'
+        }
+        console.log(id)
+        if(id == '' && secondDeptId == ''){
+            document.getElementById('locInfoSecondall').className = 'auction_hall_table_tab  auction_loc auction_hall_table_tab_select'
+            module.data.secondDeptId = secondDeptId;
+        }else{
+            document.getElementById('locInfoall'+id).className = 'auction_hall_table_tab auction_loc auction_hall_table_tab_select'
+        }
+        module.data.secondDeptId = secondDeptId;
     }
 
     allDept = function (){
         module.data.deptSize = 30
         document.getElementById('allDept').innerHTML = "<i class='sanjiao-top'></i>";
         document.getElementById('allDept').onclick = upDept;
-        tools.doGet(webDept + '/0', {}, module.deptLocation);
+        tools.doGet(webDept + '/0', {}, module.deptLocation, true);
     }
 
     upDept = function (){
         module.data.deptSize = 24
         document.getElementById('allDept').innerHTML = "<i class='sanjiao-bottom'></i>";
         document.getElementById('allDept').onclick = allDept;
-        tools.doGet(webDept + '/0', {}, module.deptLocation);
+        tools.doGet(webDept + '/0', {}, module.deptLocation, true);
     }
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList);
+        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList, true);
     }
     return module;
 });

static/js/project/new/new.js

@@ -22,7 +22,7 @@ define(['jquery', "template", "Tools", "newApi", "paging"], function ($, templat
     module.init = function (page) {
 
         //新闻资讯
-        tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation);
+        tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
 
 
     };
@@ -56,7 +56,7 @@ define(['jquery', "template", "Tools", "newApi", "paging"], function ($, templat
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(newList, {number:2,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.NewsInformation);
+        tools.doGet(newList, {number:2,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
     }
     return module;
 });

static/js/project/new/newDetail.js

@@ -14,7 +14,7 @@ define(['jquery', "template", "Tools", "newApi"], function ($, template, Tools )
 
         console.log(getQueryVariable('id'))
         //新闻资讯
-        tools.doGet(newDetail + '/'+getQueryVariable('id'), {}, module.NewsInformation);
+        tools.doGet(newDetail + '/'+getQueryVariable('id'), {}, module.NewsInformation,true);
 
     };
 

static/js/project/policy/policy.js

@@ -26,13 +26,13 @@ define(['jquery', "template", "Tools", "policyApi", "paging"], function ($, temp
     module.init = function (page) {
 
         //政策法规
-        tools.doGet(newList, {number:3,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.policyInformation);
+        tools.doGet(newList, {number:3,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.policyInformation,true);
 
         //交易规则
-        tools.doGet(newList, {number:4,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.ruleInformation);
+        tools.doGet(newList, {number:4,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.ruleInformation,true);
 
         //资料下载
-        tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation);
+        tools.doGet(newList, {number:5,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true);
 
 
     };
@@ -142,13 +142,13 @@ define(['jquery', "template", "Tools", "policyApi", "paging"], function ($, temp
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
         if(module.data.clickType == 'policy'){
-            tools.doGet(newList, {number:3,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.policyInformation);
+            tools.doGet(newList, {number:3,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.policyInformation,true);
         }
         if(module.data.clickType == 'rule'){
-            tools.doGet(newList, {number:4,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.ruleInformation);
+            tools.doGet(newList, {number:4,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.ruleInformation,true);
         }
         if(module.data.clickType == 'download'){
-            tools.doGet(newList, {number:5,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.downloadInformation);
+            tools.doGet(newList, {number:5,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.downloadInformation,true);
         }
     }
     return module;

static/js/project/user/index.js

@@ -1,17 +1,40 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, template, Tools, echarts, swiper) {
+define(['jquery', "template", "Tools", "user", "paging"], function ($, template, Tools) {
     //数据存储
     var module = {
         data: {
+            userInformationDetail:[],
+            userSupplyInformationList:'',
+            consultingInformationList:'',
+            biddingInformationList:'',
+            //页码
+            pageNum: 1,
+            //页码集合
+            pageList: [],
+            //每页数量
+            pageSize: 1,
+            //总页数
+            pageCount:0,
+            //用户ID
+            memberId:0,
+            //用户资料form
+            form:{
 
+            }
         },
     };
     var tools = new Tools();
 
     module.init = function (page) {
 
+        //用户资料
+        tools.doGet(userData, {}, module.userData);
+
+        //用户资料
+        //tools.doPut(userData, {id:}, module.userData,true);
+
         //用户资料鼠标悬浮
         module.userHover();
 
@@ -19,6 +42,204 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         module.userListHover();
     };
 
+    //个人中心用户信息
+    module.userData = function(data){
+        if (data.code == 200) {
+            var content = data.user;
+            console.log(content)
+            tools.doGet(userMember+'/'+content.userId, {}, module.userMember);//memberType 1个人 2单位
+        }
+    }
+
+    //个人中心用户资料
+    module.userMember = function(data){
+        if (data.code == 200) {
+            var content = data.data;
+            console.log(data)
+            module.data.userInformationDetail = content;
+            module.data.memberType = content.memberType;
+            if(content.memberType == '1'){
+                document.getElementById('companyInformationContent').style.display = 'none';
+                document.getElementById('userInformationContent').style.display = 'block';
+                var userInformationData = template('userInformationData', module.data);
+                $("#userInformationContent").html(userInformationData);
+            }else{
+                document.getElementById('companyInformationContent').style.display = 'block';
+                document.getElementById('userInformationContent').style.display = 'none';
+                var companyInformationData = template('companyInformationData', module.data);
+                $("#companyInformationContent").html(companyInformationData);
+            }
+            document.getElementById('bankAddress').value = content.bankAddress;
+            document.getElementById('bankCardName').value = content.bankCardName;
+            document.getElementById('bankCardNum').value = content.bankCardNum;
+            document.getElementById('phone').innerHTML = content.phone;
+            module.data.memberId = content.id;
+            console.log(content.memberType)
+
+            //我的供求
+            tools.doGet(userSupply, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.userSupply);
+            //我的咨询
+            tools.doGet(userConsulting, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.consulting);
+            //我的竞价
+            tools.doGet(userBidding, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.bidding);
+        }
+    }
+
+    //个人中心我的供求
+    module.userSupply = function(data){
+        console.log(data)
+        if (data.code == 200) {
+            var content = data.rows;
+            console.log(data)
+            var pageCount = (data.total/module.data.pageSize).toFixed(0);
+            if (pageCount < 1){
+                pageCount = 1;
+            }
+            if(module.data.userSupplyInformationList == '') {
+                // 初始化 分页器
+                var page_s1 = createPage('.page_s1');
+                // 设置分页
+                setPage(page_s1, {
+                    pageTotal: data.total, // 数据总条数
+                    pageSize: module.data.pageSize,    // 每页显示条数
+                    pageCurrent: 1,  //  当前页
+                    maxBtnNum: 5,   // 最多按钮个数  （最少5个）
+                })
+                $('#page_s1').html('共' + pageCount + '页')
+            }
+            module.data.userSupplyInformationList = content;
+            var userSupplyInformationData = template('userSupplyInformationData', module.data);
+            $("#userSupplyInformationContent").html(userSupplyInformationData);
+        }
+    }
+
+    //个人中心我的咨询
+    module.consulting = function(data){
+        if (data.code == 200) {
+            var content = data.rows;
+            var pageCount = (data.total/module.data.pageSize).toFixed(0);
+            if (pageCount < 1){
+                pageCount = 1;
+            }
+            if(module.data.consultingInformationList == '') {
+                // 初始化 分页器
+                var page_s1 = createPage('.page_s2');
+                // 设置分页
+                setPage(page_s1, {
+                    pageTotal: data.total, // 数据总条数
+                    pageSize: module.data.pageSize,    // 每页显示条数
+                    pageCurrent: 1,  //  当前页
+                    maxBtnNum: 5,   // 最多按钮个数  （最少5个）
+                })
+            }
+            module.data.consultingInformationList = content;
+            $('#page_s2').html('共'+pageCount+'页')
+            var consultingInformationData = template('consultingInformationData', module.data);
+            $("#consultingInformationContent").html(consultingInformationData);
+        }
+    }
+
+    //个人中心我的竞价
+    module.bidding = function(data){
+        if (data.code == 200) {
+            var content = data.rows;
+            console.log(content)
+            var pageCount = (data.total/module.data.pageSize).toFixed(0);
+            if (pageCount < 1){
+                pageCount = 1;
+            }
+            if(module.data.biddingInformationList == '') {
+                // 初始化 分页器
+                var page_s1=createPage('.page_s3');
+                // 设置分页
+                setPage(page_s1, {
+                    pageTotal: data.total, // 数据总条数
+                    pageSize: module.data.pageSize,    // 每页显示条数
+                    pageCurrent: 1,  //  当前页
+                    maxBtnNum: 5,   // 最多按钮个数  （最少5个）
+                })
+                $('#page_s3').html('共' + pageCount + '页')
+            }
+            module.data.biddingInformationList = content;
+            var biddingInformationData = template('biddingInformationData', module.data);
+            $("#biddingInformationContent").html(biddingInformationData);
+        }
+    }
+
+    tabCheck = function(type){
+        document.getElementById('user').className = '';
+        document.getElementById('bank').className = '';
+        document.getElementById(type).className = 'active';
+
+        console.log(type)
+        document.getElementById('userInformationContent').style.display = 'none';
+        document.getElementById('companyInformationContent').style.display = 'none';
+        document.getElementById('bankInformationContent').style.display = 'none';
+        document.getElementById('phoneInformationContent').style.display = 'none';
+        if (module.data.memberType == '2' && type == 'user'){
+            document.getElementById('companyInformationContent').style.display = 'block';
+        }else if (module.data.memberType == '1' && type == 'user'){
+            document.getElementById('userInformationContent').style.display = 'block';
+        }else{
+            document.getElementById(type+'InformationContent').style.display = 'block';
+        }
+
+    }
+
+    phoneUpdate = function(type){
+        document.getElementById(type+'InformationContent').style.display = 'none';
+        document.getElementById('phoneInformationContent').style.display = 'block';
+    }
+
+    tabLeftCheck = function(type){
+        for (var i = 1 ; i < 5 ; i++){
+            document.getElementById('icon-list'+i).className = '';
+        }
+        document.getElementById(type).className = 'active';
+        document.getElementById('userInformation').style.display = 'none';
+        document.getElementById('supplyInformation').style.display = 'none';
+        document.getElementById('consultingInformation').style.display = 'none';
+        document.getElementById('biddingInformation').style.display = 'none';
+        if(type == 'icon-list1'){
+            document.getElementById('userInformation').style.display = 'block';
+        }
+        if(type == 'icon-list2'){
+            document.getElementById('supplyInformation').style.display = 'block';
+            module.data.clickType = 'supply';
+        }
+        if(type == 'icon-list3'){
+            document.getElementById('consultingInformation').style.display = 'block';
+            module.data.clickType = 'consulting';
+        }
+        if(type == 'icon-list4'){
+            document.getElementById('biddingInformation').style.display = 'block';
+            module.data.clickType = 'bidding';
+        }
+        module.data.pageNum = 1 ;
+    }
+
+    //翻页
+    turnThePage = function (pageNum) {
+        module.data.pageNum = pageNum ;
+        if(module.data.clickType == 'supply'){
+            tools.doGet(userSupply, {memberId:module.data.memberId,pageNum:pageNum,pageSize:module.data.pageSize}, module.userSupply);
+        }
+        if(module.data.clickType == 'consulting'){
+            tools.doGet(userConsulting, {memberId:module.data.memberId,pageNum:pageNum,pageSize:module.data.pageSize}, module.consulting);
+        }
+        if(module.data.clickType == 'bidding'){
+            tools.doGet(userBidding, {memberId:module.data.memberId,pageNum:pageNum,pageSize:module.data.pageSize}, module.bidding);
+        }
+    }
+
+    //个人用户资料修改
+    formAction = function (name,value){
+        console.log(name+'-------'+value)
+        return;
+        module.data.form.name = value ;
+        console.log(module.data.form)
+    }
+
     //个人中心选项卡鼠标悬浮
     module.userListHover = function(){
         document.getElementById('icon-list1').onmouseout = function(){

view/listingItems/itemsList.html

@@ -78,7 +78,7 @@
                             <script id="deptTypeData" type="text/html">
                                 <div class="auction_hall_table_tab auction_hall_table_tab_select" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
-                                    <div class="auction_hall_table_tab" id="standardType">{{value.dictLabel}}</div>
+                                    <div class="auction_hall_table_tab" id="standardType" onclick="typeCheck()">{{value.dictLabel}}</div>
                                 {{/each}}
                             </script>
                             <div class="auction_all_one2" id="deptTypeContent"></div>
@@ -99,13 +99,12 @@
                                 <div class="clear"></div>
                             </script>
                             <div class="auction_all_one" id="deptLocationContent"></div>
-                            <div class="clickBtm" onclick="allDept()" id="allDept"><i id="sanjiao" class="sanjiao-bottom"></i></div>
                             <!-- 市 -->
                             <div class="auction_add_area auction_add_area_one" id="secondDept" style="display: none;">
                                 <script id="deptSecondLocationData" type="text/html">
-                                    <div class="auction_hall_table_tab auction_hall_table_tab_select">全部</div>
+                                    <div class="auction_hall_table_tab auction_hall_table_tab_select" id="locInfoSecondall" onclick="secondCheck('','')">全部</div>
                                     {{each deptSecondLocationList as value i}}
-                                    <div class="auction_hall_table_tab  auction_loc">{{value.deptName}}</div>
+                                        <div class="auction_hall_table_tab  auction_loc" id="locInfoall{{i}}" onclick="secondCheck({{i}},{{value.deptId}})">{{value.deptName}}</div>
                                     {{/each}}
                                     <div class="clear"></div>
                                 </script>

view/login/login.html

@@ -27,7 +27,7 @@
             <div class="fr">
                 <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                 <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                <p class="fl userName" id="userName">Sherry</p>
+                <p class="fl userName" id="userName2">Sherry</p>
                 <div class="clear"></div>
             </div>
             <div class="headHover" id="headHover" style="display: none;">
@@ -82,16 +82,16 @@
                 <table id="loginTab" style="display: block;">
                     <tr>
                         <td width="25%">手机号码</td>
-                        <td colspan="2"><input type="text" placeholder="请输入手机号"/></td>
+                        <td colspan="2"><input type="text" id="username" placeholder="请输入手机号"/></td>
                     </tr>
                     <tr>
                         <td>密<i style="margin-left: 2em;"></i>码</td>
-                        <td colspan="2"><input type="password" placeholder="请输入密码"/></td>
+                        <td colspan="2"><input type="password" id="password" placeholder="请输入密码"/></td>
                     </tr>
                     <tr>
                         <td>图形验证</td>
-                        <td width="40%"><input type="text" placeholder="请输入验证码"/></td>
-                        <td><img src="../../static/images/banner.jpg" alt=""/></td>
+                        <td width="40%"><input type="text" id="code" placeholder="请输入验证码"/></td>
+                        <td><img id="graphicImg" alt=""/></td>
                     </tr>
                 </table>
                 <table id="phoneTab" style="display: none;">
@@ -113,7 +113,7 @@
                 <div class="remberPsw">
                     <input type="checkbox"/>记住密码
                 </div>
-                <input type="button" value="登录" class="loginBtn"/>
+                <input type="button" value="登录" id="login-submit" class="loginBtn"/>
                 <input type="button" value="注册" class="registerBtn"/>
             </div>
         </div>

view/user/user.html

@@ -4,7 +4,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>农燊高科-新闻列表</title>
+    <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="" />
@@ -13,6 +13,7 @@
     <link href="../../static/css/index.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/user/user.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/interact/interact.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/page_common.css" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
@@ -108,22 +109,22 @@
     <div class="w-1200 m-t-20">
         <div class="leftList fl">
             <ul>
-                <li class="active" id="icon-list1">
+                <li class="active" id="icon-list1" onclick="tabLeftCheck('icon-list1')">
                     <img src="../../static/images/user_index_icon1.png" id="icon1" alt="" class="fl"/>
                     <p class="fl">我的资料</p>
                     <div class="clear"></div>
                 </li>
-                <li id="icon-list2">
+                <li id="icon-list2" onclick="tabLeftCheck('icon-list2')">
                     <img src="../../static/images/user_index_icon2.png" id="icon2" alt="" class="fl"/>
                     <p class="fl">我的供求</p>
                     <div class="clear"></div>
                 </li>
-                <li id="icon-list3">
+                <li id="icon-list3" onclick="tabLeftCheck('icon-list3')">
                     <img src="../../static/images/user_index_icon3.png" id="icon3" alt="" class="fl"/>
                     <p class="fl">我的咨询</p>
                     <div class="clear"></div>
                 </li>
-                <li id="icon-list4">
+                <li id="icon-list4" onclick="tabLeftCheck('icon-list4')">
                     <img src="../../static/images/user_index_icon4.png" id="icon4" alt="" class="fl"/>
                     <p class="fl">我的竞价</p>
                     <div class="clear"></div>
@@ -131,129 +132,128 @@
             </ul>
         </div>
 
-        <!--  我的资料 — 公司      -->
-        <div class="fl userTable" style="display: none;">
-            <input type="button" value="用户资料"/>
-            <input type="button" value="银行账户信息"/>
-            <table width="100%">
+        <!--  我的资料 — 个人 — 公司     -->
+        <div class="fl userTable" id="userInformation">
+            <input type="button" id="user" onclick="tabCheck('user')" class="active" value="用户资料"/>
+            <input type="button" id="bank" onclick="tabCheck('bank')" value="银行账户信息"/>
+
+            <script id="userInformationData" type="text/html">
+                <tr>
+                    <td style="border: none;"><span>*</span>手机号码:</td>
+                    <td style="border: none;"><p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p><span onclick="phoneUpdate('user')">修改手机号</span></td>
+                </tr>
                 <tr>
-                    <td><span>*</span>手机号码:</td>
-                    <td><p class="m-l-10 m-r-10 fl">15314031621</p><span>修改手机号</span></td>
                     <td><span>*</span>密码:</td>
-                    <td><input type="text"/></td>
+                    <td><input type="text" value="" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
-                    <td><span>*</span>负责人姓名:</td>
-                    <td><input type="text"/></td>
-                    <td>社会信用代码:</td>
-                    <td><input type="text"/></td>
+                    <td style="border-bottom: 1px solid #e3e3e3;height: 0;padding: 0;"></td>
+                    <td style="border-bottom: 1px solid #e3e3e3;height: 0;padding: 0;"></td>
                 </tr>
                 <tr>
-                    <td>企业性质:</td>
-                    <td><input type="text"/></td>
-                    <td>经营范围:</td>
-                    <td><input type="text"/></td>
+                    <td><span>*</span>姓名:</td>
+                    <td><input type="text" value="{{userInformationDetail.realname}}" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
-                    <td>经营期限:</td>
-                    <td><input type="text"/></td>
-                    <td>成立时间:</td>
-                    <td><input type="text"/></td>
+                    <td><span>*</span>身份证号码:</td>
+                    <td><input type="text" value="{{userInformationDetail.idCardNum}}" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
-                    <td>注册资金:</td>
-                    <td><input type="text"/></td>
-                    <td>营业执照号:</td>
-                    <td><input type="text"/></td>
+                    <td>联系住址:</td>
+                    <td><input type="text" value="{{userInformationDetail.address}}" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
-                    <td>联系地址:</td>
-                    <td><input type="text"/></td>
                     <td>上传相关附件:</td>
-                    <td><img src="../../static/images/upload.png" alt="" class="m-l-10"/></td>
+                    <td>
+                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/><br/>
+                        <span>*身份证照片、本人和身份证的合影</span>
+                    </td>
                 </tr>
                 <tr>
                     <td></td>
-                    <td><input type="button" value="保存"/></td>
+                    <td><input type="button" value="保存" style="width: 30%"/></td>
                 </tr>
-            </table>
-        </div>
+            </script>
+            <table width="100%" id="userInformationContent"></table>
 
-        <!--  我的资料 — 个人      -->
-        <div class="fl userTable">
-            <input type="button" value="用户资料"/>
-            <input type="button" value="银行账户信息"/>
-            <table width="100%">
+            <script id="companyInformationData" type="text/html">
                 <tr>
-                    <td style="border: none;"><span>*</span>手机号码:</td>
-                    <td style="border: none;"><p class="m-l-10 m-r-10 fl">15314031621</p><span>修改手机号</span></td>
+                    <td><span>*</span>手机号码:</td>
+                    <td><p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p><span onclick="phoneUpdate('company')">修改手机号</span></td>
+                    <td><span>*</span>密码:</td>
+                    <td><input type="text"/></td>
                 </tr>
                 <tr>
-                    <td><span>*</span>密码:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td><span>*</span>公司名称:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyName}}" onchange="formAction('companyName')"/></td>
+                    <td><span>*</span>身份证号:</td>
+                    <td><input type="text" value="{{userInformationDetail.idCardNum}}" onchange="formAction('idCardNum')"/></td>
                 </tr>
                 <tr>
-                    <td style="border-bottom: 1px solid #e3e3e3;height: 0;padding: 0;"></td>
-                    <td style="border-bottom: 1px solid #e3e3e3;height: 0;padding: 0;"></td>
+                    <td><span>*</span>负责人姓名:</td>
+                    <td><input type="text" value="{{userInformationDetail.realname}}"/></td>
+                    <td>社会信用代码:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyCode}}"/></td>
                 </tr>
                 <tr>
-                    <td><span>*</span>姓名:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td>企业性质:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyNature}}"/></td>
+                    <td>经营范围:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyScope}}"/></td>
                 </tr>
                 <tr>
-                    <td><span>*</span>身份证号码:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td>经营期限:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyTimeLimit}}"/></td>
+                    <td>成立时间:</td>
+                    <td><input type="text" value="{{userInformationDetail.companySetupTime}}"/></td>
                 </tr>
                 <tr>
-                    <td>联系住址:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td>注册资金:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyCapital}}"/></td>
+                    <td>营业执照号:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyLicense}}"/></td>
                 </tr>
                 <tr>
-                    <td>上传相关附件:</td>
+                    <td>联系地址:</td>
+                    <td><input type="text" value="{{userInformationDetail.companyLicense}}"/></td>
+                    <td><span>*</span>上传相关附件:</td>
                     <td>
-                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/><br/>
-                        <span>*身份证照片、本人和身份证的合影</span>
+                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/>
                     </td>
                 </tr>
                 <tr>
                     <td></td>
-                    <td><input type="button" value="保存" style="width: 30%"/></td>
+                    <td><input type="button" value="保存"/></td>
                 </tr>
-            </table>
-        </div>
+            </script>
+            <table width="100%" id="companyInformationContent"></table>
 
-        <!--  我的资料 — 银行账户信息      -->
-        <div class="fl userTable" style="display: none;">
-            <input type="button" value="用户资料"/>
-            <input type="button" value="银行账户信息"/>
-            <table width="100%">
+            <!--  我的资料 — 银行账户信息      -->
+            <table width="100%" id="bankInformationContent" style="display: none;">
                 <tr>
                     <td style="border: none;"><span>*</span>开户银行:</td>
-                    <td style="border: none;"><input type="text" style="width: 30%"/></td>
+                    <td style="border: none;"><input type="text" id="bankAddress" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>开户姓名:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td><input type="text" id="bankCardName" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>开户账号:</td>
-                    <td><input type="text" style="width: 30%"/></td>
+                    <td><input type="text" id="bankCardNum" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
                     <td></td>
                     <td><input type="button" value="保存" style="width: 30%"/></td>
                 </tr>
             </table>
-        </div>
 
-        <!--  我的资料 — 更换手机号      -->
-        <div class="fl userTable" style="display: none;">
-            <input type="button" value="用户资料"/>
-            <input type="button" value="银行账户信息"/>
-            <table width="100%">
+
+            <!--  我的资料 — 更换手机号      -->
+            <table width="100%" id="phoneInformationContent" style="display: none;">
                 <tr>
                     <td style="border: none;"><span>*</span>当前号码:</td>
-                    <td style="border: none;"><p class="m-l-10">15314031621</p></td>
+                    <td style="border: none;"><p class="m-l-10" id="phone">15314031621</p></td>
                 </tr>
                 <tr>
                     <td><span>*</span>新手机号:</td>
@@ -261,7 +261,7 @@
                 </tr>
                 <tr>
                     <td><span>*</span>验证码:</td>
-                    <td><input type="text" style="width: 30%" class="fl"/><p class="m-l-10 fl" style="line-height: 36px;">免费获取短信动态码</p></td>
+                    <td><input type="text" style="width: 30%" class="fl"/><p class="m-l-10 fl" style="line-height: 36px;color:#007b76;cursor: pointer;">免费获取短信动态码</p></td>
                 </tr>
                 <tr>
                     <td></td>
@@ -271,10 +271,10 @@
         </div>
 
         <!--  我的供求     -->
-        <div class="fl supplyTable" style="display: none;">
+        <div class="fl supplyTable" id="supplyInformation" style="display: none;">
             <input type="button" value="发布供求"/>
             <div class="clear"></div>
-            <table width="100%" cellspacing="0" cellpadding="0">
+            <script id="userSupplyInformationData" type="text/html">
                 <tr>
                     <td>序号</td>
                     <td>供/求</td>
@@ -284,13 +284,20 @@
                     <td>是否审核</td>
                     <td>操作</td>
                 </tr>
+                {{each userSupplyInformationList as value i}}
                 <tr>
-                    <td>1</td>
+                    <td>{{i+1}}</td>
                     <td>供</td>
-                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                    <td>2021-03-02</td>
-                    <td>15563425122</td>
-                    <td>是</td>
+                    <td width="400">{{value.projectName}}</td>
+                    <td>{{value.logintime}}</td>
+                    <td>{{value.phone}}</td>
+                    <td>
+                        {{if value.phone == Y}}
+                            是
+                        {{else}}
+                            否
+                        {{/if}}
+                    </td>
                     <td>
                         <div class="fl">
                             <img src="../../static/images/modify.png" alt="" class="fl"/>
@@ -305,27 +312,14 @@
                         <div class="clear"></div>
                     </td>
                 </tr>
-                <tr>
-                    <td>2</td>
-                    <td>供</td>
-                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                    <td>2021-03-02</td>
-                    <td>15563425122</td>
-                    <td>是</td>
-                    <td></td>
-                </tr>
-            </table>
-            <ul class="pageNum">
-                <li class="active">1</li>
-                <li>2</li>
-                <li>3</li>
-                <li>4</li>
-                <li>5</li>
-                <p>...</p>
-                <li>10</li>
-                <p> >> </p>
-                <p>共10页</p>
-            </ul>
+                {{/each}}
+            </script>
+            <table width="100%" cellspacing="0" cellpadding="0" id="userSupplyInformationContent"></table>
+
+            <div class="pageNum" id="supplyNum">
+                <div style="display: inline-block;margin: 0 auto;" class="page_s1"></div>
+                <p style="display: inline-block;margin: 0 auto;" id="page_s1"></p>
+            </div>
         </div>
 
         <!--  我的供求 - 发布     -->
@@ -371,7 +365,7 @@
         </div>
 
         <!--  我的咨询     -->
-        <div class="fl releaseSupply" style="display: none;">
+        <div class="fl releaseSupply" id="consultingInformation" style="display: none;">
             <div class="searchCriteria" style="padding-top: 0;">
                 <p class="fl m-r-5">标题:</p>
                 <input type="text" class="fl m-r-25"/>
@@ -382,60 +376,31 @@
                 <div class="clear"></div>
             </div>
             <div class="interactList">
-                <ul>
+                <script id="consultingInformationData" type="text/html">
+                    {{each consultingInformationList as value i}}
                     <li>
                         <div class="m-b-20">
                             <img src="../../static/images/questions.png" alt="" class="fl m-r-20"/>
-                            <p class="fl">1. 没拍到钱怎么退回？</p>
-                            <p class="fr">03-11 15:02</p>
+                            <p class="fl wid80">{{i+1}}. {{value.content}}</p>
+                            <p class="fr">{{value.logintime}}</p>
                             <div class="clear"></div>
                         </div>
                         <div>
                             <img src="../../static/images/answer.png" alt="" class="fl m-r-20"/>
-                            <p class="fl">
-                                如果报名后未出价或者未竞价成功，保证金会在拍卖结束后的24小时内解冻。<br/>
-                                钱款需要退回银行卡方法如下：<br/>
-                                通过银行专用款项交保，请在支付宝app搜索“银行专用款项”，点击转出自行提现，无需手续费；<br/>
-                                通过网银交保，保证金会在1-3个工作日内自动退回您的银行卡；<br/>
-                                通过余额宝交保，请在支付宝app找到余额宝，点击转出；<br/>
-                                通过余额交保，如果钱款是通过银行卡充值到余额的，请在自充值之日起30天内点击“免费退回”申请免手续费退回银行卡。<br/>
-                            </p>
+                            <p class="fl wid80">{{value.reply}}</p>
+                            <p class="fr">{{value.replyTime}}</p>
                             <div class="clear"></div>
                         </div>
                     </li>
-                    <li>
-                        <div class="m-b-20">
-                            <img src="../../static/images/questions.png" alt="" class="fl m-r-20"/>
-                            <p class="fl">1. 没拍到钱怎么退回？</p>
-                            <p class="fr">03-11 15:02</p>
-                            <div class="clear"></div>
-                        </div>
-                        <div>
-                            <img src="../../static/images/answer.png" alt="" class="fl m-r-20"/>
-                            <p class="fl">
-                                如果报名后未出价或者未竞价成功，保证金会在拍卖结束后的24小时内解冻。<br/>
-                                钱款需要退回银行卡方法如下：<br/>
-                                通过银行专用款项交保，请在支付宝app搜索“银行专用款项”，点击转出自行提现，无需手续费；<br/>
-                                通过网银交保，保证金会在1-3个工作日内自动退回您的银行卡；<br/>
-                                通过余额宝交保，请在支付宝app找到余额宝，点击转出；<br/>
-                                通过余额交保，如果钱款是通过银行卡充值到余额的，请在自充值之日起30天内点击“免费退回”申请免手续费退回银行卡。<br/>
-                            </p>
-                            <div class="clear"></div>
-                        </div>
-                    </li>
-                </ul>
+                    {{/each}}
+                </script>
+                <ul id="consultingInformationContent"></ul>
+            </div>
+
+            <div class="pageNum" id="consultingNum">
+                <div style="display: inline-block;margin: 0 auto;" class="page_s2"></div>
+                <p style="display: inline-block;margin: 0 auto;" id="page_s2"></p>
             </div>
-            <ul class="pageNum">
-                <li class="active">1</li>
-                <li>2</li>
-                <li>3</li>
-                <li>4</li>
-                <li>5</li>
-                <p>...</p>
-                <li>10</li>
-                <p> >> </p>
-                <p>共10页</p>
-            </ul>
         </div>
 
         <!--  我的咨询 - 发布     -->
@@ -468,8 +433,8 @@
         </div>
 
         <!--  我的竞价     -->
-        <div class="fl supplyTable" style="display: none;">
-            <table width="100%" cellspacing="0" cellpadding="0">
+        <div class="fl supplyTable" id="biddingInformation" style="display: none;">
+            <script id="biddingInformationData" type="text/html">
                 <tr>
                     <td>序号</td>
                     <td>项目编号</td>
@@ -480,40 +445,27 @@
                     <td>项目状态</td>
                     <td>操作</td>
                 </tr>
-                <tr>
-                    <td>1</td>
-                    <td>供</td>
-                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                    <td>2021-03-02</td>
-                    <td>15563425122</td>
-                    <td>是</td>
-                    <td>进行中</td>
-                    <td>
-                        <input type="button" value="我要竞价" class="iWanna"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td>2</td>
-                    <td>供</td>
-                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                    <td>2021-03-02</td>
-                    <td>15563425122</td>
-                    <td>是</td>
-                    <td>进行中</td>
-                    <td></td>
-                </tr>
-            </table>
-            <ul class="pageNum">
-                <li class="active">1</li>
-                <li>2</li>
-                <li>3</li>
-                <li>4</li>
-                <li>5</li>
-                <p>...</p>
-                <li>10</li>
-                <p> >> </p>
-                <p>共10页</p>
-            </ul>
+                {{each biddingInformationList as value i}}
+                    <tr>
+                        <td>1</td>
+                        <td>供</td>
+                        <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
+                        <td>2021-03-02</td>
+                        <td>15563425122</td>
+                        <td>是</td>
+                        <td>进行中</td>
+                        <td>
+                            <input type="button" value="我要竞价" class="iWanna"/>
+                        </td>
+                    </tr>
+                {{/each}}
+            </script>
+            <table width="100%" cellspacing="0" cellpadding="0" id="biddingInformationContent"></table>
+
+            <div class="pageNum" id="biddingNum">
+                <div style="display: inline-block;margin: 0 auto;" class="page_s3"></div>
+                <p style="display: inline-block;margin: 0 auto;" id="page_s3"></p>
+            </div>
         </div>
 
         <div class="clear"></div>