liting2017 %!s(int64=6) %!d(string=hai) anos
pai
achega
bfb1a41ec0

+ 1 - 1
package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://192.168.1.106'",
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://static.goafanti.com'",
+    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://ss.jishutao.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",

+ 3 - 4
src/js/newMenu/achievementList.js

@@ -180,12 +180,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/achievementDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img" style="display:${thisdata.pictureUrl!=null?'block':'none'}">
-                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.pictureUrl}" alt="">
+                                <div class="img" style="display:${thisdata.firstPicture!=null?'block':'none'}">
+                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.firstPicture}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img achievemrntImg" style="display:${thisdata.pictureUrl!=null?'none':'block'}">
-                                    <img src="${thisdata.pictureUrl}" alt="">
+                                <div class="img achievemrntImg" style="display:${thisdata.firstPicture!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">

+ 3 - 4
src/js/newMenu/demandList.js

@@ -181,12 +181,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/demandDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img" style="display:${thisdata.pictureUrl!=null?'block':'none'}">
-                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.pictureUrl}" alt="">
+                                <div class="img" style="display:${thisdata.firstPic||thisdata.firstPic!=null?'block':'none'}">
+                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.firstPic}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img noImg" style="display:${thisdata.pictureUrl!=null?'none':'block'}">
-                                    <img src="${thisdata.pictureUrl}" alt="">
+                                <div class="img noImg" style="display:${thisdata.firstPic||thisdata.firstPic!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">

+ 1 - 2
src/js/newMenu/serviceList.js

@@ -149,8 +149,7 @@ $(function () {
                                     <img src="${globalConfig.avatarHost + '/upload'+thisdata.maxImgUrl}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img serviceImg" style="display:${thisdata.maxImgUrl!=null?'none':'block'}">
-                                    <img src="${thisdata.maxImgUrl}" alt="">
+                                <div class="img serviceImg" style="display:${thisdata.maxImgUrl&&thisdata.maxImgUrl!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">