From b63da712ef1e7002dc0d25abbc696e4345305a28 Mon Sep 17 00:00:00 2001
From: sunfengxiang <sun345347172@126.com>
Date: Thu, 15 Dec 2022 15:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/project/listingItems/items.js | 27 ++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/static/js/project/listingItems/items.js b/static/js/project/listingItems/items.js
index a0f2dbe..37b927e 100644
--- a/static/js/project/listingItems/items.js
+++ b/static/js/project/listingItems/items.js
@@ -19,6 +19,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         tools.getWebConfig();
 
         module.data.loginNow = tools.getCookie('Admin-Token');
+
         //浏览次数
         tools.doGet(outProject, {id:getQueryVariable('id')}, module.projectNum,true);
 
@@ -26,18 +27,15 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             tools.doGet(outProject + '/id/'+getQueryVariable('id'), {}, module.outProjectInformation,true);
         },100)
 
-
-
-        //项目基本信息
-        tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
-
-
-
         //焦点图
         setTimeout(function () {
             module.swiperBanner();
         },2000)
 
+        setTimeout(function(){//项目基本信息
+            tools.doGet(showImg + '/'+getQueryVariable('id'), {}, module.showImgInformation,true);
+        },100)
+
         tools.doGet(webConfig, {}, module.webConfigInformation, true)
     };
 
@@ -61,6 +59,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             module.data.titleConfig = content[9].configValue;
             module.data.importantTitle = content[7].configName+':'+ content[7].configValue.substr(3).substr(0,(content[7].configValue.substr(3).length-4));
             module.data.know = content[6].configValue;
+            $("#know").html(content[6].configValue + '<span style="margin-left: 10px;"></span>' + content[6].configValue);
         }
     }
     //底部友情链接
@@ -103,7 +102,6 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         var d,h,m,s;
         if(Date.parse(biddingStartTime)<nowTime&&nowTime<Date.parse(biddingStopTime)){
             //正在竞价
-            console.log('1')
             module.data.biddingTimeType = 1;
             document.getElementById('biddingTitle').innerHTML = '竞价进行中...';
             document.getElementById('swiperType').style.display = 'block';
@@ -115,12 +113,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             $('#countDown').html('<span>距竞价结束还有：'+d+'</span>天<span>'+h+'</span>时<span>'+m+'</span>分<span>'+s+'</span>秒')
         }else if (nowTime>Date.parse(biddingStopTime)){
             //竞价结束
-            console.log('2')
             $('#countDown').html('竞价结束')
             module.data.biddingTimeType = 2;
         }else if (nowTime<Date.parse(biddingStartTime)){
             //竞价暂未开始
-            console.log('3')
             document.getElementById('biddingTitle').innerHTML = '竞价暂未开始...';
             $('#countDown').html('暂未开始')
             module.data.biddingTimeType = 3;
@@ -235,6 +231,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
     module.showImgInformation = function (data) {
         if (data.code == 200) {
             var content = data.data;
+            debugger
             console.log(content)
             var contentList = [];
             for(var i = 0 ; i < content.length ; i++){
@@ -370,10 +367,12 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
     module.economicTypeDictionaries = function (data) {
         if (data.code == 200 && module.data.outProjectInformationDetail.economicType!='') {
             var content = data.data;
-            var economicType = content[(module.data.outProjectInformationDetail.economicType-1)].dictLabel;
-            module.data.outProjectInformationDetail.economicType = economicType;
-            var outProjectInformationData = template('outProjectInformationData', module.data);
-            $("#outProjectInformationContent").html(outProjectInformationData);
+            if(content[(module.data.outProjectInformationDetail.economicType-1)] != undefined){
+                var economicType = content[(module.data.outProjectInformationDetail.economicType-1)].dictLabel;
+                module.data.outProjectInformationDetail.economicType = economicType;
+                var outProjectInformationData = template('outProjectInformationData', module.data);
+                $("#outProjectInformationContent").html(outProjectInformationData);
+            }
         }
     }