产权交易

index.html

@@ -456,11 +456,19 @@
                                 </tr>
                                 {{each supplyDemandList as value i}}
                                 <tr>
-                                    <td width="100px">供</td>
+                                    <td width="100px">
+                                        {{if value.id!=''}}
+                                            供
+                                        {{/if}}
+                                    </td>
                                     <td>{{value.projectName}}</td>
                                     <td>{{value.logintime}}</td>
                                     <td>{{value.phone}}</td>
-                                    <td><a href="view/demand/demandDetail.html?id={{value.id}}">详情</a></td>
+                                    <td>
+                                        {{if value.id!=''}}
+                                            <a href="view/demand/demandDetail.html?id={{value.id}}">详情</a>
+                                        {{/if}}
+                                    </td>
                                 </tr>
                                 {{/each}}
                             </script>
@@ -475,11 +483,19 @@
                                 </tr>
                                 {{each supplyDemand2List as value i}}
                                 <tr>
-                                    <td width="100px">需</td>
+                                    <td width="100px">
+                                        {{if value.id!=''}}
+                                            需
+                                        {{/if}}
+                                    </td>
                                     <td>{{value.projectName}}</td>
                                     <td>{{value.logintime}}</td>
                                     <td>{{value.phone}}</td>
-                                    <td><a href="view/demand/demandDetail.html?id={{value.id}}">详情</a></td>
+                                    <td>
+                                        {{if value.id!=''}}
+                                            <a href="view/demand/demandDetail.html?id={{value.id}}">详情</a>
+                                        {{/if}}
+                                    </td>
                                 </tr>
                                 {{/each}}
                             </script>
@@ -493,8 +509,8 @@
             </div>
 
             <!--互动交流  -->
-            <div class="m-t-20 interaction">
-                <div class=" w-800 m-t-40 fl">
+            <div class="m-t-40 interaction">
+                <div class=" w-800 fl">
                     <div class="interactionTit container">
                         <p class="interactionTit-tit01 container-item">
                             <span>互动</span>交流
@@ -505,14 +521,18 @@
                     </div>
                     <script id="communicateData" type="text/html">
                         {{each communicateList as value i}}
+                            {{if i < 3}}
                             <tr>
                                 <td width="650">{{i+1}}. {{value.content}}</td>
                                 <td width="70">已回复</td>
                                 <td>{{value.replyTime}}</td>
                             </tr>
+                            {{/if}}
                         {{/each}}
                     </script>
-                    <table width="100%" class="interactionTableLeft" id="communicateContent"></table>
+                    <div style="height: 220px;">
+                        <table width="100%" class="interactionTableLeft" id="communicateContent"></table>
+                    </div>
                     <div class="m-t-20 fl" style="position:relative;width: 505px;">
                         <input type="text" placeholder="搜索问题" class="searchClass" id="interactInput" />
                         <input type="button" value="搜索" onclick="goInteractSearch()" class="searchButton" style="height: 32px;" />

static/css/index.css

