zhangzl
/
nsgk_web
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

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

RongCheng
张泽亮 1年前
父节点
8fbad95a66 5f80b24376
当前提交
2e53e609b5
共有 22 个文件被更改，包括 26 次插入 和 26 次删除
合并视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +2
    -2
      index.html
  2. +1
    -1
      static/js/common/tools.js
  3. +1
    -1
      view/announcement/announcement.html
  4. +1
    -1
      view/announcement/announcementDetail.html
  5. +1
    -1
      view/announcement/attestation.html
  6. +1
    -1
      view/announcement/inviteTendersDetail.html
  7. +1
    -1
      view/announcement/warrantDetail.html
  8. +1
    -1
      view/announcement/winTheBiddingDetail.html
  9. +2
    -2
      view/bidding/biddingBigData.html
  10. +3
    -3
      view/bidding/biddingList.html
  11. +1
    -1
      view/demand/demand.html
  12. +1
    -1
      view/demand/demandDetail.html
  13. +1
    -1
      view/interact/interactList.html
  14. +1
    -1
      view/listingItems/bond.html
  15. +1
    -1
      view/listingItems/itemsDetail.html
  16. +1
    -1
      view/listingItems/itemsList.html
  17. +1
    -1
      view/listingItems/itemsNeedsDetail.html
  18. +1
    -1
      view/new/newDetail.html
  19. +1
    -1
      view/new/newList.html
  20. +1
    -1
      view/policy/policy.html
  21. +1
    -1
      view/policy/policyDetail.html
  22. +1
    -1
      view/user/user.html

+ 2
- 2
index.html 查看文件

@@ -201,7 +201,7 @@
<img src="" alt="" id="bannerBottom" /> <img src="" alt="" id="bannerBottom" />
<table width="100%" class="tableHead" style="table-layout: fixed;" > <table width="100%" class="tableHead" style="table-layout: fixed;" >
<tr> <tr>
<td>项目名称</td>
<td style="text-align: left;padding-left: 2%;">项目名称</td>
<td>竞价方式</td> <td>竞价方式</td>
<td>报名截止时间</td> <td>报名截止时间</td>
<td>竞价开始时间</td> <td>竞价开始时间</td>
@@ -215,7 +215,7 @@
<script id="biddingHallListData" type="text/html"> <script id="biddingHallListData" type="text/html">
{{each biddingHallListList as value i}} {{each biddingHallListList as value i}}
<tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}"> <tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}">
<td title="{{value.projectName}}">{{value.projectName}}</td>
<td style="text-align: left;padding-left: 2%;" title="{{value.projectName}}">{{value.projectName}}</td>
<td>{{value.biddingType}}</td> <td>{{value.biddingType}}</td>
<td>{{value.signupStopTime}}</td> <td>{{value.signupStopTime}}</td>
<td>{{value.biddingStartTime}}</td> <td>{{value.biddingStartTime}}</td>


+ 1
- 1
static/js/common/tools.js 查看文件

@@ -432,7 +432,7 @@ define(['jquery', 'dialog','jsencrypt'], function ($, dialog,JSEncrypt) {
*/ */
skip: function (url) { skip: function (url) {
if (url != '') { if (url != '') {
window.location = url
window.open(url)
} }
}, },
/** /**


+ 1
- 1
view/announcement/announcement.html 查看文件

@@ -44,7 +44,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/announcement/announcementDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/announcement/attestation.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/announcement/inviteTendersDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/announcement/warrantDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/announcement/winTheBiddingDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 2
- 2
view/bidding/biddingBigData.html 查看文件

@@ -85,7 +85,7 @@
<div class="bidding"> <div class="bidding">
<table width="100%" class="tableHead" style="table-layout: fixed;" > <table width="100%" class="tableHead" style="table-layout: fixed;" >
<tr> <tr>
<td>项目名称</td>
<td style="text-align: left;padding-left: 2%;">项目名称</td>
<td>竞价方式</td> <td>竞价方式</td>
<td>报名截止时间</td> <td>报名截止时间</td>
<td>竞价开始时间</td> <td>竞价开始时间</td>
@@ -99,7 +99,7 @@
<script id="biddingHallListData" type="text/html"> <script id="biddingHallListData" type="text/html">
{{each biddingHallListList as value i}} {{each biddingHallListList as value i}}
<tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}"> <tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}">
<td title="{{value.projectName}}">{{value.projectName}}</td>
<td style="text-align: left;padding-left: 2%;" title="{{value.projectName}}">{{value.projectName}}</td>
<td>{{value.biddingType}}</td> <td>{{value.biddingType}}</td>
<td>{{value.signupStopTime}}</td> <td>{{value.signupStopTime}}</td>
<td>{{value.biddingStartTime}}</td> <td>{{value.biddingStartTime}}</td>


+ 3
- 3
view/bidding/biddingList.html 查看文件

@@ -44,7 +44,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>
@@ -238,7 +238,7 @@
</div> </div>
<table width="100%" class="tableHead" style="table-layout: fixed;"> <table width="100%" class="tableHead" style="table-layout: fixed;">
<tr> <tr>
<td>项目名称</td>
<td style="text-align: left;padding-left: 2%;">项目名称</td>
<td>竞价方式</td> <td>竞价方式</td>
<td>报名结束时间</td> <td>报名结束时间</td>
<td>竞价结束时间</td> <td>竞价结束时间</td>
@@ -252,7 +252,7 @@
<script id="biddingInformationData" type="text/html"> <script id="biddingInformationData" type="text/html">
{{each biddingInformationList as value i}} {{each biddingInformationList as value i}}
<tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}"> <tr class="{{value.timeType == '未开始' ? 'notStart-row':''}}{{value.timeType == '进行中' ? 'now-row':''}}">
<td title="{{value.projectName}}">{{value.projectName}}</td>
<td style="text-align: left;padding-left: 2%;" title="{{value.projectName}}">{{value.projectName}}</td>
<td>{{value.biddingType}}</td> <td>{{value.biddingType}}</td>
<td>{{value.signupStopTime}}</td> <td>{{value.signupStopTime}}</td>
<td>{{value.biddingStopTime}}</td> <td>{{value.biddingStopTime}}</td>


+ 1
- 1
view/demand/demand.html 查看文件

@@ -42,7 +42,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/demand/demandDetail.html 查看文件

@@ -42,7 +42,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/interact/interactList.html 查看文件

@@ -42,7 +42,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/listingItems/bond.html 查看文件

@@ -43,7 +43,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/listingItems/itemsDetail.html 查看文件

@@ -47,7 +47,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/listingItems/itemsList.html 查看文件

@@ -46,7 +46,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/listingItems/itemsNeedsDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/new/newDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/new/newList.html 查看文件

@@ -42,7 +42,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/policy/policy.html 查看文件

@@ -44,7 +44,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/policy/policyDetail.html 查看文件

@@ -41,7 +41,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


+ 1
- 1
view/user/user.html 查看文件

@@ -44,7 +44,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<a href="javascript:void(0);" class="topTit02 fl">返回主站</a> <a href="javascript:void(0);" class="topTit02 fl">返回主站</a>
<a href="../bidding/biddingBigData.html" class="topTit02 fl">竞价大厅</a>
<a href="../bidding/biddingBigData.html" target="_blank" class="topTit02 fl">竞价大厅</a>
<div class="dressPc" id="dressList" style="display: none;"> <div class="dressPc" id="dressList" style="display: none;">
<ul> <ul>
<li> <li>


撰写 预览
正在加载...
取消
保存