From 540a1ccd43e3657d1d1c5202491bbe6b5008293f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 17:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BC=97=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNEITaskDetails.js | 2 +- .../modules/user/usersInfo/InfosPackage.js | 6 +- .../src/modules/user/usersInfo/usersInfo.css | 190 +++++++++--------- 3 files changed, 101 insertions(+), 97 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index a1e016853..5179964a5 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -313,7 +313,7 @@ class PackageIndexNEITaskDetails extends Component { -
+
{data&&data.min_price===null?"":￥{data&&data.min_price}} {data&&data.max_price===null||data&&data.min_price===null?"":~} {data&&data.max_price===null?"":￥{data&&data.max_price}} diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index f2716a064..2cafa1de4 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -176,7 +176,7 @@ class InfosPackage extends Component{
-
+
{item.min_price===null?"":￥{item.min_price}} {item.max_price===null||item.min_price===null?"":~} {item.max_price===null?"":￥{item.max_price}} @@ -199,9 +199,9 @@ class InfosPackage extends Component{ {item.bidding_users_count}人竞标
-
+ {item.published_at===null?"":
发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} -
+
}
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 0be9837bf..3c4f80b0f 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -1,93 +1,97 @@ -.navInfo{ - border:none!important; - position: absolute; - width: 100%; - bottom: -8px; -} -.navInfo li { - float: left; - margin: 0px 40px; - padding:0px; - height: 45px; - line-height: 40px; - font-size: 16px; - position: relative; -} -.navInfo li.active::after{ - position: absolute; - left: 0px; - height: 2px; - width: 100%; - content: ''; - bottom: 0px; - background: #05101A!important; - color: #666!important; -} -.navInfo li,.navInfo li.ant-menu-item-active{ - border-bottom: none!important; - color: #666!important; -} -.navInfo li.ant-menu-item-selected{ - border-bottom: 2px solid #05101A!important; - color: #05101A!important; -} -.navInfo ul.ant-menu{float: left!important;border:none!important;} - -.substancenenew{ - width: 236px; - height: 206px; - background: rgba(248,248,248,1); - border: 2px dotted rgba(225,225,225,1); - opacity: 1; - border-radius: 4px; - padding-top: 50px; - position: inherit; -} - -.substancepad{ - padding: 20px 20px 0px 20px; - border-bottom: 1px solid transparent; -} -.substancefont{ - height:24px; - font-size:18px; - font-family:Microsoft YaHei; - font-weight:400; - line-height:21px; - color:rgba(153,153,153,1); - opacity:1; - margin-top: -8px; -} -.topten{ - width: 1px; - height: 100px; - border: 2px soild rgba(225,225,225,1); - background: rgba(225,225,225,1); - border: 1px solid rgba(225,225,225,1); - margin: 0 auto; -} -.leftten{ - width: 100px; - height: 1px; - background: rgba(225,225,225,1); - border: 1px solid rgba(225,225,225,1); - margin: 0px auto; - position: absolute; - top: 120px; - left: 88px; -} -.squarebox{ - position: absolute; - top: 0px; - left: 0px; -} - -/*题库的标签--和资源标签样式相似*/ -.bankTag{max-height: 82px;overflow-y: auto} -.bankTag #sourceTag li{margin-left: 0px;margin-right: 5px;} -.bank_list_Tag{cursor: default} -/*资源标签*/ -#sourceTag li,.bank_list_Tag{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer;margin-bottom: 5px;} -#sourceTag li a{color: #4e7a9b!important;} -#sourceTag li.active{background-color: #4CACFF;color: #fff;} -#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;} \ No newline at end of file +.navInfo{ + border:none!important; + position: absolute; + width: 100%; + bottom: -8px; +} +.navInfo li { + float: left; + margin: 0px 40px; + padding:0px; + height: 45px; + line-height: 40px; + font-size: 16px; + position: relative; +} +.navInfo li.active::after{ + position: absolute; + left: 0px; + height: 2px; + width: 100%; + content: ''; + bottom: 0px; + background: #05101A!important; + color: #666!important; +} +.navInfo li,.navInfo li.ant-menu-item-active{ + border-bottom: none!important; + color: #666!important; +} +.navInfo li.ant-menu-item-selected{ + border-bottom: 2px solid #05101A!important; + color: #05101A!important; +} +.navInfo ul.ant-menu{float: left!important;border:none!important;} + +.substancenenew{ + width: 236px; + height: 206px; + background: rgba(248,248,248,1); + border: 2px dotted rgba(225,225,225,1); + opacity: 1; + border-radius: 4px; + padding-top: 50px; + position: inherit; +} + +.substancepad{ + padding: 20px 20px 0px 20px; + border-bottom: 1px solid transparent; +} +.substancefont{ + height:24px; + font-size:18px; + font-family:Microsoft YaHei; + font-weight:400; + line-height:21px; + color:rgba(153,153,153,1); + opacity:1; + margin-top: -8px; +} +.topten{ + width: 1px; + height: 100px; + border: 2px soild rgba(225,225,225,1); + background: rgba(225,225,225,1); + border: 1px solid rgba(225,225,225,1); + margin: 0 auto; +} +.leftten{ + width: 100px; + height: 1px; + background: rgba(225,225,225,1); + border: 1px solid rgba(225,225,225,1); + margin: 0px auto; + position: absolute; + top: 120px; + left: 88px; +} +.squarebox{ + position: absolute; + top: 0px; + left: 0px; +} + +/*题库的标签--和资源标签样式相似*/ +.bankTag{max-height: 82px;overflow-y: auto} +.bankTag #sourceTag li{margin-left: 0px;margin-right: 5px;} +.bank_list_Tag{cursor: default} +/*资源标签*/ +#sourceTag li,.bank_list_Tag{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer;margin-bottom: 5px;} +#sourceTag li a{color: #4e7a9b!important;} +#sourceTag li.active{background-color: #4CACFF;color: #fff;} +#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;} + +.mtf10{ + margin-top:-10px; +} \ No newline at end of file