@@ -386,6 +386,7 @@
 
 .centerLeft .centerLeft-center .tableList table tr{
   cursor: pointer;
+  height: 41px;
 }
 
 .centerLeft-center .centerleft-center-tit01 {
@@ -855,11 +856,11 @@ select {
 
 .bottomNews-list {
   width: 32%;
-  padding: 30px;
+  padding: 20px 30px;
   background-color: #f7f7f7;
   border: 1px solid #e3e3e3;
   display: inline-block;
-  min-height: 378px;
+  height: 332px;
 }
 
 .bottomNews-list p {
@@ -883,7 +884,7 @@ select {
 }
 
 .bottomNews-list ul li {
-  margin-top: 25px;
+  margin-top: 22px;
 }
 
 .bottomNews-list ul li a {
@@ -1223,7 +1224,7 @@ label input[type="radio"]:checked+span {
   width: 16%;
 }
 
-.tableList table tr:nth-child(2n) {
+.tableList table tr:nth-child(odd) {
   background-color: #f6f5f5;
 }
 
@@ -1249,6 +1250,7 @@ label input[type="radio"]:checked+span {
   padding: 10px;
   border-top: 1px solid #e3e3e3;
   border-right: 1px solid #e3e3e3;
+  height: 41px;
 }
 
 .tabList table tr td:last-child {

static/js/project/index.js

@@ -42,7 +42,11 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
             //成交公示数据
             announcementListList:[],
             //鉴证公告数据
-            attestationList:[]
+            attestationList:[],
+            //供应列表
+            supplyDemandList:[],
+            //需求列表
+            supplyDemand2List:[]
         },
         //柱状图参数
         option: {
@@ -398,7 +402,23 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
             //console.log(data)
             module.data.serverApi = serverApi;
             var content = data.rows;
-            module.data.landListList = content;
+            for (let i = 0 ; i < 5 ; i++){
+                if (content[i]==undefined){
+                    module.data.landListList.push({
+                        projectShowStatus:'',
+                        projectName :'',
+                        price :'',
+                        unit :'',
+                        outName :'',
+                        signupStopTime :'',
+                        biddingStopTime :'',
+                        locationName:'',
+                    });
+                }else{
+                    module.data.landListList.push(content[i]);
+                }
+            }
+            // module.data.landListList = content;
             var landListData = template('landListData', module.data);
             $("#landListContent").html(landListData);
         }
@@ -409,7 +429,28 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
             //console.log(data)
             module.data.serverApi = serverApi;
             var content = data.rows;
-            module.data.collectiveAssetsList = content;
+
+            for (let i = 0 ; i < 5 ; i++){
+
+                console.log(content[i])
+                if (content[i]==undefined){
+                    console.log('aaaaaaaaaa')
+                    module.data.collectiveAssetsList.push({
+                        id :'',
+                        projectName :'',
+                        price :'',
+                        needname :'',
+                        needStartTime :'',
+                        needStopTime :'',
+                        phone:'',
+                    });
+                }else{
+                    module.data.collectiveAssetsList.push(content[i]);
+                }
+
+            }
+
+            // module.data.collectiveAssetsList = content;
             var collectiveAssetsData = template('collectiveAssetsData', module.data);
             $("#collectiveAssetsContent").html(collectiveAssetsData);
         }
@@ -546,7 +587,19 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         if (data.code == 200) {
             //console.log(data)
             var content = data.data;
-            module.data.supplyDemandList = content;
+            for (let i = 0 ; i < 5 ; i++){
+                if (content[i]==undefined){
+                    module.data.supplyDemandList.push({
+                        id:'',
+                        projectName:'',
+                        logintime:'',
+                        phone:'',
+                    });
+                }else{
+                    module.data.supplyDemandList.push(content[i]);
+                }
+            }
+            // module.data.supplyDemandList = content;
             var supplyDemandData = template('supplyDemandData', module.data);
             $("#supply").html(supplyDemandData);
         }
@@ -557,7 +610,19 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         if (data.code == 200) {
             //console.log(data)
             var content = data.data;
-            module.data.supplyDemand2List = content;
+            for (let i = 0 ; i < 5 ; i++){
+                if (content[i]==undefined){
+                    module.data.supplyDemand2List.push({
+                        id:'',
+                        projectName:'',
+                        logintime:'',
+                        phone:'',
+                    });
+                }else{
+                    module.data.supplyDemand2List.push(content[i]);
+                }
+            }
+            // module.data.supplyDemand2List = content;
             var supplyDemand2Data = template('supplyDemand2Data', module.data);
             $("#demand").html(supplyDemand2Data);
             tools.doGet(supplyDemandRecommend + '/100/5', {}, module.supplyDemandRecommend, true);
@@ -688,6 +753,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
     }
 
     goDetail = function (id) {
+        if (!id)return;
         tools.skip('view/listingItems/itemsDetail.html?id='+id);
     }
     goUserInteract = function () {