Merge branch 'newProperty' of http://116.255.223.226:3000/zhangzl/nsgk_web into newProperty

infoport/homestead.html

@@ -100,7 +100,7 @@
                             <td>宅基地代码</td>
 <!--                            <td>房屋面积（㎡）</td>-->
 <!--                            <td>房屋类型</td>-->
-                            <td>宗地面积（亩）</td>
+                            <td>宗地面积（㎡）</td>
                             <td>使用状态</td>
                         </tr>
 

static/js/common/main.js

@@ -15,7 +15,8 @@ requirejs.config({
         popup: 'lib/dialog/popup',
         swiper: 'lib/swiper/swiper.min', //焦点图插件
         nprogress: 'lib/nprogress/nprogress',  //页面加载loading组件
-        echarts: 'lib/echarts/echarts.min', //echarts组件
+        //echarts: 'lib/echarts/echarts.min', //echarts组件
+        echarts: '', //echarts组件
         laydata:'lib/laydata/laydata',
         paging:'lib/paging/page_common',//分页插件
         cupload:'lib/cupload/cupload',//上传图片插件

static/js/project/index.js

@@ -1,7 +1,7 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, template, Tools, echarts, swiper) {
+define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, swiper) {
     //数据存储
     var module = {
         data: {
@@ -274,6 +274,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         }
     }
 
+/*    经检查，这没用上，先注释掉
     module.statisticsContent = function(data){
         //console.log(module.option)
         //console.log(data)
@@ -290,6 +291,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         var myChart = echarts.init(chartDom);
         module.option && myChart.setOption(module.option);
     }
+    */
 
     //互动交流
     module.communicateList = function (data) {

view/listingItems/itemsDetail.html

@@ -302,15 +302,15 @@
                         </tr>
                         <tr>
                             <td>竞价开始时间：{{outProjectInformationDetail.biddingStartTime}}</td>
-                            <td>竞价结束时间：<span id="stopTime">{{outProjectInformationDetail.biddingStopTime}}</span></td>
+                            <td>竞价结束时间{{if  outProjectInformationDetail.delayPeriod!=0}}（含延期）{{/if}}：<span id="stopTime">{{outProjectInformationDetail.biddingStopTime}}</span></td>
                         </tr>
                         <tr>
-                            <td>竞价方式：{{outProjectInformationDetail.biddingType}}<i title="友情提示：非拍卖竞价方式下，竞价过程中不显示竞价记录！" class="wh">?</i></td>
+                            <td>竞价方式：{{outProjectInformationDetail.biddingType}}<i title="友情提示：规则详情请看下边的竞买须知！" class="wh">?</i></td>
                             <td>竞价方向：{{outProjectInformationDetail.biddingDirect}}</td>
                         </tr>
                         <tr>
                             {{if  outProjectInformationDetail.delayPeriod!=0}}
-                            <td>延时周期：{{outProjectInformationDetail.delayPeriod}}秒<i title="延时周期说明：竞价的最后{{outProjectInformationDetail.delayPeriod}}秒内，任意方出价，距结束时间将延长{{outProjectInformationDetail.delayPeriod}}秒，直至无人出价为止" class="wh">?</i></td>
+                            <td>延时周期：{{outProjectInformationDetail.delayPeriod}}秒<i title="延时说明：竞价的最后{{outProjectInformationDetail.delayPeriod}}秒内任意方出价，竞价结束时间将延长至此刻的{{outProjectInformationDetail.delayPeriod}}秒后，直至无人出价为止。" class="wh">?</i></td>
                             {{/if}}
                             {{if outProjectInformationDetail.biddingType == '阶梯竞价'}}
                             <td>阶梯价(增减幅度)：