前端修改

index.html

@@ -17,71 +17,92 @@
     <div class="main" id="page">
         <!--顶部Title  -->
         <div class="bg-f7 txc">
-            <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-                <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-                <div class="flex_dom flex_item_end">
-                    <el-select v-model="cityValue" placeholder="请选择">
-                        <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                            <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-option-group>
-                    </el-select>
-                    <p class="topTit02">返回主站</p>
+            <div class="w-1200 topDress">
+                <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+                <p class="topTit02 fr">返回主站</p>
+                <div class="topTit02 fr" id="dress">
+                    <img src="static/images/icon3.png" alt="" class="fl"/>
+                    <p class="fl">威海市</p>
+                    <div class="clear"></div>
+                </div>
+                <div class="clear"></div>
+                <div class="dressPc" id="dressList" style="display: none;">
+                    <ul>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                    </ul>
                 </div>
             </div>
         </div>
         <!--LOGO search -->
         <div class="logoSearch w-1200">
             <div class="wid50 logoSearch-div fl">
-                <img src="./static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-                <h1 class="fl" id="webConfigName"></h1>
+                <img src="./static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+                <h1 class="fl" id="webConfigName" onclick="goIndex()"></h1>
                 <div class="clear"></div>
             </div>
             <div class="wid50 logoSearch-div fr">
                 <div class="searchDiv fl">
-                    <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
-                    <input type="button" value="搜索" class="searchButton" />
+                    <input type="text" placeholder="请输入关键词搜索" id="searchAllTitle" class="searchClass" />
+                    <input type="button" value="搜索" onclick="searchAllNew()" class="searchButton" />
                 </div>
-<!--                <div class="fr">-->
-<!--                    <img src="static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>-->
-<!--                    <img src="static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>-->
-<!--                    <p class="fl userName" id="userName">Sherry</p>-->
-<!--                    <div class="clear"></div>-->
-<!--                </div>-->
-<!--                <div class="headHover" id="headHover" style="display: none;">-->
-<!--                    <ul>-->
-<!--                        <li>-->
-<!--                            <p>Sherry</p>-->
-<!--                        </li>-->
-<!--                        <li class="m-t-5">-->
-<!--                            <img src="static/images/user_icon1.png" class="fl" alt=""/>-->
-<!--                            <p class="fl">我的资料</p>-->
-<!--                            <div class="clear"></div>-->
-<!--                        </li>-->
-<!--                        <li>-->
-<!--                            <img src="static/images/user_icon2.png" class="fl" alt=""/>-->
-<!--                            <p class="fl">我的供求</p>-->
-<!--                            <div class="clear"></div>-->
-<!--                        </li>-->
-<!--                        <li>-->
-<!--                            <img src="static/images/user_icon3.png" class="fl" alt=""/>-->
-<!--                            <p class="fl">我的咨询</p>-->
-<!--                            <div class="clear"></div>-->
-<!--                        </li>-->
-<!--                        <li class="m-b-5">-->
-<!--                            <img src="static/images/user_icon4.png" class="fl" alt=""/>-->
-<!--                            <p class="fl">我的竞价</p>-->
-<!--                            <div class="clear"></div>-->
-<!--                        </li>-->
-<!--                        <li>-->
-<!--                            <img src="static/images/user_icon5.png" class="fl" alt=""/>-->
-<!--                            <p class="fl">退出登录</p>-->
-<!--                            <div class="clear"></div>-->
-<!--                        </li>-->
-<!--                    </ul>-->
-<!--                </div>-->
-                <div class="fr">
+                <div class="fr" id="userInfo" style="display: none;">
+                    <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                    <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                    <a href="view/user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                    <div class="clear"></div>
+                </div>
+                <div class="headHover" id="headHover" style="display: none;">
+                    <ul>
+                        <li>
+                            <p id="userRealName2">Sherry</p>
+                        </li>
+                        <li class="m-t-5">
+                            <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                            <a href="view/user/user.html?type=info" class="fl">我的资料</a>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                            <a href="view/user/user.html?type=info" class="fl">我的供求</a>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                            <a href="view/user/user.html?type=info" class="fl">我的咨询</a>
+                            <div class="clear"></div>
+                        </li>
+                        <li class="m-b-5">
+                            <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                            <a href="view/user/user.html?type=info" class="fl">我的竞价</a>
+                            <div class="clear"></div>
+                        </li>
+                        <li onclick="outLogin()">
+                            <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                            <a class="fl">退出登录</a>
+                            <div class="clear"></div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="fr" id="userLogin" style="display: none;">
                     <a href="view/login/login.html">请登录</a>
                     <a href="view/login/register.html">免费注册</a>
                 </div>
@@ -393,8 +414,6 @@
                         <p>当前均价：<i></i>650元/亩/年</p>
                         <p>相较去年：<i></i><span>上升15.2%</span></p>
                         <div id="chart" style="width: 100%;height: 250px;"></div>
-
-
                         <p>本站“均价”统计自该网站已挂牌土地类项目数据</p>
                     </div>
 
@@ -403,12 +422,12 @@
                         <p class="centerRight-list1-tit02">证书查询</p>
                         <div class="centerRight-list1-div01">
                             <span>证书类型：</span>
-                            <label><input type="radio" name="aaaa" value="" /><span></span>交易鉴证</label>
-                            <label><input type="radio" name="aaaa" value="" /><span></span>经营权证</label>
+                            <label><input type="radio" name="transaction" checked value="attestation" /><span></span>交易鉴证</label>
+                            <label><input type="radio" name="aaaa" value="" disabled /><span></span>经营权证</label>
                         </div>
                         <div class="centerRight-list1-div02">
-                            <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
-                            <input type="button" value="搜索" class="searchButton" />
+                            <input type="text" placeholder="请输入关键词搜索" id="searchKeyWord" class="searchClass" />
+                            <input type="button" value="搜索" onclick="goSearchKeyWord()" class="searchButton" />
                         </div>
                         <div class="centerRight-list1-div03">
                             <p class="centerRight-list1-tit02">项目查询</p>
@@ -416,26 +435,27 @@
                                 <table>
                                     <tr>
                                         <td>项目编号：</td>
-                                        <td><input type="text" /></td>
+                                        <td><input type="text" id="projectNum" /></td>
                                     </tr>
                                     <tr>
                                         <td>项目名称：</td>
-                                        <td><input type="text" /></td>
+                                        <td><input type="text" id="projectName" /></td>
                                     </tr>
                                     <tr>
                                         <td>类<i style="display:inline-block;width: 2em;"></i>型：</td>
                                         <td>
-                                            <select>
-                                                <option value="volvo">Volvo</option>
-                                                <option value="saab">Saab</option>
-                                                <option value="opel">Opel</option>
-                                                <option value="audi">Audi</option>
+                                            <script id="deptTypeSelectData" type="text/html">
+                                            {{each deptTypeSelectList as value i}}
+                                                <option value="{{value.dictValue}}">{{value.dictLabel}}</option>
+                                            {{/each}}
+                                            </script>
+                                            <select id="deptTypeSelectContent" name="deptTypeSelect">
                                             </select>
                                         </td>
                                     </tr>
                                 </table>
                             </div>
-                            <input type="button" class="searchbtn" value="查询" />
+                            <input type="button" class="searchbtn" onclick="searchProject()" value="查询" />
                         </div>
                     </div>
 
@@ -595,84 +615,30 @@
                     </div>
                     <div class="personalTit-Tab fr">
                         <div class="tabList">
-                            <p class="active" onclick="tabCheck('supply')">个人供应</p>
-                            <p onclick="tabCheck('demand')">个人需求</p>
-                            <table style="display: none;" id="supply" cellspacing="0" cellpadding="0" width="100%">
+                            <p class="active" id="supplyBtn" onclick="tabCheck('supply')">个人供应</p>
+                            <p id="demandBtn" onclick="tabCheck('demand')">个人需求</p>
+                            <script id="supplyDemandData" type="text/html">
+                                {{each supplyDemandList as value i}}
                                 <tr>
                                     <td width="100px">供</td>
                                     <td>项目名称</td>
                                     <td>发布时间</td>
                                     <td>联系电话</td>
                                 </tr>
-                                <tr>
-                                    <td>供</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>供</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>供</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>供</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>供</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                            </table>
-                            <table style="display: none;" id="demand" cellspacing="0" cellpadding="0" width="100%">
+                                {{/each}}
+                            </script>
+                            <table id="supply" cellspacing="0" cellpadding="0" width="100%"></table>
+                            <script id="supplyDemand2Data" type="text/html">
+                                {{each supplyDemand2List as value i}}
                                 <tr>
                                     <td width="100px">需</td>
                                     <td>项目名称</td>
                                     <td>发布时间</td>
                                     <td>联系电话</td>
                                 </tr>
-                                <tr>
-                                    <td>需</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>需</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>需</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>需</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                                <tr>
-                                    <td>需</td>
-                                    <td>出租济南市莱芜区方下街道龙口东村229亩土地经营权</td>
-                                    <td>阶梯竞价</td>
-                                    <td>15314031621</td>
-                                </tr>
-                            </table>
+                                {{/each}}
+                            </script>
+                            <table style="display: none;" id="demand" cellspacing="0" cellpadding="0" width="100%"></table>
                         </div>
 
                         <!--          <el-button size="mini" round class="perBtn">个人供求发布</el-button>-->
@@ -692,28 +658,16 @@
                             更多>
                         </p>
                     </div>
-                    <table width="100%" class="interactionTableLeft">
-                        <tr>
-                            <td width="600">1. 我在乳山紫锦嘉苑一期买个地下车位，这个车位是不是公摊面积的车位？能答...</td>
-                            <td>已回复</td>
-                            <td>03-11 15:02</td>
-                        </tr>
-                        <tr>
-                            <td>2. 我在乳山紫锦嘉苑一期买个地下车位，这个车位是不是公摊面积的车位？能答...</td>
-                            <td>已回复</td>
-                            <td>03-11 15:02</td>
-                        </tr>
-                        <tr>
-                            <td>3. 我在乳山紫锦嘉苑一期买个地下车位，这个车位是不是公摊面积的车位？能答...</td>
-                            <td>已回复</td>
-                            <td>03-11 15:02</td>
-                        </tr>
-                        <tr>
-                            <td>4. 我在乳山紫锦嘉苑一期买个地下车位，这个车位是不是公摊面积的车位？能答...</td>
-                            <td>已回复</td>
-                            <td>03-11 15:02</td>
-                        </tr>
-                    </table>
+                    <script id="communicateData" type="text/html">
+                        {{each communicateList as value i}}
+                            <tr>
+                                <td width="600">{{i+1}}. {{value.content}}</td>
+                                <td>已回复</td>
+                                <td>{{value.replyTime}}</td>
+                            </tr>
+                        {{/each}}
+                    </script>
+                    <table width="100%" class="interactionTableLeft" id="communicateContent"></table>
                     <div class="m-t-20 fl" style="position:relative;width: 505px;">
                         <input type="text" placeholder="搜索问题" class="searchClass" />
                         <input type="button" value="搜索" class="searchButton" style="height: 32px;" />

static/css/dateTime.css

@@ -0,0 +1,153 @@
+.dateTimeWrap{
+    display: none;
+    -webkit-user-select:none;
+    -moz-user-select:none;
+    -ms-user-select:none;
+    -o-user-select:none;
+    user-select:none;
+    background: #494a4a;
+    padding:10px;
+    position: fixed;
+    left:0;
+    top:0;
+    z-index:999;
+    font-size:14px;
+    color:#e2e2e2;
+    width:240px;
+}
+.dateTimeWrap .datePart li.curDay{
+    color:#1ea0fa;
+}
+.dateTimeWrap #dayDat li:hover{
+    border:2px double #fff;
+    background: #1ea0fa;
+    color:#fff;
+}
+.dateTimeWrap #dateTime{
+    *float:left
+}
+.dateTimeWrap .dateTimeHead{
+    *overflow:hidden;
+    padding:8px 0px 4px;
+}
+.dateTimeWrap .datePart li{
+    border:2px double transparent;
+    float: left;
+    cursor: default;
+    vertical-align: middle;
+    width: 30px;
+    height: 26px;
+    text-align: center;
+    line-height: 26px;
+}
+.dateTimeWrap .datePart ul{
+    overflow: hidden;
+}
+.dateTimeWrap .changeMonth{
+    float: right
+}
+.dateTimeWrap .changeMonth #pre,.changeMonth #next{
+    display: inline-block;
+    width:20px;
+    height:20px;
+    cursor: default;
+    color:#333;
+    background: #fff;
+    text-align: center;
+    line-height:20px;
+}
+.dateTimeWrap .changeMonth #next{
+    margin-left: 10px;
+}
+.dateTimeWrap .dateTimeFoot span,.timeFooter span{
+    cursor: pointer;
+    display: inline-block;
+    background: #fff;
+    color: #333;
+    height:20px;
+    line-height: 20px;
+    width:50px;
+    text-align: center;
+    margin-left: 6px;
+    float:right;
+}
+.dateTimeWrap .timePart{
+    text-align:center;
+    color:#333;
+    line-height: 22px;
+}
+.dateTimeWrap .timePart p,.timePart ul{
+    background: #fff;
+}
+.dateTimeWrap .timePart>ul>li{
+    float: left;
+    width:119px;
+    background: #fff;
+    color:#333;
+    border:1px solid #ccc;
+    border-right:none;
+}
+.dateTimeWrap .timePart ul{
+    overflow: hidden;
+}
+.dateTimeWrap .timePart>ul>li p{
+    line-height: 30px;
+    border-bottom:1px solid #ccc;
+}
+.dateTimeWrap .timePart ol{
+    height:180px;
+    overflow-y: hidden;
+    *overflow-y: auto;
+    overflow-x: hidden;
+}
+.dateTimeWrap .timePart ol:hover{
+    overflow-y:auto;
+}
+.dateTimeWrap .timePart ol:hover li{
+    padding-left:17px;
+    *padding-left:0;
+}
+.dateTimeWrap .timePart ol li{
+    line-height: 30px;
+}
+.dateTimeWrap .timePart ol li.cur{
+    background: #1ea0fa;
+    color: #fff
+}
+.dateTimeWrap .dateTimeFoot,.timeFooter{
+    overflow:hidden;
+    margin-top: 10px;
+    height: 20px;
+}
+.dateTimeWrap .timeFooter span{
+    width:80px;
+}
+.dateTimeWrap .timeFooter #ensure{
+    width:50px;
+}
+.dateTimeWrap .dateTimeFoot .selTime,.timeFooter .selTime{
+    float:left;
+    margin-left:0;
+    display:none;
+}
+.dateTimeWrap .selTime{
+    width:80px!important;
+}
+.dateTimeWrap #yearSelect{
+    margin-right: 6px;
+    width:auto;
+    color: #FFF;
+}
+.dateTimeWrap #yearSelect option{
+    color: #000;
+}
+.dateTimeWrap #monthSelect option{
+    color: #000;
+}
+.dateTimeWrap #monthSelect{
+    width: auto;
+    color: #FFF;
+}
+.dateTimeWrap .darkgrey{
+    color:#d0d0d0 !important;
+}

static/css/index.css

@@ -77,6 +77,10 @@
   margin-left: 15px;
 }
 
+.logoSearch-div:first-child img,.logoSearch-div:first-child h1{
+  cursor: pointer;
+}
+
 .logoSearch .searchClass {
   border: 2px solid #007b76;
   border-radius: 20px;
@@ -1063,12 +1067,21 @@ label input[type="radio"]:checked+span {
   text-align: right;
 }
 
+.interactionTableLeft tr td:first-child {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+
 .interactionTableLeft tr:hover {
   color: #007b76;
 }
 
 .userName{
   font-size: 12px;
+  color: #000!important;
+  margin: 0!important;
 }
 
 .userName:hover{
@@ -1087,13 +1100,14 @@ label input[type="radio"]:checked+span {
   box-shadow: 0px 0px 5px #e1e1e1;
 }
 
-.headHover ul li p{
+.headHover ul li a{
   line-height: 12px;
   font-size: 12px;
   margin-left: 5px;
+  color: #000;
 }
 
-.headHover ul li p:hover{
+.headHover ul li a:hover{
   cursor: pointer;
   color: #007b76;
 }
@@ -1115,7 +1129,7 @@ label input[type="radio"]:checked+span {
   font-size: 14px;
   border-bottom: 1px solid #e3e3e3;
   padding-bottom: 15px;
-
+  line-height: 14px;
 }
 
 .headHover ul li:last-child p{
@@ -1129,15 +1143,17 @@ label input[type="radio"]:checked+span {
 
 .dressPc{
   position: absolute;
-  right: 100px;
+  right: 97px;
   z-index: 9;
   background: #FFF;
-  padding: 5px 10px;
+  padding: 5px 12px;
   box-shadow: 0px 0px 5px #e1e1e1;
+  top: 32px;
 }
 
 .dressPc ul li{
   margin-bottom: 5px;
+  cursor: pointer;
 }
 
 .dressPc ul li:last-child{
@@ -1150,7 +1166,7 @@ label input[type="radio"]:checked+span {
   border-top: 1px solid #8f8f94;
   border-right: 1px solid #8f8f94;
   transform: rotate(45deg);
-  margin-top: 10px;
+  margin-top: 8px;
   margin-left: 10px;
   display: block;
   float: left;

static/css/listingItems/items.css

@@ -348,7 +348,7 @@
     line-height: 42px;
 }
 
-.swiperInput table tr:nth-child(2) td:nth-child(2) div{
+.swiperInput .sign{
     background-color: #c21f3a;
     color: #FFFFFF;
     padding: 6px 0px;
@@ -358,15 +358,15 @@
     margin-top: 12px;
 }
 
-.swiperInput table tr:nth-child(2) td:nth-child(2) p:nth-child(1){
+.swiperInput .sign p:nth-child(1){
     font-size: 16px;
 }
 
-.swiperInput table tr:nth-child(2) td:nth-child(2) p:nth-child(2){
+.swiperInput .sign p:nth-child(2){
     font-size: 12px;
 }
 
-.swiperInput table tr:nth-child(3) td:nth-child(2) img{
+.swiperInput table tr:last-child td:nth-child(2) img{
     margin-left: 10px;
     margin-top: 8px;
 }
@@ -535,4 +535,45 @@
 .clickBtm:hover{
     background: #EEEEEE;
     color: #cccccc;
+}
+
+.bondTable tr td{
+    padding: 5px 0px;
+}
+.bondTable tr td:nth-child(odd){
+    text-align: right;
+}
+
+.bondTable input[type='text']{
+    border: 1px solid #e3e3e3;
+    width: 90%;
+    height: 30px;
+    margin-left: 10px;
+    padding-left: 10px;
+}
+
+.bondTable tr td span{
+    color: red;
+}
+
+.preservation{
+    color: #ffffff;
+    background: #007b76;
+    border-radius: 0;
+    width: 20%;
+    margin: 0 auto;
+    border: none;
+    padding: 8px;
+}
+
+.rule p{
+    font-size: 12px;
+    margin-top: 10px;
+}
+
+.projectInformation{
+    padding: 15px 20px;
+    ine-height: 40px;
+    background: #f9f9f9;
+    border: 1px solid #e8e8e8;
 }

static/css/main.css

@@ -222,6 +222,10 @@ button:focus {
     outline: none
 }
 
+select{
+    outline:none;
+}
+
 body {
     word-wrap: break-word;
     font-size: 14px;

static/css/user/user.css

@@ -82,6 +82,8 @@
     border-radius: 0;
     width: 90%;
     margin-left: 10px;
+    background: #007b76;
+    color: #ffffff;
 }
 
 .supplyTable{

static/js/api/announcementList.js

@@ -36,3 +36,11 @@ var attestationDetail = '/transaction/website/jzlist/id'//鉴证公告详情
     type: 传递字典类型参数,获取相应的字典值列表List
 */
 var Dictionaries = '/transaction/website/data/type'//成交公告字典
+
+/*
+@purl /transaction/website/jzsSearch
+@param
+    projectName: 输入框输入的搜索内容(证书关联的项目名称)
+    deptId：行政区划部门ID
+*/
+var jzsSearch = '/transaction/website/jzsSearch'//鉴证公告搜索

static/js/api/index.js

@@ -92,4 +92,28 @@ var biddingHallList = '/transaction/website/biddinglist'//竞价大厅列表
     deptId：行政区划部门ID
     limit：需要获取的数据条数
 */
-var attestationList = '/transaction/website/jzlist'//竞价大厅列表
+var attestationList = '/transaction/website/jzlist'//竞价大厅列表
+
+/*
+@purl /transaction/website/supplyDemand
+@param
+    deptId：行政区划部门ID
+    limit：需要获取的数据条数
+*/
+var supplyDemand = '/transaction/website/supplyDemand'//竞价大厅列表
+
+/*
+@purl /transaction/website/communicateList
+@param
+    deptId：行政区划部门ID
+    limit：需要获取的数据条数
+*/
+var communicateList = '/transaction/website/communicateList'//互动交流列表
+
+/*
+@purl /transaction/website/outproject/statistics/{deptId}
+@param
+    deptId：行政区划部门ID
+    limit：需要获取的数据条数
+*/
+var statistics = '/transaction/website/outproject/statistics'//土地挂牌价格走势统计图

static/js/api/interact.js

@@ -10,3 +10,12 @@
     pageSize：每页显示记录数
 */
 var interactList = '/transaction/website/communicateList'  //网站新闻类接口
+
+/*
+@purl /transaction/website/communicateSearch
+@param
+    deptId：行政区划部门ID
+    title：项目编号
+    content：项目名称
+*/
+var interactSearch = '/transaction/website/communicateSearch'  //互动交流查询接口

static/js/api/items.js

@@ -55,3 +55,17 @@ var showImg = '/transaction/website/outproject/showImg/id'//展示图片
     id: 主键ID
 */
 var biddinglist = '/transaction/website/biddinglist/projectId'//展示图片
+
+/*
+@purl /transaction/signup/getSignupByMemberIdAndProId
+@param
+    id: 主键ID
+*/
+var signup = '/transaction/signup/getSignupByMemberIdAndProId'//判断当前登录用户报名的某一项目是否被审核通过
+
+/*
+@purl /transaction/signup
+@param
+    id: 主键ID
+*/
+var signupSubmit = '/transaction/signup'//项目报名接口

static/js/api/register.js

@@ -0,0 +1,9 @@
+/*--------------
+*  用户注册类
+-----------------*/
+
+/*
+@purl /transaction/website/addMember
+@param
+*/
+var userRegister = '/transaction/website/addMember'  //修改用户信息类接口

static/js/api/user.js

@@ -6,7 +6,7 @@
 @purl /transaction/website/member/{id}
 @param
 */
-var userUpdate = '/transaction/website/member'  //修改用户信息类接口
+var userUpdate = '/transaction/member'  //修改用户信息类接口
 
 /*
 @purl /getInfo
@@ -36,4 +36,22 @@ var userConsulting = '/transaction/communicate/communicateList/member'  //我的
 @purl /transaction/outproject/biddinglist/member
 @param
 */
-var userBidding = '/transaction/outproject/biddinglist/member'  //我的竞价类接口
+var userBidding = '/transaction/outproject/biddinglist/member'  //我的竞价类接口
+
+/*
+@purl /transaction/demand
+@param
+*/
+var userDemand = '/transaction/demand'  //新增供求类接口
+
+/*
+@purl /transaction/demand/{ids}
+@param
+*/
+var deleteSupply = '/transaction/demand'  //删除供求类接口
+
+/*
+@purl /transaction/communicate
+@param
+*/
+var userCommunicate = '/transaction/communicate'  //添加咨询类接口

static/js/common/main.js

@@ -17,7 +17,9 @@ requirejs.config({
         nprogress: 'lib/nprogress/nprogress',  //页面加载loading组件
         echarts: 'lib/echarts/echarts.min', //echarts组件
         laydata:'lib/laydata/laydata',
-        paging:'lib/paging/page_common',
+        paging:'lib/paging/page_common',//分页插件
+        cupload:'lib/cupload/cupload',//上传图片插件
+        dateTime:'lib/dateTime/dateTime.min',//时间选择器
 
         //自己写的路径配置
         Tools: 'common/tools',
@@ -29,7 +31,8 @@ requirejs.config({
         demandApi: 'api/demand', //个人供求接口
         policyApi: 'api/policy',//政策法规接口
         interactApi: 'api/interact',//互动交流接口
-        user: 'api/user'//用户信息接口
+        user: 'api/user',//用户信息接口
+        register:'api/register',//用户注册接口
     },
     shim: {
         bootstrap: {
@@ -54,9 +57,9 @@ requirejs.config({
             deps: ['jquery'],
             exports: 'paging'
         },
-        uploader:{
-            deps: ['jquery','webuploader','flashonly','flashonlyMin'],
-            exports: 'uploader'
+        dateTime: {
+            deps: ['jquery'],
+            exports: 'dateTime'
         }
     }
 });
@@ -89,4 +92,56 @@ require(["jquery", "nprogress"], function ($, nprogress) {
         });
         return;
     }
+})
+
+require(["jquery", "Tools","addressApi"], function ($, Tools) {
+    var tools = new Tools();
+
+    document.getElementById('dress').onmouseover = function(){
+        document.getElementById('dressList').style.display = 'block';
+    };
+    document.getElementById('dressList').onmouseover = function(){
+        document.getElementById('dressList').style.display = 'block';
+    };
+    document.getElementById('dress').onmouseout = function(){
+        document.getElementById('dressList').style.display = 'none';
+    };
+    document.getElementById('dressList').onmouseout = function(){
+        document.getElementById('dressList').style.display = 'none';
+    };
+    if(tools.getCookie('Admin-Token') != ''){
+        document.getElementById('userInfo').style.display = 'block';
+        document.getElementById('userLogin').style.display = 'none';
+        document.getElementById('userRealName').innerHTML = tools.getCookie('userName');
+        document.getElementById('userRealName2').innerHTML = tools.getCookie('userName');
+        document.getElementById('userInfo').onmouseover = function(){
+            document.getElementById('headHover').style.display = 'block';
+        };
+        document.getElementById('headHover').onmouseover = function(){
+            document.getElementById('headHover').style.display = 'block';
+        };
+        document.getElementById('userInfo').onmouseout = function(){
+            document.getElementById('headHover').style.display = 'none';
+        };
+        document.getElementById('headHover').onmouseout = function(){
+            document.getElementById('headHover').style.display = 'none';
+        };
+    }else{
+        document.getElementById('userLogin').style.display = 'block';
+    }
+
+    outLogin = function(){
+        tools.removeCookie('Admin-Token');
+        tools.removeCookie('userName');
+        location.reload();
+    }
+
+    goIndex = function(){
+        tools.skip('/');
+    }
+
+    searchAllNew = function () {
+        var searchAllTitle = $('#searchAllTitle').val();
+        tools.skip('view/new/newList.html?title='+searchAllTitle);
+    }
 })

static/js/common/tools.js

@@ -136,6 +136,67 @@ define(['jquery', 'dialog'], function ($, dialog) {
 					var code = data.code;
 					var msg = data.msg;
 					if (code === 401) {
+						_this.removeCookie('Admin-Token');
+						_this.removeCookie('userName');
+
+						_this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () {
+							_this.skip('/view/login/login.html')
+						}, '重新登录', function () { }, "取消")
+					} else if (code === 500) {
+						_this.initError(msg)
+					} else if (code != 200) {
+						_this.initError(msg)
+					} else {
+						cb(data);
+					}
+				},
+				error: function (data) {
+					console.log(data)
+				}
+			});
+		},
+		/**
+		 * ajax delete
+		 * @param url(String)
+		 * @param data(Json) 需要提交的数据
+		 * @param cb(Function) 回调函数
+		 * @param noHead(Boolean) 是否需要Bearer，不需要传true
+		 */
+		doDelete: function (uri, data, cb, Bearer) {
+			var _this = this;
+			var url = ajaxJsUrl + uri + '?';
+			var headAttribute = ''
+			if (Bearer && Bearer == true || _this.getCookie('Admin-Token') == '') {
+				headAttribute = function (xhr) {
+					xhr.setRequestHeader("Content-Type", 'application/json;charset=utf-8');
+				}
+			} else {
+				headAttribute = function (xhr) {
+					xhr.setRequestHeader("Content-Type", 'application/json;charset=utf-8');
+					xhr.setRequestHeader('Authorization', 'Bearer ' + _this.getCookie('Admin-Token'))
+				}
+			}
+			if (data) {
+				url += $.map(data, function (n, i) {
+					if (i == data.length - 1) {
+						return i + '=' + n;
+					} else {
+						return i + '=' + n + '&';
+					}
+				}).join('');
+			}
+
+			$.ajax({
+				url: url,
+				type: 'delete',
+				beforeSend: headAttribute,
+				success: function (data) {
+					var code = data.code;
+					var msg = data.msg;
+					if (code === 401) {
+						_this.removeCookie('Admin-Token');
+						_this.removeCookie('userName');
+
 						_this.initDialog('系统提示', '登录状态已过期，您可以继续留在该页面，或者重新登录', function () {
 							_this.skip('/view/login/login.html')
 						}, '重新登录', function () { }, "取消")
@@ -278,6 +339,38 @@ define(['jquery', 'dialog'], function ($, dialog) {
 			if (url != '') {
 				window.location = url
 			}
+		},
+		/**
+		 * skip 页面跳转
+		 * @param url 跳转页面链接
+		 */
+		getNowFormatDate:function () {
+			var date = new Date();
+			var seperator1 = "-";
+			var seperator2 = ":";
+			var month = date.getMonth() + 1;
+			var day = date.getDate();
+			var hours = date.getHours();
+			var minutes = date.getMinutes();
+			var seconds = date.getSeconds();
+			if (month >= 1 && month <= 9) {
+				month = "0" + month;
+			}
+			if (day >= 0 && day <= 9) {
+				day = "0" + day;
+			}
+			if (hours >= 0 && hours <= 9) {
+				hours = "0" + hours;
+			}
+			if (minutes >= 0 && minutes <= 9) {
+				minutes = "0" + minutes;
+			}
+			if (seconds >= 0 && seconds <= 9) {
+				seconds = "0" + seconds;
+			}
+			var currentdate = date.getFullYear() + seperator1 + month + seperator1 + day + " " + hours + seperator2 + minutes + seperator2 + seconds;
+			console.log(currentdate)
+			return currentdate;
 		}
 
 	});

static/js/lib/cupload/cupload.js

@@ -0,0 +1,636 @@
+(function(window, document) {
+
+	//定义上传类
+	var Cupload = function(options) {
+
+		//初始化 new对象
+		if (!(this instanceof Cupload)) {
+			return new Cupload(options)
+		}
+
+		//设置默认参数
+		this.localValue = {
+			ele: '#cupload',
+			name: 'image',
+			num: 1,
+			width: 148,
+			height: 148,
+		}
+
+		//参数覆盖
+		this.opt = this.extend(this.localValue, options, true)
+
+		//所需变量
+		this.i = 0;
+		this.imageArr 		= new Array();//图片
+		this.widthArr 		= new Array();//图片宽度
+		this.heightArr 		= new Array();//图片高度
+		this.imageBox 		= new Array();//图片盒子
+		this.imagePreview 	= new Array();//图片预览
+		this.imageInput 	= new Array();//图片input
+		this.imageDelete 	= new Array();//图片删除遮罩
+		this.deleteBtn 		= new Array();//图片删除按钮
+		this.sortLeftBtn	= new Array();//图片左排序按钮
+		this.sortRightBtn	= new Array();//图片右排序按钮
+
+		if ((typeof options.ele) === "string") {
+			this.opt.ele = document.querySelector(options.ele)
+		} else {
+			this.opt.ele = options.ele
+		}
+
+		this.initDom();
+	}
+
+	Cupload.prototype = {
+		constructor: this,
+
+		//初始化
+		initDom: function() {
+			this.cteateImageList()
+			this.createUploadBox()
+			this.createOverlay()
+			if (this.opt.data) {
+				this.showImagePreview()
+			}
+		},
+
+		//参数覆盖
+		extend: function(o, n, override) {
+			for (var key in n) {
+				if (n.hasOwnProperty(key) && (!o.hasOwnProperty(key) || override)) {
+					o[key] = n[key]
+				}
+			}
+			return o
+		},
+
+		//创建图片列表
+		cteateImageList: function() {
+			this.imageList = document.createElement('ul')
+			this.imageList.className = 'cupload-image-list'
+			this.imageList.style.margin = 0
+			this.imageList.style.padding = 0
+			this.imageList.style.display = 'inline-block'
+			this.imageList.style.minHeight = this.opt.height
+			this.opt.ele.appendChild(this.imageList)
+			this.imageList.ondragstart = function(event) {
+				console.log('start')
+			}
+		},
+
+		//创建上传框
+		createUploadBox: function() {
+			this.uploadBox = document.createElement('div')
+			this.uploadBox.className = 'cupload-upload-box'
+			this.uploadBox.style.position = 'relative'
+			this.uploadBox.style.display = 'inline-block'
+			this.uploadBox.style.textAlign = 'center'
+			this.uploadBox.style.backgroundColor = '#fbfdff'
+			this.uploadBox.style.border = '1px dashed #c0ccda'
+			this.uploadBox.style.borderRadius = '6px'
+			this.uploadBox.style.WebkitBoxSizing = 'border-box'
+			this.uploadBox.style.boxSizing = 'border-box'
+			this.uploadBox.style.width = this.opt.width + 'px'
+			this.uploadBox.style.height = this.opt.height + 'px'
+			this.uploadBox.style.lineHeight = this.opt.height + 'px'
+			this.opt.ele.appendChild(this.uploadBox)
+			this.createUploadBtn()
+			this.createUploadInput()
+			var _this = this
+			this.uploadBox.onmouseover = function() {
+				_this.uploadBox.style.borderColor = '#007b76'
+			}
+			this.uploadBox.onmouseout = function() {
+				_this.uploadBox.style.borderColor = '#c0ccda'
+			}
+		},
+
+		//创建遮罩
+		createOverlay: function() {
+			this.overlay = document.createElement('div')
+			this.overlay.className = 'cupload-overlay'
+			this.overlay.style.display = "none"
+			this.overlay.style.position = "fixed"
+			this.overlay.style.textAlign = "center"
+			this.overlay.style.top = 0
+			this.overlay.style.right = 0
+			this.overlay.style.bottom = 0
+			this.overlay.style.left = 0
+			this.overlay.style.zIndex = 9115
+			this.overlay.style.backgroundColor = "rgba(0,0,0,.3)"
+			this.opt.ele.appendChild(this.overlay)
+			var _this = this
+			this.overlay.onclick = function() {
+				_this.zoomOutImage()
+			}
+		},
+
+		//创建上传按钮
+		createUploadBtn: function() {
+			this.uploadBtn = document.createElement('span')
+			this.uploadBtn.className = 'cupload-upload-btn'
+			this.uploadBtn.style.position = 'absolute'
+			this.uploadBtn.style.left = this.opt.width/2 - 14 + 'px'
+			this.uploadBtn.style.fontSize = '28px'
+			this.uploadBtn.style.color = '#8c939d'
+			this.uploadBtn.innerHTML = '+'
+			this.uploadBox.appendChild(this.uploadBtn)
+		},
+
+		//创建上传input
+		createUploadInput: function() {
+			this.uploadInput = document.createElement('input')
+			this.uploadInput.className = 'cupload-upload-input'
+			this.uploadInput.style.position = 'absolute'
+			this.uploadInput.style.top = 0
+			this.uploadInput.style.right = 0
+			this.uploadInput.style.width = '100%'
+			this.uploadInput.style.height = '100%'
+			this.uploadInput.style.opacity = 0
+			this.uploadInput.style.cursor = 'pointer'
+			this.uploadInput.type = 'file'
+			this.uploadInput.multiple = 'multiple'
+			this.uploadInput.accept = 'image/*'
+			this.uploadInput.title = ''
+			this.uploadBox.appendChild(this.uploadInput)
+			var _this = this
+			this.uploadInput.onchange = function() {
+				_this.removeUploadBox()
+				_this.uploadImage()
+			}
+		},
+
+		//上传图片
+		uploadImage: function() {
+			if(this.uploadInput.files.length + this.imageList.children.length > this.opt.num) {
+				this.createUploadBox()
+				alert('图片数量超出限制，请重新选择')
+				return
+			}
+			for(j = 0; j < this.uploadInput.files.length; j++){
+				var file = this.uploadInput.files[j]
+				if (!file || this.limitedSize(file)) {
+					this.createUploadBox()
+					return false
+				}
+				var reader = new FileReader()
+				var _this = this
+				reader.filename = file.name;
+				reader.onload = function(e) {
+					_this.limitedWidthAndHeight(e.target.result, e.target.filename)
+				}
+				reader.readAsDataURL(file);
+			}
+			if (this.uploadInput.files.length + this.imageList.children.length < this.opt.num) {
+				this.createUploadBox()
+			}
+		},
+
+		//检测图片大小限制
+		limitedSize: function(file) {
+			if (this.opt.minSize && file.size < this.opt.minSize * 1024) {
+				alert('图片' + file.name + '大小未到最小限制，请重新选择')
+				return true
+			}
+			if (this.opt.maxSize && file.size > this.opt.maxSize * 1024) {
+				alert('图片' + file.name + '大小超出最大限制，请重新选择')
+				return true
+			}
+			if (this.opt.limitedSize && file.size > this.opt.limitedSize * 1024) {
+				alert('图片' + file.name + '大小不符合要求，请重新选择')
+				return true
+			}
+			return false
+		},
+
+		//检测图片像素限制
+		limitedWidthAndHeight: function(src, name) {
+			var tempImage = new Image()
+			tempImage.src = src
+			var _this = this
+			tempImage.onload = function() {
+				if (_this.opt.minWidth && this.width < _this.opt.minWidth) {
+					alert('图片' + name + '宽度未到最小限制，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				if (_this.opt.minHeight && this.height < _this.opt.minHeight) {
+					alert('图片' + name + '高度未到最小限制，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				if (_this.opt.maxWidth && this.width > _this.opt.maxWidth) {
+					alert('图片' + name + '宽度超出最大限制，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				if (_this.opt.maxHeight && this.height > _this.opt.maxHeight) {
+					alert('图片' + name + '高度超出最大限制，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				if (_this.opt.limitedWidth && this.width != _this.opt.limitedWidth) {
+					alert('图片' + name + '宽度不符合要求，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				if (_this.opt.limitedHeight && this.height != _this.opt.limitedHeight) {
+					alert('图片' + name + '高度不符合要求，请重新选择')
+					_this.isCreateUploadBox()
+					return false
+				}
+				_this.foreachNum(src, name, this.width, this.height)
+			}
+		},
+
+		//检测图片数量
+		foreachNum: function(src, name, width, height) {
+			if(this.opt.url) {
+				var key = this.opt.name
+				var data = {}
+				data[key] = src
+				var _this = this
+				this.ajaxUploadImage(data, function(res) {
+					_this.createImageBox(res.responseText, res.responseText, width, height)
+				})
+			} else {
+				this.createImageBox(src, name, width, height)
+			}
+		},
+
+		//图片异步上传
+		ajaxUploadImage: function(data,success) {
+			var xhr = null;
+		    if(window.XMLHttpRequest){
+		        xhr = new XMLHttpRequest()
+		    } else {
+		        xhr = new ActiveXObject('Microsoft.XMLHTTP')
+		    }
+		    if(typeof data == 'object'){
+		        var str = '';
+		        for(var key in data){
+		            str += key+'='+data[key]+'&';
+		        }
+		        data = str.replace(/&$/, '');
+		    }
+	        xhr.open('POST', this.opt.url, true);
+	        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	        xhr.send(data);
+		    xhr.onreadystatechange = function(){
+		        if(xhr.readyState == 4){
+		            if(xhr.status == 200){
+		               success(xhr)
+		            } else {
+	                    alert(((xhr.responseText).split("</p>")[0]).split("<p>")[1])
+	                    return false
+		            }
+		        }
+		    }
+		},
+
+		//创建图片框
+		createImageBox: function(src, name, width, height, state = true) {
+			this.imageArr[this.i] = src
+			this.widthArr[this.i] = width
+			this.heightArr[this.i] = height
+			this.imageBox[this.i] = document.createElement('li')
+			this.imageBox[this.i].className = 'cupload-image-box'
+			this.imageBox[this.i].style.position = 'relative'
+			this.imageBox[this.i].style.display = 'inline-block'
+			this.imageBox[this.i].style.marginRight = 8 + 'px'
+			this.imageBox[this.i].style.backgroundColor = '#fbfdff'
+			this.imageBox[this.i].style.border = '1px solid #007b76'
+			this.imageBox[this.i].style.borderRadius = '6px'
+			this.imageBox[this.i].style.WebkitBoxSizing = 'border-box'
+			this.imageBox[this.i].style.boxSizing = 'border-box'
+			this.imageBox[this.i].style.width = this.opt.width + 'px'
+			this.imageBox[this.i].style.height = this.opt.height + 'px'
+			this.imageList.appendChild(this.imageBox[this.i])
+			this.createImagePreview(src, width, height)
+			this.createImageInput(src)
+			this.createImageDelete(name)
+			if (!state) {
+				this.setDefaultImage()
+			}
+			var _this = this
+			for (var m = 0; m <= this.i; m++) {
+				this.imageBox[m].index = m
+				this.imageBox[m].onmouseover = function(n) {
+					return function() {
+						_this.showImageDelete(n)
+					}
+				}(m)
+
+				this.imageBox[m].onmouseout = function(n) {
+					return function() {
+						_this.hideImageDelete(n)
+					}
+				}(m)
+			}
+			this.i++
+		},
+
+		//创建图片预览框
+		createImagePreview: function(src, width, height) {
+			this.imagePreview[this.i] = document.createElement('img')
+			this.imagePreview[this.i].className = 'cupload-image-preview'
+			this.imagePreview[this.i].style.position = 'absolute'
+			this.imagePreview[this.i].style.top = 0
+			this.imagePreview[this.i].style.left = 0
+			this.imagePreview[this.i].style.right = 0
+			this.imagePreview[this.i].style.bottom = 0
+			this.imagePreview[this.i].style.margin = 'auto'
+			this.imagePreview[this.i].src = src
+			this.setImageAttribute(width, height)
+			this.imageBox[this.i].appendChild(this.imagePreview[this.i])
+		},
+
+		//创建图片input
+		createImageInput: function(src) {
+			this.imageInput[this.i] = document.createElement('input')
+			this.imageInput[this.i].type = 'hidden'
+			this.imageInput[this.i].name = this.opt.name + '[]'
+			this.imageInput[this.i].value = src
+			this.imageBox[this.i].appendChild(this.imageInput[this.i])
+		},
+
+		//创建删除
+		createImageDelete: function(name) {
+			this.imageDelete[this.i] = document.createElement('div')
+			this.imageDelete[this.i].className = 'cupload-image-delete'
+			this.imageDelete[this.i].style.position = 'absolute'
+			this.imageDelete[this.i].style.width = '100%'
+			this.imageDelete[this.i].style.height = '100%'
+			this.imageDelete[this.i].style.left = 0
+			this.imageDelete[this.i].style.top = 0
+			this.imageDelete[this.i].style.textAlign = 'center'
+			this.imageDelete[this.i].style.color = '#fff'
+			this.imageDelete[this.i].style.opacity = 0
+			this.imageDelete[this.i].style.cursor = 'zoom-in'
+			this.imageDelete[this.i].style.backgroundColor = 'rgba(0,0,0,.5)'
+			this.imageDelete[this.i].style.WebkitTransition = '.3s'
+			this.imageDelete[this.i].style.transition = '.3s'
+			this.imageDelete[this.i].title = name
+			this.imageBox[this.i].appendChild(this.imageDelete[this.i])
+			this.createDeleteBtn()
+			this.createSortBtn()
+			var _this = this
+			for (var m = 0; m <= this.i; m++) {
+				this.imageDelete[m].onclick = function(n) {
+					return function() {
+						_this.zoomInImage(n)
+					}
+				}(m)
+			}
+		},
+
+		//创建删除按钮
+		createDeleteBtn: function() {
+			this.deleteBtn[this.i] = document.createElement('span')
+			this.deleteBtn[this.i].className = 'cupload-delete-btn'
+			this.deleteBtn[this.i].style.position = 'absolute'
+			this.deleteBtn[this.i].style.top = 0
+			this.deleteBtn[this.i].style.right = 0
+			this.deleteBtn[this.i].style.margin = 0
+			this.deleteBtn[this.i].style.padding = 0
+			this.deleteBtn[this.i].style.fontSize = '18px'
+			this.deleteBtn[this.i].style.width = '24px'
+			this.deleteBtn[this.i].style.height = '24px'
+			this.deleteBtn[this.i].style.cursor = 'pointer'
+			this.deleteBtn[this.i].style.backgroundImage = "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAAwUlEQVRYhe2WwQ3CMAxFPxXqOjAAqGwHo3QNCIxSxuBzcaRStcRxcin4XSJHjv2aNkoBRwHJhmSgnhvJpqbAPqN5ZKeprbU8ydhvEgDoJ2uqCHQyXhW5Maf7mrUEyYdhu7WEab+5HXiZzJXPp88Uijsm6tQ7KkZcYF0CckSDNi5i7uudzqXipbkx63oFLuACPymwzcy/4/NKTcV2/Dp2AQBPACB5sBYneRzXyl18qfAXHDlbBFqRGAoaD1KjzRb4G96BvtfyCUSIygAAAABJRU5ErkJggg==')"
+			this.deleteBtn[this.i].style.backgroundSize = '18px 18px'
+			this.deleteBtn[this.i].style.backgroundRepeat = 'no-repeat'
+			this.deleteBtn[this.i].style.backgroundPosition = 'right top'
+			this.deleteBtn[this.i].innerHTML = ''
+			this.deleteBtn[this.i].title = '删除'
+			this.imageDelete[this.i].appendChild(this.deleteBtn[this.i])
+			var _this = this
+			for (var m = 0; m <= this.i; m++) {
+				this.deleteBtn[m].onclick = function(n) {
+					return function() {
+						_this.deleteImage(n)
+					}
+				}(m)
+			}
+		},
+
+		createSortBtn: function() {
+			this.sortLeftBtn[this.i] = document.createElement('span')
+			this.sortLeftBtn[this.i].className = 'cupload-sort-left'
+			this.sortLeftBtn[this.i].style.position = 'absolute'
+			this.sortLeftBtn[this.i].style.bottom = 0
+			this.sortLeftBtn[this.i].style.left = 0
+			this.sortLeftBtn[this.i].style.margin = 0
+			this.sortLeftBtn[this.i].style.padding = 0
+			this.sortLeftBtn[this.i].style.fontSize = '18px'
+			this.sortLeftBtn[this.i].style.width = '24px'
+			this.sortLeftBtn[this.i].style.height = '24px'
+			this.sortLeftBtn[this.i].style.cursor = 'pointer'
+			this.sortLeftBtn[this.i].style.backgroundImage = "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAABP0lEQVRYhe2UIUsEURRGv7suGza4sCBoENYgGMwWs/4A/4AWwWRyMfgHRCyKGhWsYtegRYOCCGoUk1kwKLiws8dywRFGcXZ23yDMiW8e75z3YK5UUPBfAQbzlK8BEbCa9axySrFJ2pC0klWcGsCALb7Y8aAg8gHgICZfDyJ2eQU4dnEHCPf8QBU4dXkELIaU14BLl7eB+ZDyOnDt8g9gLqR8BHhw+Rsw00/ft98IaEg6lzTmS2eSbnroiyTtm9lT4ldgm/6z+9sLTPoLDPnSraTk2u5oSdo0s7sfdwATwLPXvgBTPQz4G0ADePSIV2A6j4hh4N4j3oHZPCLqwJVHtAg5D2IRNeDCI8JOxFhEFTjxiA6wnEdEBTiKRTTziCgDh7GhspT1zFKazWbWlrQgac+XRrMGdA0wDqS6QEFBEp/yS6NBq8E1tgAAAABJRU5ErkJggg==')"
+			this.sortLeftBtn[this.i].style.backgroundSize = '18px 18px'
+			this.sortLeftBtn[this.i].style.backgroundRepeat = 'no-repeat'
+			this.sortLeftBtn[this.i].style.backgroundPosition = 'left bottom'
+			this.sortLeftBtn[this.i].innerHTML = ''
+			this.sortLeftBtn[this.i].title = '左移'
+			this.imageDelete[this.i].appendChild(this.sortLeftBtn[this.i])
+
+			this.sortRightBtn[this.i] = document.createElement('span')
+			this.sortRightBtn[this.i].className = 'cupload-sort-right'
+			this.sortRightBtn[this.i].style.position = 'absolute'
+			this.sortRightBtn[this.i].style.bottom = 0
+			this.sortRightBtn[this.i].style.right = 0
+			this.sortRightBtn[this.i].style.margin = 0
+			this.sortRightBtn[this.i].style.padding = 0
+			this.sortRightBtn[this.i].style.fontSize = '18px'
+			this.sortRightBtn[this.i].style.width = '24px'
+			this.sortRightBtn[this.i].style.height = '24px'
+			this.sortRightBtn[this.i].style.cursor = 'pointer'
+			this.sortRightBtn[this.i].style.backgroundImage = "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAA4UlEQVRYhe3WMUpDQRCA4XkKWlhIqnQWwc4iKbyBTVohJ/AC2lh4gxxBA7lAqhwgvbWtpYWVnVgI4mfhghKeEPCFSeD93cIu8w+7OzMRLS3bDga4Qy9LYOqbZ5xkCBzjqUi84DRD4giPReIVZxkSXTwUiTcMMyQ6uC8S7xhlSBxgUSQ+cJEhsY95kfjEVYbEHmZ+GNftq2oOHkbETkMeuxExiYjzsh5XVXXz525cWz+Xv2MuZ6qhzFdms66gSVZ9hOsKnvcNZRYimaVYZjOS2Y5lDyQ2YCTr41bWUNrS8l++ABQQn/PCTE8cAAAAAElFTkSuQmCC')"
+			this.sortRightBtn[this.i].style.backgroundSize = '18px 18px'
+			this.sortRightBtn[this.i].style.backgroundRepeat = 'no-repeat'
+			this.sortRightBtn[this.i].style.backgroundPosition = 'right bottom'
+			this.sortRightBtn[this.i].innerHTML = ''
+			this.sortRightBtn[this.i].title = '右移'
+			this.imageDelete[this.i].appendChild(this.sortRightBtn[this.i])
+			var _this = this
+			for (var m = 0; m <= this.i; m++) {
+				this.sortLeftBtn[m].onclick = function(n) {
+					return function() {
+						_this.sortLeft(event, n)
+					}
+				}(m)
+
+				this.sortRightBtn[m].onclick = function(n) {
+					return function() {
+						_this.sortRight(event, n)
+					}
+				}(m)
+			}
+		},
+
+		//设置默认图片
+		setDefaultImage: function() {
+			this.imageBox[this.i].style.backgroundColor = "#B2B2B2"
+			this.imageDelete[this.i].title = '图片不存在'
+			this.imagePreview[this.i].src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAB4CAMAAABCfAldAAAAllBMVEUAAAB/f39XV1fKysrr6+vo6Oj+/v5DQ0OZmZl5eXni4uLGxsbe3t7b29u2trajo6Nubm5mZmbOzs6wsLCGhob8/Pzl5eXU1NS9vb2rq6tSUlJLS0vY2NiRkZFeXl7y8vLw8PBzc3P6+vr39/fBwcH09PTe3t7w8PDv7+/b29vt7e3j4+Pa2trq6urg4ODZ2dnm5ub4+PhWkjdOAAAAJnRSTlMAWCWy29fzDHdP0a7MyJuEQje4k2Dw1b+ijR8XxG0v5OFJ7uun5sxAWrkAAAUySURBVHja7ZsNV9owFIY7TUBBFBD5EEHcNM1N0hb+/59bmsQltSutbUdzdvqefbid5OXxvtzmamvQq1evXr169er1X+qqNQ0r+n0L7+YORy3poF5593EsWYfvbqrzPRygJSV4EUhtR0JAmQ4PVfmelwJIKxJ8rRzXvNwQBH6uCHgbtQQI5G6oDJGo8tlEtxUBf7CkHcAE6Zd8IVBlNftRGVC0EzB+1G9pLCotvzQgkBd9hcFAvARM0EzZjfk/BIzrC5C+bCwOcH5hE8CI1hYLX7QbChk9q6g2IPCQ0rCeKPulD6/HJ3bWQ74Ch/qAjNE6Cmk00CfX/qfkO1tpJgEvXUFK2WmuvVYy4JIKXh6QSqjXrbLaDSLp4BmgjJQNFspp+EplAX0DDEN2etdO6xOjoW8VTK8wSE+p04Gsn28Rq4DNWDIKZQF9q6As4NO9mXsHks+3iGUHhyMz9/6SfL5VMA34aaZtrk9pB3sGmB4hD8ZFXQI9A0w7eBI4Q4JngFTPCHZI8KyCcrGeEaRm6ZDgW8Q0NDOC1IsM2LcKUsroxzYwQ0IasGeAaQcvgj9DQki7BzSjqPzLDIFj4/B+YrTzChq2zw/SI+Qw1AZvKuCOAK2vpjN/mhnBDgm0S0D13/IXi3hMYs4jamYEZ0jotIJU+bIjAVDrSBzJf2Oz/UoNCR0B2nSpxCN/BPHxaWq2z1WHdANoyxfFQFwleGN2L9KAOwTU5eOQ5YN4FWSGhK4AVbeGzJTPSqCZ2XyvhoQuAG28R5LnewjcIaErQKoS1n7ZgOeB0SQNuCvAgngJAL4yW29eGe2igpYvMvG6StDO3h9QezppEsOXF/BxYLTmAFyGHBZfPtsHdPmO8Nd7DVuzcf9KBIHjXwhpRq0CWj5q+VxBZO9h7ecIAKKvhJTq3/bjtgEptUZ5rZwbgbsRF4qQ0i94NDpyHjFj1h5gOR/Eo73dvF0jArLZnZJpvJiAFOER1cStArp8eQFZztw7aRMMLN2TPbrBLAau4FsEtHzFhPjNNdhgzhSDKR/jAO7qyMbcHLCcTwoAZcxn81fKNAOl+WsncB1zK4CWr4Rwkb0lfjjphqDM7nUIVRfRNgDt9eW8BNplbzqPByGzR2OusXQfNQfU50cJnyG8+XLbGcnJy8abI5TebQBavjIlZuayevwZJaRAEKt0mgPKKKrf3tx8cZqtEADJyc2nKSCjLIbqhPe550eWPCkmZI0ryPT26oTr3AM448IiqiOxKaBu4OqEeJyzW4wKPVjIGgLaAbAq4fI65zd8LGplwihrWMEYvk04zz+IwwEKG6UZIIcaD/Oshl8MVzGQ4rdhE0AGtR43mmwzfmt8xqZZxGUBFw6Ibg1vUHJmLQ/rATYR8LXr9kHg3OLo0oBgntgy2mNSInrpCgp3NhxOCJTV+8KA4uied2Oeevn0aFQ24A1KytZfEtA+kme0QNLJrwpmAp4hIJ4BZgLejoh3gMINeM6BeAaYCfgeC+IZoAnYnnC+AboBv8kG9g0QnICfRwC+AcqArcdLDMQ3QIHsd5Del4J4BgjqqWmjB9kg3gGSiT3hJJ93gE7AewzgHaAO2I6AvgG6AV9zIN4BCjQNjB5xQnwDdDt4JxvEP0Ab8BQJ4h9ggqbOCOgfoMCbwGjFgVwCMIEaP9gidb9s8tVMZcApSmp0sBkB6wrsG6VcEyKgsuwDKbcogfoSchiqqik+8qqK+WfAexTHvL6OsoCV9bwZX1fUeDX7HLHmclNtjTdXQa9evXr16tWr17f1G41D8rN+B+2KAAAAAElFTkSuQmCC'
+			if (130 / this.opt.width > 105 / this.opt.height) {
+				this.imagePreview[this.i].style.width = this.opt.width - 2 + 'px'
+				this.imagePreview[this.i].style.height = 105 / (130 / this.opt.width) - 2 + 'px'
+			} else {
+				this.imagePreview[this.i].style.width = 130 / (105 / this.opt.height) - 2 + 'px'
+				this.imagePreview[this.i].style.height = this.opt.height - 2 + 'px'
+			}
+		},
+
+		//设置图片宽高
+		setImageAttribute: function(width, height) {
+			if (width / this.opt.width > height / this.opt.height) {
+				this.imagePreview[this.i].style.width = this.opt.width - 2 + 'px'
+				this.imagePreview[this.i].style.height = height / (width / this.opt.width) - 2 + 'px'
+			} else {
+				this.imagePreview[this.i].style.width = width / (height / this.opt.height) - 2 + 'px'
+				this.imagePreview[this.i].style.height = this.opt.height - 2 + 'px'
+			}
+		},
+
+		//data图片预览
+		showImagePreview: function() {
+			var obj = this.opt.data
+			if (obj.length >= this.opt.num) {
+				this.removeUploadBox()
+			}
+			var _this = this
+			var tempImage = new Image()
+			tempImage.src = obj[this.i]
+			tempImage.onload = function() {
+				_this.createImageBox(obj[_this.i], obj[_this.i], this.width, this.height)
+				setTimeout(function() {
+					if (obj[_this.i]) {
+						_this.showImagePreview()
+					}
+				}, 0);
+			}
+			tempImage.onerror = function() {
+				_this.createImageBox(obj[_this.i], obj[_this.i], 0, 0, false)
+				setTimeout(function() {
+					if (obj[_this.i]) {
+						_this.showImagePreview()
+					}
+				}, 0);
+			}
+		},
+
+		//图片放大预览
+		zoomInImage: function(n) {
+			if(event.target.classList[0] === 'cupload-delete-btn' || event.target.classList[0] === 'cupload-sort-right' || event.target.classList[0] === 'cupload-sort-left') {
+				return;
+			}
+			if(this.imagePreview[n].src == 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAB4CAMAAABCfAldAAAAllBMVEUAAAB/f39XV1fKysrr6+vo6Oj+/v5DQ0OZmZl5eXni4uLGxsbe3t7b29u2trajo6Nubm5mZmbOzs6wsLCGhob8/Pzl5eXU1NS9vb2rq6tSUlJLS0vY2NiRkZFeXl7y8vLw8PBzc3P6+vr39/fBwcH09PTe3t7w8PDv7+/b29vt7e3j4+Pa2trq6urg4ODZ2dnm5ub4+PhWkjdOAAAAJnRSTlMAWCWy29fzDHdP0a7MyJuEQje4k2Dw1b+ijR8XxG0v5OFJ7uun5sxAWrkAAAUySURBVHja7ZsNV9owFIY7TUBBFBD5EEHcNM1N0hb+/59bmsQltSutbUdzdvqefbid5OXxvtzmamvQq1evXr169er1X+qqNQ0r+n0L7+YORy3poF5593EsWYfvbqrzPRygJSV4EUhtR0JAmQ4PVfmelwJIKxJ8rRzXvNwQBH6uCHgbtQQI5G6oDJGo8tlEtxUBf7CkHcAE6Zd8IVBlNftRGVC0EzB+1G9pLCotvzQgkBd9hcFAvARM0EzZjfk/BIzrC5C+bCwOcH5hE8CI1hYLX7QbChk9q6g2IPCQ0rCeKPulD6/HJ3bWQ74Ch/qAjNE6Cmk00CfX/qfkO1tpJgEvXUFK2WmuvVYy4JIKXh6QSqjXrbLaDSLp4BmgjJQNFspp+EplAX0DDEN2etdO6xOjoW8VTK8wSE+p04Gsn28Rq4DNWDIKZQF9q6As4NO9mXsHks+3iGUHhyMz9/6SfL5VMA34aaZtrk9pB3sGmB4hD8ZFXQI9A0w7eBI4Q4JngFTPCHZI8KyCcrGeEaRm6ZDgW8Q0NDOC1IsM2LcKUsroxzYwQ0IasGeAaQcvgj9DQki7BzSjqPzLDIFj4/B+YrTzChq2zw/SI+Qw1AZvKuCOAK2vpjN/mhnBDgm0S0D13/IXi3hMYs4jamYEZ0jotIJU+bIjAVDrSBzJf2Oz/UoNCR0B2nSpxCN/BPHxaWq2z1WHdANoyxfFQFwleGN2L9KAOwTU5eOQ5YN4FWSGhK4AVbeGzJTPSqCZ2XyvhoQuAG28R5LnewjcIaErQKoS1n7ZgOeB0SQNuCvAgngJAL4yW29eGe2igpYvMvG6StDO3h9QezppEsOXF/BxYLTmAFyGHBZfPtsHdPmO8Nd7DVuzcf9KBIHjXwhpRq0CWj5q+VxBZO9h7ecIAKKvhJTq3/bjtgEptUZ5rZwbgbsRF4qQ0i94NDpyHjFj1h5gOR/Eo73dvF0jArLZnZJpvJiAFOER1cStArp8eQFZztw7aRMMLN2TPbrBLAau4FsEtHzFhPjNNdhgzhSDKR/jAO7qyMbcHLCcTwoAZcxn81fKNAOl+WsncB1zK4CWr4Rwkb0lfjjphqDM7nUIVRfRNgDt9eW8BNplbzqPByGzR2OusXQfNQfU50cJnyG8+XLbGcnJy8abI5TebQBavjIlZuayevwZJaRAEKt0mgPKKKrf3tx8cZqtEADJyc2nKSCjLIbqhPe550eWPCkmZI0ryPT26oTr3AM448IiqiOxKaBu4OqEeJyzW4wKPVjIGgLaAbAq4fI65zd8LGplwihrWMEYvk04zz+IwwEKG6UZIIcaD/Oshl8MVzGQ4rdhE0AGtR43mmwzfmt8xqZZxGUBFw6Ibg1vUHJmLQ/rATYR8LXr9kHg3OLo0oBgntgy2mNSInrpCgp3NhxOCJTV+8KA4uied2Oeevn0aFQ24A1KytZfEtA+kme0QNLJrwpmAp4hIJ4BZgLejoh3gMINeM6BeAaYCfgeC+IZoAnYnnC+AboBv8kG9g0QnICfRwC+AcqArcdLDMQ3QIHsd5Del4J4BgjqqWmjB9kg3gGSiT3hJJ93gE7AewzgHaAO2I6AvgG6AV9zIN4BCjQNjB5xQnwDdDt4JxvEP0Ab8BQJ4h9ggqbOCOgfoMCbwGjFgVwCMIEaP9gidb9s8tVMZcApSmp0sBkB6wrsG6VcEyKgsuwDKbcogfoSchiqqik+8qqK+WfAexTHvL6OsoCV9bwZX1fUeDX7HLHmclNtjTdXQa9evXr16tWr17f1G41D8rN+B+2KAAAAAElFTkSuQmCC') {
+				alert('图片不存在')
+				return;
+			}
+			this.zommImage = document.createElement('img')
+			this.zommImage.style.display = "inline-block"
+			this.zommImage.style.verticalAlign = "middle"
+			this.zommImage.style.position= "absolute";
+			this.zommImage.style.top="50%";
+			this.zommImage.style.transform="translate(-50%,-50%)";
+			this.zommImage.src = this.imageArr[n]
+			if (this.widthArr[n] / window.innerWidth > this.heightArr[n] / window.innerHeight) {
+				this.zommImage.style.width = 0.8 * window.innerWidth + 'px'
+				this.zommImage.style.height = 0.8 * this.heightArr[n] / (this.widthArr[n] / window.innerWidth) + 'px'
+			} else {
+				this.zommImage.style.width = 0.8 * this.widthArr[n] / (this.heightArr[n] / window.innerHeight) + 'px'
+				this.zommImage.style.height = 0.8 * window.innerHeight + 'px'
+			}
+			this.overlay.appendChild(this.zommImage)
+			this.overlay.style.lineHeight = window.innerHeight + 'px'
+			this.overlay.style.cursor = "zoom-out"
+			this.overlay.style.display = "block"
+		},
+
+		//关闭图片放大预览
+		zoomOutImage: function() {
+			this.overlay.style.display = "none"
+			this.zommImage.remove()
+		},
+
+		//检测当前图片数量，判断是否创建上传框
+		isCreateUploadBox: function() {
+			this.removeUploadBox()
+			if (this.imageList.children.length < this.opt.num) {
+				this.createUploadBox()
+			}
+		},
+
+		//删除图片
+		deleteImage: function(n) {
+			this.imageBox[n].remove()
+			this.removeUploadBox()
+			if (this.imageList.children.length < this.opt.num) {
+				this.createUploadBox()
+			}
+			if(this.opt.deleteUrl) {
+				var xhr = null;
+				var key = this.opt.name
+				var data = {}
+				data[key] = this.imageArr[n]
+			    if(window.XMLHttpRequest){
+			        xhr = new XMLHttpRequest()
+			    } else {
+			        xhr = new ActiveXObject('Microsoft.XMLHTTP')
+			    }
+			    if(typeof data == 'object'){
+			        var str = '';
+			        for(var key in data){
+			            str += key+'='+data[key]+'&';
+			        }
+			        data = str.replace(/&$/, '');
+			    }
+		        xhr.open('POST', this.opt.deleteUrl, true);
+		        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+		        xhr.send(data);
+			    xhr.onreadystatechange = function(){
+			        if(xhr.readyState == 4){
+			            if(xhr.status == 200){
+			               console.log(xhr.response)
+			            } else {
+		                    alert(((xhr.responseText).split("</p>")[0]).split("<p>")[1])
+		                    return false
+			            }
+			        }
+			    }
+			}
+		},
+
+		sortLeft: function(event, n) {
+			if(this.imageBox[n].previousSibling) {
+				this.imageList.insertBefore(this.imageBox[n], this.imageBox[n].previousSibling)
+			}
+		},
+
+		sortRight: function(event, n) {
+			if(this.imageBox[n].nextSibling) {
+				this.imageList.insertBefore(this.imageBox[n].nextSibling, this.imageBox[n])
+			}
+		},
+
+		//移除上传框
+		removeUploadBox: function() {
+			this.uploadBox.remove()
+		},
+
+		//显示图片删除
+		showImageDelete: function(m) {
+			this.imageDelete[m].style.opacity = 1
+		},
+
+		//隐藏图片删除
+		hideImageDelete: function(m) {
+			this.imageDelete[m].style.opacity = 0
+		},
+	}
+
+	window.Cupload = Cupload;
+})(window, document)

static/js/project/announcementList/announcementList.js

@@ -14,7 +14,7 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 1,
+            pageSize: 50,
             //总页数
             pageCount:0,
             //选中卡ID
@@ -24,16 +24,32 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     var tools = new Tools();
 
     module.init = function (page) {
-
         //成交公告
         tools.doGet(announList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.announInformation,true);
-
-        //鉴证公告
-        tools.doGet(attestationList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
-
-
+        var type = getQueryVariable('type');
+        var keyWord = getQueryVariable('searchKeyWord');
+        if(type != undefined && type != ''){
+            console.log('搜索进入')
+            tabList(type);
+            tools.doGet(jzsSearch, {deptId:100,projectName:keyWord,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
+        }else{
+            console.log('正常进入')
+            //鉴证公告
+            tools.doGet(attestationList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
+        }
     };
 
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
     //项目公告数据
     module.announInformation = function (data) {
         if (data.code == 200) {
@@ -109,6 +125,9 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
         if(module.data.clickType == 'attestation'){
+            if(getQueryVariable('searchKeyWord')!=undefined&&getQueryVariable('searchKeyWord')!=''){
+                tools.doGet(jzsSearch, {deptId:100,projectName:getQueryVariable('searchKeyWord'),pageNum:pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
+            }
             tools.doGet(attestationList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.attestationInformation,true);
         }
         if(module.data.clickType == 'announcement'){

static/js/project/bidding/biddingList.js

@@ -1,7 +1,7 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, template, Tools ) {
+define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateTime'], function ($, template, Tools ) {
     //数据存储
     var module = {
         data: {
@@ -18,7 +18,34 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
             //每页数量
             pageSize: 50,
             //总页数
-            pageCount:0
+            pageCount:0,
+            //标的物选中项id
+            deptId:'',
+            //标的所在地选中
+            secondDeptId:'',
+            //标的物类型ID
+            projectNumber:'',
+            //项目状态
+            projectShowStatus:'',
+            //报名开始时间
+            signupStartTime:'',
+            //报名结束时间
+            signupStopTime:'',
+            //竞价开始时间
+            biddingStartTime:'',
+            //竞价结束时间
+            biddingStopTime:'',
+            form:{
+                deptId:'',
+                projectNumber:'',
+                projectShowStatus:'',
+                signupStartTime:'',
+                signupStopTime:'',
+                biddingStartTime:'',
+                biddingStopTime:'',
+                pageNum:1,
+                pageSize:1,
+            }
         },
     };
     var tools = new Tools();
@@ -32,7 +59,39 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
         tools.doGet(webDeptType+"/project_type", {}, module.deptType,true);
 
         //标的物所在地
-        tools.doGet(webDept + '/0', {}, module.deptLocation,true);
+        tools.doGet(webDept, {deptId:''}, module.deptLocation, true);
+
+        $("#signStartTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#signEndTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#auctionStartTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#endTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
     };
 
     //挂牌项目列表
@@ -67,11 +126,7 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
     module.deptType = function (data) {
         console.log(data)
         if (data.code == 200) {
-            var content = [] ;
-            console.log(data.data)
-            for (var i = 0 ; i < 4 ; i++){
-                content[i] = data.data[i];
-            }
+            var content = data.data ;
             module.data.deptTypeList = content;
             var deptTypeData = template('deptTypeData', module.data);
             $("#deptTypeContent").html(deptTypeData);
@@ -81,19 +136,105 @@ define(['jquery', "template", "Tools", "biddingApi", "paging"], function ($, tem
     //标的物所在地
     module.deptLocation = function (data) {
         if (data.code == 200) {
-            var content = [] ;
-            for (var i = 0 ; i < 7 ; i++){
-                content[i] = data.data[i];
-            }
+            var content = data.data ;
             module.data.deptLocationList = content;
             var deptLocationData = template('deptLocationData', module.data);
             $("#deptLocationContent").html(deptLocationData);
         }
     }
 
+    //标的物所在地(二级)
+    module.deptSecondLocation = function (data) {
+        if ( data.data.length == 0){
+            document.getElementById('secondDept').style.display = 'none';
+            return;
+        }else{
+            document.getElementById('secondDept').style.display = 'block';
+        }
+        if (data.code == 200) {
+            console.log(data)
+            var content = data.data;
+            module.data.deptSecondLocationList = content;
+            var deptSecondLocationData = template('deptSecondLocationData', module.data);
+            $("#secondDept").html(deptSecondLocationData);
+            console.log(module.data.deptId)
+        }
+    }
+
+    tabCheck = function (deptId) {
+        module.data.deptId = deptId;
+        $('#locInfoall').attr("class","auction_hall_table_tab auction_loc");
+        $("#deptLocationContent div").attr("class","auction_hall_table_tab auction_loc");
+        if(deptId == ''){
+            $('#locInfoall').addClass('auction_hall_table_tab_select');
+            document.getElementById('secondDept').style.display = 'none';
+        }else{
+            $('#locInfoall'+deptId).addClass('auction_hall_table_tab_select');
+            tools.doGet(webDept, {deptId:deptId}, module.deptSecondLocation, true);
+        }
+    }
+
+    secondCheck = function(id,secondDeptId){
+        $('#locInfoSecondall').attr("class","auction_hall_table_tab auction_loc");
+        $("#secondDept div").attr("class","auction_hall_table_tab auction_loc");
+        if(id == '' && secondDeptId == ''){
+            $('#locInfoSecondall').addClass('auction_hall_table_tab_select');
+        }else{
+            $('#locInfoall'+id).addClass('auction_hall_table_tab_select');
+            module.data.deptId = secondDeptId;
+        }
+    }
+
+    allDept = function (){
+        module.data.deptSize = 30
+        document.getElementById('allDept').innerHTML = "<i class='sanjiao-top'></i>";
+        document.getElementById('allDept').onclick = upDept;
+        tools.doGet(webDept + '/0', {}, module.deptLocation, true);
+    }
+
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList,true);
+        tools.doGet(biddingList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList,true);
+    }
+
+    typeCheck = function(id,projectNumber){
+        module.data.projectNumber = projectNumber;//标的物类型ID
+        document.getElementById('standardTypeAll').className = 'auction_hall_table_tab';
+        if(id == ''){
+            id = 'All';
+        }
+        for (var i = 0 ; i < module.data.deptTypeList.length ; i++){
+            document.getElementById('standardType'+(i+1)).className = 'auction_hall_table_tab';
+        }
+        document.getElementById('standardType'+id).className = 'auction_hall_table_tab auction_hall_table_tab_select';
+    }
+
+    selectedStatus = function(id,projectShowStatus){
+        module.data.projectShowStatus = projectShowStatus;
+        document.getElementById('statusall').className = 'auction_hall_table_tab'
+        for (var i = 0 ; i < 5 ; i++){
+            document.getElementById('status'+(1+i)).className = 'auction_hall_table_tab'
+        }
+        document.getElementById('status'+id).className = 'auction_hall_table_tab auction_hall_table_tab_select'
+    }
+
+    goSearch = function(){
+        module.data.itemsInformationList = '';
+        $('.page_s1').html('')
+        $('#page_s1').html('')
+        module.data.form.deptId = module.data.deptId;
+        module.data.form.projectNumber = module.data.projectNumber;
+        module.data.form.projectShowStatus= module.data.projectShowStatus;
+        module.data.form.signupStartTime= $('#signStartTimeStr').val();
+        module.data.form.signupStopTime= $('#signEndTimeStr').val();
+        module.data.form.biddingStartTime= $('#auctionStartTimeStr').val();
+        module.data.form.biddingStopTime= $('#endTimeStr').val();
+        module.data.form.pageNum= module.data.pageNum;
+        module.data.form.pageSize= module.data.pageSize;
+
+        console.log(module.data.form)
+
+        tools.doGet(biddingList, module.data.form, module.biddingList, true);
     }
     return module;
 });

static/js/project/index.js

@@ -58,7 +58,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
                         margin: 15
                     }
                 },
-                data: ['2014', '2015', '2016', '2017', '2018', '2019', '2020', '2021']
+                data: []
             },
             yAxis: {
                 type: 'value',
@@ -80,7 +80,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
 
             },
             series: [{
-                data: [490, 520, 650, 600, 700, 640, 680, 600, 660],//实际值减300
+                data: [],//实际值减300
                 type: 'bar',
                 itemStyle: {
                     color: '#007b76'
@@ -112,11 +112,14 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         tools.doGet(websiteNew + '/5/0/6', {}, module.dataDownload, true);
 
         //标的物所在地
-        tools.doGet(webDept + '/0', {}, module.deptLocation , true);
+        tools.doGet(webDept, {deptId:''}, module.deptLocation , true);
 
         //标的物类型
         tools.doGet(webDeptType+"/project_type", {}, module.deptType, true);
 
+        //标的物类型下拉菜单
+        tools.doGet(webDeptType+"/project_type", {}, module.deptTypeSelect, true);
+
         //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
         tools.doGet(webConfig, {}, module.webConfigInformation, true);
 
@@ -147,16 +150,20 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         //查询挂牌项目浏览总次数
         tools.doGet(attestationList + '/0/5', {}, module.attestationList, true);
 
+        //个人供求
+        tools.doGet(supplyDemand + '/100/1/5', {}, module.supplyDemand, true);
+        tools.doGet(supplyDemand + '/100/2/5', {}, module.supplyDemand2, true);
+
+        //互动交流
+        tools.doGet(communicateList + '/100/5', {}, module.communicateList, true);
+
+        //土地挂牌价格走势统计图
+        tools.doGet(statistics, {deptId: 100}, module.statisticsContent, true);
+
         //竞价大厅-滚动
         //module.hallRolling();
 
-        //用户资料鼠标悬浮
-        // module.userHover();
 
-        //  柱状图绘制
-        var chartDom = document.getElementById('chart');
-        var myChart = echarts.init(chartDom);
-        module.option && myChart.setOption(module.option);
 
     };
 
@@ -183,6 +190,30 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         }
     }
 
+    module.statisticsContent = function(data){
+        console.log(module.option)
+        console.log(data.priceAvgList)
+        for (var i = 0 ; i < data.priceAvgList.length ; i++){
+            module.option.xAxis.data[i] = data.priceAvgList[i].year
+            module.option.series[0].data[i] = data.priceAvgList[i].price
+        }
+        //  柱状图绘制
+        var chartDom = document.getElementById('chart');
+        var myChart = echarts.init(chartDom);
+        module.option && myChart.setOption(module.option);
+    }
+
+    //互动交流
+    module.communicateList = function (data) {
+        if (data.code == 200) {
+            console.log(data.data)
+            var content = data.data;
+            module.data.communicateList = content;
+            var communicateData = template('communicateData', module.data);
+            $("#communicateContent").html(communicateData);
+        }
+    }
+
     //新闻资讯数据
     module.NewsInformation = function (data) {
         if (data.code == 200) {
@@ -225,12 +256,14 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
 
     //标的物所在地
     module.deptLocation = function (data) {
+        console.log(data)
         if (data.code == 200) {
-            var content = [] ;
-            for (var i = 0 ; i < 7 ; i++){
-                content[i] = data.data[i];
+            var content = data.data ;
+            var contentList = [];
+            for (var i = 0 ; i < 5 ; i++){
+                contentList[i] = content[i];
             }
-            module.data.deptLocationList = content;
+            module.data.deptLocationList = contentList;
             var deptLocationData = template('deptLocationData', module.data);
             $("#deptLocationContent").html(deptLocationData);
         }
@@ -364,6 +397,28 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
 
     }
 
+    //个人供求
+    module.supplyDemand = function (data) {
+        if (data.code == 200) {
+            console.log(data)
+            var content = data.data;
+            module.data.supplyDemandList = content;
+            var supplyDemandData = template('supplyDemandData', module.data);
+            $("#supply").html(supplyDemandData);
+        }
+    }
+
+    //个人供求
+    module.supplyDemand2 = function (data) {
+        if (data.code == 200) {
+            console.log(data)
+            var content = data.data;
+            module.data.supplyDemand2List = content;
+            var supplyDemand2Data = template('supplyDemand2Data', module.data);
+            $("#demand").html(supplyDemand2Data);
+        }
+    }
+
     module.timeInter = function (divScroll) {
         time = setInterval(function () {
             var oldTop = divScroll.scrollTop;
@@ -376,27 +431,47 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
         }, 30)
     }
 
+    //证书查询
+    goSearchKeyWord = function(){
+        var type = $('input[name="transaction"]:checked').val();
+        var searchKeyWord = $('#searchKeyWord').val();
+
+        tools.skip('view/announcement/announcement.html?type='+type+'&searchKeyWord='+searchKeyWord)
+
+    }
+
+    //项目查询
+    searchProject = function(){
+        var projectNum = $('#projectNum').val();
+        var projectName = $('#projectName').val();
+        var deptTypeSelect = $("select[name='deptTypeSelect']").val();
+        tools.skip('view/listingItems/itemsList.html?projectCode='+projectNum+'&projectName='+projectName+'&projectNumber='+deptTypeSelect)
+    }
+
+    //标的物类型
+    module.deptTypeSelect = function (data) {
+        if (data.code == 200) {
+            console.log(data);
+            var content = data.data ;
+            module.data.deptTypeSelectList = content;
+            var deptTypeSelectData = template('deptTypeSelectData', module.data);
+            $("#deptTypeSelectContent").html(deptTypeSelectData);
+        }
+    }
+
     //切换
     tabCheck = function (type) {
-        document.getElementById('supply').style.display = 'none';
-        document.getElementById('demand').style.display = 'none';
-        document.getElementById(type).style.display = 'inline-table';
-    }
 
-    //用户资料鼠标悬浮
-    module.userHover = function () {
-        document.getElementById('userName').onmouseover = function(){
-          document.getElementById('headHover').style.display = 'block';
-        };
-        document.getElementById('headHover').onmouseover = function(){
-            document.getElementById('headHover').style.display = 'block';
-        };
-        document.getElementById('userName').onmouseout = function(){
-            document.getElementById('headHover').style.display = 'none';
-        };
-        document.getElementById('headHover').onmouseout = function(){
-            document.getElementById('headHover').style.display = 'none';
-        };
+        if(type == 'supply'){
+            document.getElementById('demand').style.display = 'none';
+            document.getElementById('demandBtn').className = '';
+        }
+        if(type == 'demand'){
+            document.getElementById('supply').style.display = 'none';
+            document.getElementById('supplyBtn').className = '';
+        }
+        document.getElementById(type).style.display = 'inline-table';
+        document.getElementById(type+'Btn').className = 'active';
     }
     return module;
 });

static/js/project/interact/interact.js

@@ -12,7 +12,7 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 1,
+            pageSize: 5,
             //总页数
             pageCount:0
         },
@@ -55,6 +55,14 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
         }
     }
 
+    goSearch = function () {
+        var searchTitle = $('#searchTitle').val();
+        var searchContent = $('#searchContent').val();
+        console.log(searchContent)
+        console.log(searchTitle)
+        tools.doGet(interactSearch, {deptId:100,title:searchTitle,content:searchContent,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.interactInformation,true)
+    }
+
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
         tools.doGet(interactList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.interactInformation,true);

static/js/project/listingItems/bond.js

@@ -0,0 +1,60 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, template, Tools, swiper) {
+    //数据存储
+    var module = {
+        data: {
+            showImgInformationDetail:''
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        document.getElementById('realName').value = tools.getCookie('userName');
+        document.getElementById('userNum').value = tools.getCookie('phone');
+        document.getElementById('userBank').value = tools.getCookie('bankAddress');
+        document.getElementById('bankId').value = tools.getCookie('bankCardNum');
+        document.getElementById('idCard').value = tools.getCookie('idCardNum');
+    };
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    submit  = function(){
+
+        var data = {};
+        var realName = $('#realname').val();
+        var userNum = $('#userNum').val();
+        var userBank = $('#userBank').val();
+        var bankId = $('#bankId').val();
+        var idCard = $('#idCard').val();
+
+        data['projectId'] = getQueryVariable('id');
+        data['memberId'] = tools.getCookie('memberId');
+        data['realname'] = realName;
+        data['idCardNum'] = idCard;
+        data['phone'] = userNum;
+        data['address'] = tools.getCookie('address');
+        data['banlAdress'] = userBank;
+        data['banlCardName'] = tools.getCookie('userName');
+        data['banlCardNum'] = bankId;
+        data['status'] = 'Y';
+
+        tools.doPost(signupSubmit, data, tools.initError('提交申请，等待审核'));
+
+        setTimeout(function () {
+            tools.skip('itemsDetail.html?id='+getQueryVariable('id'))
+        },2000)
+    }
+
+    return module;
+});

static/js/project/listingItems/items.js

@@ -24,6 +24,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         //挂牌项目竞价记录
         tools.doGet(biddinglist, {projectId:getQueryVariable('id')}, module.biddinglistInformation,true);
 
+
     };
 
     //获取地址栏参数
@@ -37,6 +38,20 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         return(false);
     }
 
+    module.signup = function(data){
+        if (data.data == 0){
+            document.getElementById('signBtnYes').style.display = 'none';
+            document.getElementById('signBtn').style.display = 'block';
+        }else{
+            document.getElementById('signBtnYes').style.display = 'block';
+            document.getElementById('signBtn').style.display = 'none';
+        }
+    }
+
+    goBond = function(){
+        tools.skip('bond.html?id='+getQueryVariable('id'))
+    }
+
     //项目基本信息
     module.outProjectInformation = function (data) {
         if (data.code == 200) {
@@ -80,6 +95,8 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
             //期满处理字典
             tools.doGet(Dictionaries+'/expire_type', {}, module.expireTypeDictionaries,true);
 
+            //判断是否报名
+            tools.doGet(signup, {projectId:getQueryVariable('id'),depositStatus:'1',memberId:tools.getCookie('memberId')}, module.signup);
         }
     }
 
@@ -186,7 +203,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //经济类型
     module.economicTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        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;
@@ -197,7 +214,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //项目类型
     module.projectNumberDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.projectNumber!='') {
             var content = data.data;
             var projectNumber = content[(module.data.outProjectInformationDetail.projectNumber-1)].dictLabel;
             module.data.outProjectInformationDetail.projectNumber = projectNumber;
@@ -208,7 +225,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //农地性质
     module.projectTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.projectType!='') {
             var content = data.data;
             var projectType = content[(module.data.outProjectInformationDetail.projectType-1)].dictLabel;
             module.data.outProjectInformationDetail.projectType = projectType;
@@ -219,7 +236,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //前次转出方式
     module.oneoutDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.oneout!='') {
             var content = data.data;
             if(module.data.outProjectInformationDetail.oneout == 0){
                 module.data.outProjectInformationDetail.oneout = '无';
@@ -237,7 +254,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //面积单位
     module.areaDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.allCountUnit!='') {
             var content = data.data;
             var allCountUnit = content[(module.data.outProjectInformationDetail.allCountUnit-1)].dictLabel;
             module.data.outProjectInformationDetail.allCountUnit = allCountUnit;
@@ -253,7 +270,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //支付方式
     module.paymentTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.paymentType!='') {
             var content = data.data;
             var paymentType = content[(module.data.outProjectInformationDetail.paymentType-1)].dictLabel;
             module.data.outProjectInformationDetail.paymentType = paymentType;
@@ -264,7 +281,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //缴纳形式
     module.depositPaymentTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.depositPaymentType!='') {
             var content = data.data;
             var depositPaymentType = content[(module.data.outProjectInformationDetail.depositPaymentType-1)].dictLabel;
             module.data.outProjectInformationDetail.depositPaymentType = depositPaymentType;
@@ -275,7 +292,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //交易方式
     module.transactionDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.dealType!='') {
             var content = data.data;
             var dealType = content[(module.data.outProjectInformationDetail.dealType-1)].dictLabel;
             module.data.outProjectInformationDetail.dealType = dealType;
@@ -286,7 +303,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //竞价方式
     module.biddingTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.biddingType!='') {
             var content = data.data;
             var biddingType = content[(module.data.outProjectInformationDetail.biddingType-1)].dictLabel;
             module.data.outProjectInformationDetail.biddingType = biddingType;
@@ -297,7 +314,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
 
     //系统是否
     module.expireTypeDictionaries = function (data) {
-        if (data.code == 200) {
+        if (data.code == 200 && module.data.outProjectInformationDetail.expire!='') {
             var content = data.data;
             var expire = content[(module.data.outProjectInformationDetail.expire-1)].dictLabel;
             module.data.outProjectInformationDetail.expire = expire;
@@ -306,7 +323,5 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi'], function ($, templ
         }
     }
 
-
-
     return module;
 });

static/js/project/listingItems/itemsList.js

@@ -1,7 +1,7 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, template, Tools ) {
+define(['jquery', "template", "Tools", "itemsApi", "paging",'dateTime'], function ($, template, Tools ) {
     //数据存储
     var module = {
         data: {
@@ -20,7 +20,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 1,
+            pageSize: 20,
             //总页数
             pageCount:0,
             //标的物集合长度
@@ -28,23 +28,101 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
             //标的物选中项id
             deptId:'',
             //标的所在地选中
-            secondDeptId:''
+            secondDeptId:'',
+            //标的物类型ID
+            projectNumber:'',
+            //项目状态
+            projectShowStatus:'',
+            //报名开始时间
+            signupStartTime:'',
+            //报名结束时间
+            signupStopTime:'',
+            //竞价开始时间
+            biddingStartTime:'',
+            //竞价结束时间
+            biddingStopTime:'',
+            form:{
+                deptId:'',
+                projectNumber:'',
+                projectShowStatus:'',
+                signupStartTime:'',
+                signupStopTime:'',
+                biddingStartTime:'',
+                biddingStopTime:'',
+                pageNum:1,
+                pageSize:1,
+            }
         },
     };
     var tools = new Tools();
 
     module.init = function (page) {
 
-        //新闻资讯
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList, true);
+        if(getQueryVariable('projectCode') || getQueryVariable('projectName') || getQueryVariable('projectNumber')){
+            console.log('首页进入')
+            tools.doGet(itemsList, {
+                deptId:100,
+                pageNum:module.data.pageNum,
+                pageSize:module.data.pageSize,
+                projectCode:getQueryVariable('projectCode'),
+                projectName:getQueryVariable('projectName'),
+                projectNumber:getQueryVariable('projectNumber')
+            }, module.itemList, true);
+        }else{
+            //新闻资讯
+            tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList, true);
+        }
 
         //标的物类型
         tools.doGet(webDeptType+"/project_type", {}, module.deptType, true);
 
         //标的物所在地
         tools.doGet(webDept, {deptId:''}, module.deptLocation, true);
+
+        $("#signStartTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#signEndTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#auctionStartTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
+
+        $("#endTimeStr").datetime({
+            type:"date",
+            value:[2019,9,31],
+            success:function(res){
+                console.log(res)
+            }
+        })
     };
 
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
     //挂牌项目列表
     module.itemList = function (data) {
         if (data.code == 200) {
@@ -77,12 +155,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
     module.deptType = function (data) {
         console.log(data)
         if (data.code == 200) {
-            var content = [] ;
-            console.log(data.data)
-            for (var i = 0 ; i < 4 ; i++){
-                content[i] = data.data[i];
-            }
-            console.log(content)
+            var content = data.data ;
             module.data.deptTypeList = content;
             var deptTypeData = template('deptTypeData', module.data);
             $("#deptTypeContent").html(deptTypeData);
@@ -118,28 +191,27 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
     }
 
     tabCheck = function (deptId) {
-        console.log(deptId)
         module.data.deptId = deptId;
-        for (var i = 0 ; i < module.data.deptLocationList.length ; i++){
-            document.getElementById('locInfoall'+(101+i)).className = 'auction_hall_table_tab auction_loc'
+        $('#locInfoall').attr("class","auction_hall_table_tab auction_loc");
+        $("#deptLocationContent div").attr("class","auction_hall_table_tab auction_loc");
+        if(deptId == ''){
+            $('#locInfoall').addClass('auction_hall_table_tab_select');
+            document.getElementById('secondDept').style.display = 'none';
+        }else{
+            $('#locInfoall'+deptId).addClass('auction_hall_table_tab_select');
+            tools.doGet(webDept, {deptId:deptId}, module.deptSecondLocation, true);
         }
-        document.getElementById('locInfoall'+deptId).className = 'auction_hall_table_tab auction_loc auction_hall_table_tab_select'
-        tools.doGet(webDept, {deptId:deptId}, module.deptSecondLocation, true);
     }
 
     secondCheck = function(id,secondDeptId){
-        document.getElementById('locInfoSecondall').className = 'auction_hall_table_tab  auction_loc'
-        for (var i = 0 ; i < module.data.deptSecondLocationList.length ; i++){
-            document.getElementById('locInfoall'+i).className = 'auction_hall_table_tab  auction_loc'
-        }
-        console.log(id)
+        $('#locInfoSecondall').attr("class","auction_hall_table_tab auction_loc");
+        $("#secondDept div").attr("class","auction_hall_table_tab auction_loc");
         if(id == '' && secondDeptId == ''){
-            document.getElementById('locInfoSecondall').className = 'auction_hall_table_tab  auction_loc auction_hall_table_tab_select'
-            module.data.secondDeptId = secondDeptId;
+            $('#locInfoSecondall').addClass('auction_hall_table_tab_select');
         }else{
-            document.getElementById('locInfoall'+id).className = 'auction_hall_table_tab auction_loc auction_hall_table_tab_select'
+            $('#locInfoall'+id).addClass('auction_hall_table_tab_select');
+            module.data.deptId = secondDeptId;
         }
-        module.data.secondDeptId = secondDeptId;
     }
 
     allDept = function (){
@@ -158,7 +230,48 @@ define(['jquery', "template", "Tools", "itemsApi", "paging"], function ($, templ
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(itemsList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.itemList, true);
+        module.data.form.pageNum = pageNum;
+        tools.doGet(itemsList, module.data.form, module.itemList, true);
+    }
+
+    typeCheck = function(id,projectNumber){
+        module.data.projectNumber = projectNumber;//标的物类型ID
+        document.getElementById('standardTypeAll').className = 'auction_hall_table_tab';
+        if(id == ''){
+            id = 'All';
+        }
+        for (var i = 0 ; i < module.data.deptTypeList.length ; i++){
+            document.getElementById('standardType'+(i+1)).className = 'auction_hall_table_tab';
+        }
+        document.getElementById('standardType'+id).className = 'auction_hall_table_tab auction_hall_table_tab_select';
+    }
+
+    selectedStatus = function(id,projectShowStatus){
+        module.data.projectShowStatus = projectShowStatus;
+        document.getElementById('statusall').className = 'auction_hall_table_tab'
+        for (var i = 0 ; i < 5 ; i++){
+            document.getElementById('status'+(1+i)).className = 'auction_hall_table_tab'
+        }
+        document.getElementById('status'+id).className = 'auction_hall_table_tab auction_hall_table_tab_select'
+    }
+
+    goSearch = function(){
+        module.data.itemsInformationList = '';
+        $('.page_s1').html('')
+        $('#page_s1').html('')
+        module.data.form.deptId = module.data.deptId;
+        module.data.form.projectNumber = module.data.projectNumber;
+        module.data.form.projectShowStatus= module.data.projectShowStatus;
+        module.data.form.signupStartTime= $('#signStartTimeStr').val();
+        module.data.form.signupStopTime= $('#signEndTimeStr').val();
+        module.data.form.biddingStartTime= $('#auctionStartTimeStr').val();
+        module.data.form.biddingStopTime= $('#endTimeStr').val();
+        module.data.form.pageNum= module.data.pageNum;
+        module.data.form.pageSize= module.data.pageSize;
+
+        console.log(module.data.form)
+
+        tools.doGet(itemsList, module.data.form, module.itemList, true);
     }
     return module;
 });

static/js/project/loginCheck.js

@@ -0,0 +1 @@
+

static/js/project/new/new.js

@@ -21,11 +21,28 @@ define(['jquery', "template", "Tools", "newApi", "paging"], function ($, templat
 
     module.init = function (page) {
 
-        //新闻资讯
-        tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
+        console.log(getQueryVariable('title'))
+        if(getQueryVariable('title') ){
+            console.log('搜索进入')
+            //新闻资讯
+            tools.doGet(newList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize,title:getQueryVariable('title')}, module.NewsInformation,true);
+        }else{
+            //新闻资讯
+            tools.doGet(newList, {number:2,deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
+        }
+    };
 
 
-    };
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
 
     //新闻资讯数据
     module.NewsInformation = function (data) {
@@ -56,7 +73,11 @@ define(['jquery', "template", "Tools", "newApi", "paging"], function ($, templat
 
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
-        tools.doGet(newList, {number:2,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
+        if (getQueryVariable('title')){
+            tools.doGet(newList, {deptId:100,pageNum:pageNum,pageSize:module.data.pageSize,title:getQueryVariable('title')}, module.NewsInformation,true);
+        }else{
+            tools.doGet(newList, {number:2,deptId:100,pageNum:pageNum,pageSize:module.data.pageSize}, module.NewsInformation,true);
+        }
     }
     return module;
 });

static/js/project/policy/policy.js

@@ -16,7 +16,7 @@ define(['jquery', "template", "Tools", "policyApi", "paging"], function ($, temp
             //页码集合
             pageList: [],
             //每页数量
-            pageSize: 1,
+            pageSize: 50,
             //总页数
             pageCount:0
         },

static/js/project/user/index.js

@@ -1,7 +1,7 @@
 /**
  * Created by Administrator on 2021/4/5.
  */
-define(['jquery', "template", "Tools", "user", "paging"], function ($, template, Tools) {
+define(['jquery', "template", "Tools", "user", "paging","cupload"], function ($, template, Tools) {
     //数据存储
     var module = {
         data: {
@@ -35,11 +35,10 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
         //用户资料
         //tools.doPut(userData, {id:}, module.userData,true);
 
-        //用户资料鼠标悬浮
-        module.userHover();
-
         //个人中心选项卡鼠标悬浮
         module.userListHover();
+
+
     };
 
     //个人中心用户信息
@@ -47,7 +46,7 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
         if (data.code == 200) {
             var content = data.user;
             console.log(content)
-            tools.doGet(userMember+'/'+content.userId, {}, module.userMember);//memberType 1个人 2单位
+            tools.doGet(userMember + '/' + content.userId, {}, module.userMember);//memberType 1个人 2单位
         }
     }
 
@@ -63,28 +62,47 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
                 document.getElementById('userInformationContent').style.display = 'block';
                 var userInformationData = template('userInformationData', module.data);
                 $("#userInformationContent").html(userInformationData);
+                var cupload2 = new Cupload ({
+                    ele: '#cupload-3',
+                    num: 5,
+                });
             }else{
                 document.getElementById('companyInformationContent').style.display = 'block';
                 document.getElementById('userInformationContent').style.display = 'none';
                 var companyInformationData = template('companyInformationData', module.data);
                 $("#companyInformationContent").html(companyInformationData);
+                var cupload2 = new Cupload ({
+                    ele: '#cupload-2',
+                    num: 5,
+                });
             }
             document.getElementById('bankAddress').value = content.bankAddress;
             document.getElementById('bankCardName').value = content.bankCardName;
             document.getElementById('bankCardNum').value = content.bankCardNum;
             document.getElementById('phone').innerHTML = content.phone;
+
             module.data.memberId = content.id;
             console.log(content.memberType)
-
             //我的供求
             tools.doGet(userSupply, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.userSupply);
             //我的咨询
             tools.doGet(userConsulting, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.consulting);
             //我的竞价
             tools.doGet(userBidding, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.bidding);
+            //个人资料提交
+            $('#userAction').on('click', module.formAction)
+            $('#bankAction').on('click', module.formAction)
+            $('#supplyAction').on('click', module.supplyAction)
+            $('#releaseAction').on('click', module.releaseAction)
+            //document.getElementById('userAction').addEventListener('click',module.formAction);
         }
     }
 
+    //删除供求
+    deleteUserSupply = function(ids){
+        tools.doDelete(deleteSupply, {ids:ids}, module.Tips);
+    }
+
     //个人中心我的供求
     module.userSupply = function(data){
         console.log(data)
@@ -218,6 +236,26 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
         module.data.pageNum = 1 ;
     }
 
+    goSupply = function(){
+        document.getElementById('supplyInformation').style.display = "none";
+        document.getElementById('releaseSupply').style.display = "block";
+    }
+
+    gosupplyTable = function(){
+        document.getElementById('supplyInformation').style.display = "block";
+        document.getElementById('releaseSupply').style.display = "none";
+    }
+
+    goRelease = function(){
+        document.getElementById('consultingInformation').style.display = "none";
+        document.getElementById('release').style.display = "block";
+    }
+
+    goReleaseTable = function(){
+        document.getElementById('consultingInformation').style.display = "block";
+        document.getElementById('release').style.display = "none";
+    }
+
     //翻页
     turnThePage = function (pageNum) {
         module.data.pageNum = pageNum ;
@@ -233,13 +271,131 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
     }
 
     //个人用户资料修改
-    formAction = function (name,value){
-        console.log(name+'-------'+value)
-        return;
-        module.data.form.name = value ;
-        console.log(module.data.form)
+    module.formAction = function (){
+        var data = {};
+        //var password = $('#password').val();
+
+        //用户信息
+        var companyName = $('#companyName').val();
+        var idCardNum = $('#idCardNum').val();
+        var realname = $('#realname').val();
+        var companyCode = $('#companyCode').val();
+        var companyNature = $('#companyNature').val();
+        var companyScope = $('#companyScope').val();
+        var companyTimeLimit = $('#companyTimeLimit').val();
+        var companySetupTime = $('#companySetupTime').val();
+        var companyCapital = $('#companyCapital').val();
+        var companyLicense = $('#companyLicense').val();
+        var address = $('#address').val();
+
+        //银行卡信息
+        var bankCardName = $('#bankCardName').val();
+        var bankCardNum = $('#bankCardNum').val();
+        var bankAddress = $('#bankAddress').val();
+
+        //data['password'] = password;
+        data['companyName'] = companyName;
+        data['idCardNum'] = idCardNum;
+        data['realname'] = realname;
+        data['companyCode'] = companyCode;
+        data['companyName'] = companyName;
+        data['companyNature'] = companyNature;
+        data['companyScope'] = companyScope;
+        data['companyTimeLimit'] = companyTimeLimit;
+        data['companySetupTime'] = companySetupTime;
+        data['companyCapital'] = companyCapital;
+        data['companyLicense'] = companyLicense;
+        data['address'] = address;
+
+        data['bankCardName'] = bankCardName;
+        data['bankCardNum'] = bankCardNum;
+        data['bankAddress'] = bankAddress;
+
+        data['id'] = module.data.memberId;
+
+        tools.doPut(userUpdate, data, module.Tips)
     }
 
+    //发布供求
+    module.supplyAction = function (){
+        var data = {};
+
+        //供求信息
+        var projectName = $('#projectName').val();
+        var location = $('#location').val();
+        var projectRealName = $('#projectRealName').val();
+        var projectPhone = $('#projectPhone').val();
+        var projectContent = $('#projectContent').val();
+        var logintime = tools.getNowFormatDate();
+
+        data['projectName'] = projectName;
+        data['location'] = location;
+        data['realname'] = projectRealName;
+        data['phone'] = projectPhone;
+        data['projectContent'] = projectContent;
+        data['logintime'] = logintime;
+
+        data['memberId'] = module.data.memberId;
+
+        tools.doPost(userDemand, data, module.Tips)
+    }
+
+    //发布咨询
+    module.releaseAction = function (){
+        var data = {};
+
+        //供求信息
+        var title = $('#title').val();
+        var releaseContent = $('#releaseContent').val();
+        var releaseRealName = $('#releaseRealName').val();
+        var releasePhone = $('#releasePhone').val();
+        var logintime = tools.getNowFormatDate();
+
+        data['title'] = title;
+        data['content'] = releaseContent;
+        data['realname'] = releaseRealName;
+        data['phone'] = releasePhone;
+        data['logintime'] = logintime;
+
+        data['memberId'] = module.data.memberId;
+
+        tools.doPost(userCommunicate, data, module.Tips)
+    }
+
+    module.Tips = function(data){
+        console.log(data)
+        tools.initError(data.msg);
+    }
+
+    //手动验证表单
+    module.check = function () {
+        var usernameVal = $('#username').val();
+        var passwordVal = $('#password').val();
+        var codeVal = $('#code').val();
+        /* 手机号 */
+        if (usernameVal == '') {
+            $('#username')[0].focus()
+            tools.initTips('请输入用户名', 'right', $('#username')[0], 2000)
+            return false;
+        }
+        /* 密码 */
+        if (passwordVal == '') {
+            $('#password')[0].focus()
+            tools.initTips('请输入密码', 'right', $('#password')[0], 2000)
+            return false;
+        } else if (parseInt(passwordVal.length) < 6 || parseInt(passwordVal.length) > 18) {
+            $('#password')[0].focus()
+            tools.initTips('请输入正确格式密码', 'right', $('#password')[0], 2000)
+            return false;
+        }
+        /*图形验证码*/
+        if (module.uuid == '' || codeVal == '') {
+            $('#code')[0].focus()
+            tools.initTips('请输入图形验证码', 'right', $('#code')[0], 2000)
+            return false;
+        }
+        return true;
+    }
     //个人中心选项卡鼠标悬浮
     module.userListHover = function(){
         document.getElementById('icon-list1').onmouseout = function(){
@@ -272,21 +428,5 @@ define(['jquery', "template", "Tools", "user", "paging"], function ($, template,
 
 
     }
-
-    //用户资料鼠标悬浮
-    module.userHover = function () {
-        document.getElementById('userName').onmouseover = function(){
-          document.getElementById('headHover').style.display = 'block';
-        };
-        document.getElementById('headHover').onmouseover = function(){
-            document.getElementById('headHover').style.display = 'block';
-        };
-        document.getElementById('userName').onmouseout = function(){
-            document.getElementById('headHover').style.display = 'none';
-        };
-        document.getElementById('headHover').onmouseout = function(){
-            document.getElementById('headHover').style.display = 'none';
-        };
-    }
     return module;
 });

static/js/project/user/login.js

@@ -3,7 +3,7 @@
  * Created by admin on 2021/4/5.
  * 
  */
-define(['jquery', "Tools"], function ($, Tools) {
+define(['jquery', "Tools","user"], function ($, Tools) {
     //数据存储
     var module = {
         uuid: ''  //验证码uuid
@@ -89,10 +89,39 @@ define(['jquery', "Tools"], function ($, Tools) {
     }
     //登录校验
     module.loginData = function (data) {
+        console.log(data)
         if (data.code == 500) {
             module.verificationCode()
         } else {
             tools.setCookie('Admin-Token', data.token, 24 * 60 * 60)
+            //用户资料
+            tools.doGet(userData, {}, module.userData);
+            //tools.skip('/')
+        }
+    }
+    //个人中心用户信息
+    module.userData = function(data){
+        if (data.code == 200) {
+            var content = data.user;
+            console.log(content)
+            tools.doGet(userMember + '/' + content.userId, {}, module.userMember);//memberType 1个人 2单位
+        }
+    }
+
+    //个人中心用户资料
+    module.userMember = function(data){
+        if (data.code == 200) {
+            var content = data.data;
+            console.log(data)
+            console.log(content.realname)
+            tools.setCookie('userName', content.realname, 24 * 60 * 60);
+            tools.setCookie('memberId', content.id, 24 * 60 * 60);
+            tools.setCookie('idCardNum',content.idCardNum,24 * 60 * 60)
+            tools.setCookie('phone',content.phone,24 * 60 * 60)
+            tools.setCookie('address',content.address,24 * 60 * 60)
+            tools.setCookie('bankAddress',content.bankAddress,24 * 60 * 60)
+            tools.setCookie('bankCardName',content.bankCardName,24 * 60 * 60)
+            tools.setCookie('bankCardNum',content.bankCardNum,24 * 60 * 60)
             tools.skip('/')
         }
     }

static/js/project/user/register.js

@@ -5,7 +5,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
     //数据存储
     var module = {
         data: {
-
+            type:0
         },
     };
     var tools = new Tools();
@@ -13,21 +13,31 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
     module.init = function (page) {
         //背景高度
         module.register();
-
-        //注册须知按钮跳转
-        module.goRegister();
+        module.data.type = getQueryVariable("type")
     };
 
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
     //背景高度
     module.register = function(){
         document.getElementById('registerBody').style.height = (document.body.offsetHeight - 112) +'px';
     }
 
-    //注册须知按钮跳转
-    module.goRegister = function(){
-        document.getElementById('agree').addEventListener('click',function(){
-            window.location.href = 'registerFrom.html';
-        })
+    goAgree = function(){
+        tools.skip('registerFrom.html?type='+module.data.type)
+    }
+
+    goRegister = function(){
+        tools.skip('register.html')
     }
 
     return module;

static/js/project/user/registerFrom.js

@@ -0,0 +1,196 @@
+/**
+ * Created by Administrator on 2021/4/5.
+ */
+define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], function ($, template, Tools, echarts, swiper) {
+    //数据存储
+    var module = {
+        data: {
+
+        },
+    };
+    var tools = new Tools();
+
+    module.init = function (page) {
+        //点击注册
+        $('#register-submit').on('click', module.register)
+        //点击图形验证码
+        $('#graphicImgBtn').on('click', module.verificationCode)
+        //图形验证码加载
+        module.verificationCode()
+
+        module.getType();
+    };
+
+
+    //获取地址栏参数
+    function getQueryVariable(variable){
+        var query = window.location.search.substring(1);
+        var vars = query.split("&");
+        for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+        }
+        return(false);
+    }
+
+    module.getType = function(){
+        var type = getQueryVariable("type");
+        if (type == 1){
+            document.getElementById("userBtn").className = "active";
+            document.getElementById("companyBtn").className = "";
+            tabCheck('user');
+            module.data.type = type;
+        }else if(type == 2){
+            document.getElementById("userBtn").className = "";
+            document.getElementById("companyBtn").className = "active";
+            tabCheck('company');
+            module.data.type = type;
+        }
+    }
+
+    tabCheck = function(type,typeNum){
+        document.getElementById("userBtn").className = "";
+        document.getElementById("companyBtn").className = "";
+        document.getElementById("userTable").style.display = "none";
+        document.getElementById("companyTable").style.display = "none";
+
+        module.data.type = typeNum;
+        document.getElementById(type+'Btn').className = 'active';
+        document.getElementById(type+'Table').style.display = 'block';
+    }
+
+
+    //图形验证码
+    module.verificationCode = function () {
+        tools.doGet(captchaImage_get, {}, module.verificationAjax, true)
+    }
+    module.verificationAjax = function (data) {
+        if (data.code == 200) {
+            $('#graphicImg').attr('src', 'data:image/gif;base64,' + data.img)
+            module.uuid = data.uuid;
+        }
+    }
+
+    //用户注册
+    module.register = function (data) {
+        var data = {};
+        if(module.check()){
+            if (module.data.type == 1){
+                var phone = $('#phone').val();
+                var passwordVal = $('#password').val();
+                var codeVal = $('#code').val();
+                var realName = $('#realName').val();
+                var idCardNum = $('#idCardNum').val();
+                var address = $('#address').val();
+
+                data['phone'] = phone;
+                data['password'] = passwordVal;
+                data['code'] = codeVal;
+                data['realname'] = realName;
+                data['idCardNum'] = idCardNum;
+                data['address'] = address;
+            }
+            if (module.data.type == 2){
+                var phone = $('#phone').val();
+                var passwordVal = $('#password').val();
+                var codeVal = $('#code').val();
+
+                var companyName = $('#companyName').val();
+                var realName = $('#companyRealName').val();
+                var idCardNum = $('#companyIdCardNum').val();
+                var address = $('#companyAddress').val();
+                var companyLicense = $('#companyLicense').val();
+                var companyCode = $('#companyCode').val();
+
+                data['phone'] = phone;
+                data['password'] = passwordVal;
+                data['code'] = codeVal;
+                data['realname'] = realName;
+                data['idCardNum'] = idCardNum;
+                data['address'] = address;
+                data['companyName'] = companyName;
+                data['companyLicense'] = companyLicense;
+                data['companyCode'] = companyCode;
+            }
+            data['memberType'] = module.data.type;
+            tools.doPost(userRegister, data, module.registerData, true)
+        }
+
+    }
+
+    //注册校验
+    module.registerData = function (data) {
+        console.log(data)
+        if (data.code == 500) {
+            module.verificationCode()
+        }
+        if (data.code == 200){
+            tools.initError("注册成功");
+            setTimeout(function(){
+                tools.skip('login.html')
+            },2000)
+        }
+    }
+
+    //手动验证表单
+    module.check = function () {
+        var phone = $('#phone').val();
+        var passwordVal = $('#password').val();
+        var codeVal = $('#code').val();
+        var realName = $('#realName').val();
+        var idCardNum = $('#idCardNum').val();
+        var address = $('#address').val();
+        /* 手机号 */
+        if (phone == '') {
+            $('#phone')[0].focus()
+            tools.initTips('请输入手机号', 'right', $('#phone')[0], 2000)
+            return false;
+        }
+        /* 姓名 */
+        if (realName == '') {
+            $('#realName')[0].focus()
+            tools.initTips('请输入姓名', 'right', $('#realName')[0], 2000)
+            return false;
+        }
+        /* 身份证号 */
+        if (idCardNum == '') {
+            $('#idCardNum')[0].focus()
+            tools.initTips('请输入身份证号', 'right', $('#idCardNum')[0], 2000)
+            return false;
+        }
+        /* 地址 */
+        if (address == '') {
+            $('#address')[0].focus()
+            tools.initTips('请输入地址', 'right', $('#address')[0], 2000)
+            return false;
+        }
+        /* 密码 */
+        if (passwordVal == '') {
+            $('#password')[0].focus()
+            tools.initTips('请输入密码', 'right', $('#password')[0], 2000)
+            return false;
+        } else if (parseInt(passwordVal.length) < 6 || parseInt(passwordVal.length) > 18) {
+            $('#password')[0].focus()
+            tools.initTips('请输入正确格式密码', 'right', $('#password')[0], 2000)
+            return false;
+        }else if($('#password').val() != $('#passwordAgain').val()){
+            $('#password')[0].focus()
+            tools.initTips('两次密码输入不一致', 'right', $('#password')[0], 2000)
+            return false;
+        }
+        /*图形验证码*/
+        if (module.uuid == '' || codeVal == '') {
+            $('#code')[0].focus()
+            tools.initTips('请输入图形验证码', 'right', $('#code')[0], 2000)
+            return false;
+        }
+
+        console.log($('#iAgree:checked').val())
+        if ($('#iAgree:checked').val() == undefined){
+            tools.initTips('请选择我已同意', 'right', $('#iAgree')[0], 2000)
+            return false;
+        }
+        return true;
+    }
+    return module;
+});

view/announcement/announcement.html

@@ -21,25 +21,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -47,9 +68,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/announcement/announcementDetail.html

@@ -18,25 +18,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -44,9 +65,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/announcement/attestation.html

@@ -18,25 +18,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -44,9 +65,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/bidding/biddingList.html

@@ -14,31 +14,53 @@
     <link href="../../static/css/bidding/bidding.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/listingItems/items.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/page_common.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/dateTime.css" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -46,9 +68,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -78,7 +138,7 @@
                             <script id="deptTypeData" type="text/html">
                                 <div class="auction_hall_table_tab auction_hall_table_tab_select" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
-                                <div class="auction_hall_table_tab" id="standardType">{{value.dictLabel}}</div>
+                                <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</div>
                                 {{/each}}
                             </script>
                             <div class="auction_all_one2" id="deptTypeContent"></div>
@@ -89,47 +149,46 @@
                     <td class="auction_td">标的所在地</td>
                     <td>
                         <div class="auction_all_left">
-                            <div class="auction_hall_table_tab auction_hall_table_tab_select" id="locInfoall">全部</div>
+                            <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="tabCheck('')" id="locInfoall">全部</div>
                         </div>
                         <div class="auction_all_right">
                             <script id="deptLocationData" type="text/html">
                                 {{each deptLocationList as value i}}
-                                <div class="auction_hall_table_tab auction_loc" id="locInfo{{i}}">{{value.deptName}}</div>
+                                <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
                                 {{/each}}
+                                <div class="clear"></div>
                             </script>
-                            <div class="auction_all_one" id="deptLocationContent">
-                            </div>
+                            <div class="auction_all_one" id="deptLocationContent"></div>
                             <!-- 市 -->
-                            <div class="auction_add_area auction_add_area_one">
-                                <div class="auction_hall_table_tab auction_hall_table_tab_select">全部</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo286">昆明</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo287">曲靖</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo288">玉溪</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo289">保山</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo290">昭通                                </div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo291">丽江</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo292">普洱市</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo293">临沧</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo294">楚雄</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo295">红河</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo296">文山</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo297">西双版纳</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo298">大理</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo299">德宏</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo300">怒江</div>
-                                <div class="auction_hall_table_tab  auction_loc" id="locInfo301">迪庆</div>
+                            <div class="auction_add_area auction_add_area_one" id="secondDept" style="display: none;">
+                                <script id="deptSecondLocationData" type="text/html">
+                                    <div class="auction_hall_table_tab auction_hall_table_tab_select" id="locInfoSecondall" onclick="secondCheck('','')">全部</div>
+                                    {{each deptSecondLocationList as value i}}
+                                    <div class="auction_hall_table_tab  auction_loc" id="locInfoall{{i}}" onclick="secondCheck({{i}},{{value.deptId}})">{{value.deptName}}</div>
+                                    {{/each}}
+                                    <div class="clear"></div>
+                                </script>
                             </div>
-                            <!-- 区 -->
-                            <div class="auction_add_area auction_add_area_two"></div>
                         </div>
                     </td>
                 </tr>
                 <tr class="auction_tr">
                     <td class="auction_td">项目状态</td>
                     <td>
-                        <div class="auction_hall_table_tab auction_hall_table_tab_select" id="statusall" onclick="selectedStatus('all')">全部</div>
-                        <div class="auction_hall_table_tab" id="status1" onclick="selectedStatus('1')">竞价中</div>
-                        <div class="auction_hall_table_tab" id="status2" onclick="selectedStatus('2')">竞价结束</div>
+                        <div class="auction_hall_table_tab auction_hall_table_tab_select" id="statusall"
+                             onclick="selectedStatus('all')">全部
+                        </div>
+
+                        <div class="auction_hall_table_tab" id="status1" onclick="selectedStatus('1','正在报名')">正在报名</div>
+
+                        <div class="auction_hall_table_tab" id="status2" onclick="selectedStatus('2','等待竞价')">等待竞价</div>
+
+                        <div class="auction_hall_table_tab" id="status3" onclick="selectedStatus('3','正在竞价')">正在竞价</div>
+
+                        <div class="auction_hall_table_tab" id="status4" onclick="selectedStatus('4','等待成交')">等待成交</div>
+
+                        <div class="auction_hall_table_tab" id="status5" onclick="selectedStatus('5','已经成交')">已经成交</div>
+
                     </td>
                 </tr>
                 <tr class="auction_tr">
@@ -157,7 +216,7 @@
                         <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
-                        <div class="input_data_btn" onclick="auction_query()">查询</div>
+                        <div class="input_data_btn" onclick="goSearch()">查询</div>
                     </td>
                 </tr>
             </table>

view/demand/demand.html

@@ -19,25 +19,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -45,9 +66,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/interact/interactList.html

@@ -19,25 +19,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -45,9 +66,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -70,10 +129,10 @@
     <div class="w-1200">
         <div class="searchCriteria">
             <p class="fl m-r-5">标题:</p>
-            <input type="text" class="fl m-r-25"/>
+            <input type="text" class="fl m-r-25" id="searchTitle"/>
             <p class="fl m-r-5">内容:</p>
-            <input type="text" class="fl m-r-25"/>
-            <input type="button" value="搜索" class="fl m-r-25"/>
+            <input type="text" class="fl m-r-25" id="searchContent"/>
+            <input type="button" value="搜索" class="fl m-r-25" onclick="goSearch()"/>
             <input type="button" value="我要发布" class="fl"/>
             <div class="clear"></div>
         </div>

view/listingItems/bond.html

@@ -0,0 +1,203 @@
+<!DOCTYPE html
+        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="zh-CN" xml:lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title>农燊高科-新闻详情</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="keywords" content="" />
+    <meta name="description" cxontent="" />
+    <link href="../../static/css/main.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/index.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/listingItems/items.css" rel="stylesheet" type="text/css"/>
+</head>
+
+<body>
+<div class="main" id="page">
+    <!--顶部Title  -->
+    <div class="bg-f7 txc">
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <!--LOGO search -->
+    <div class="logoSearch w-1200">
+        <div class="wid50 logoSearch-div fl">
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
+            <div class="clear"></div>
+        </div>
+        <div class="wid50 logoSearch-div fr">
+            <div class="searchDiv fl">
+                <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
+                <input type="button" value="搜索" class="searchButton" />
+            </div>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <div class="clear"></div>
+    </div>
+
+    <!--顶部导航栏  -->
+    <div class="top">
+        <ul class="container w-1200">
+            <li><a href="../../index.html">首页</a></li>
+            <li><a href="../listingItems/itemsList.html">挂牌项目</a></li>
+            <li><a href="../bidding/biddingList.html">竞价大厅</a></li>
+            <li><a href="../announcement/announcement.html">项目公告</a></li>
+            <li><a href="../demand/demand.html">个人供求</a></li>
+            <li class="active"><a href="../new/newList.html">新闻资讯</a></li>
+            <li><a href="../policy/policy.html">政策法规</a></li>
+            <li><a href="../interact/interactList.html">互动交流</a></li>
+        </ul>
+    </div>
+    <div class="w-1200">
+        <div class="projectInformation m-t-25">
+            <p class="m-b-10">项目名称：管家堡乡左云村500亩水田出租</p>
+            <p>需缴纳保证新：1000元</p>
+        </div>
+        <div class="rule m-t-25 p-l-15">
+            <h3>1.竞买人请确认以下事项并勾选</h3>
+            <p>· 已阅读并知晓：拍下不买的后果，即保证金不予退还并承担相应的后果包括处罚等</p>
+            <p>· 已阅读并知晓：本次报名仅代表本人，未接受他人委托参与竞买。（如需办理委托，请在报名前联系处置单位将双方信息录入系统</p>
+            <p>· 已阅读并知晓：如您报名成功，您的姓名、证件号码、手机号、联系地址等信息将披露给资产处置单位及相关服务提供方，用于核实竞买人的真是身份、竞买资格及相关服务提供</p>
+            <p>· 已阅读并知晓：竞买人如果没有进行实地看样，视为接受标的所有瑕疵等细则</p>
+            <p>· 已阅读并知晓：已阅读并同意《竞拍服务协议》</p>
+            <p><input type="checkbox" style="position:relative;top: 2px;"/>本人已知晓并同意以上所有事项</p>
+        </div>
+        <div class="txc m-t-25 p-l-15">
+            <h3 style="text-align: left;">2.竞买人身份确认</h3>
+            <table width="28%" class="bondTable">
+                <tr>
+                    <td><span>*</span>姓<i style="margin-left: 2em;"></i>名:</td>
+                    <td><input type="text" id="realName"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>会员账号:</td>
+                    <td><input type="text" id="userNum"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>开户银行:</td>
+                    <td><input type="text" id="userBank"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>银行卡号:</td>
+                    <td><input type="text" id="bankId"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>身份证号:</td>
+                    <td><input type="text" id="idCard"></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>上传相关凭证:</td>
+                    <td><img src="../../static/images/upload.png" alt="" class="m-l-10"/></td>
+                </tr>
+
+            </table>
+             <input type="button" value="保存" onclick="submit()" class="preservation"/>
+        </div>
+    </div>
+    <!--底部链接  -->
+    <div class="bottomLink">
+        <div class="w-1200">
+            <div class="w-1000 fl">
+                <p class="bottomLink-tit"><i class="el-icon-link"></i>友情链接</p>
+                <script id="friendsLinksData" type="text/html">
+                    {{each friendsLinksList as value i}}
+                    <a href="{{value.url}}" target="_blank">{{value.name}}</a>
+                    {{/each}}
+                </script>
+                <div class="bottomLink-linkList" id="friendsLinksContent"></div>
+                <p class="ba" id="webConfigRecord">
+                    鲁公网安备<span>12011502000077号</span><span>京ICP备 17061038号-1</span>
+                </p>
+                <p class="ba" id="webConfigAddress">
+                    左云县农村产权交易网<span>联系地址：北京紫竹书院技术基地</span><span>联系电话：400-060-123</span>
+                </p>
+            </div>
+            <div class="ewm fr">
+                <img src="../../static/images/ewm.jpg" width="110" height="110" alt="" />
+                <p class="ewmtit">关注公众号 了解详情</p>
+            </div>
+            <div class="clear"></div>
+        </div>
+    </div>
+</div>
+<script src="../../static/js/common/require.js" data-main="../../static/js/common/main.js?t=101" id="require-page"
+        target-module="../../static/js/project/listingItems/bond.js" defer type="text/javascript"></script>
+</body>
+</html>

view/listingItems/itemsDetail.html

@@ -25,25 +25,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网"/>
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()"/>
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -51,9 +72,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass"/>
                 <input type="button" value="搜索" class="searchButton"/>
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -164,14 +223,19 @@
                             <tr>
                                 <td></td>
                                 <td>
-                                    <div class="fl">
-                                        <p>立即报名</p>
-                                        <p>保证金￥{{outProjectInformationDetail.deposit}}</p>
+                                    <div class="fl sign" id="signBtnYes" style="display: none;">
+                                        <p>立即出价</p>
+                                    </div>
+                                    <div id="signBtn" style="display: block;">
+                                        <div class="fl sign" onclick="goBond()">
+                                            <p>立即报名</p>
+                                            <p>保证金￥{{outProjectInformationDetail.deposit}}</p>
+                                        </div>
+                                        <p class="signTit fl"><i class="ts">!</i>如何交钱报名</p>
                                     </div>
-                                    <p class="signTit fl"><i class="ts">!</i>如何交钱报名</p>
                                 </td>
                             </tr>
-                            <tr>
+                            <tr id="signImg" style="display: none;">
                                 <td></td>
                                 <td>
                                     <img src="../../static/images/tips.png"/>

view/listingItems/itemsList.html

@@ -14,31 +14,53 @@
     <link href="../../static/css/new/new.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/listingItems/items.css" rel="stylesheet" type="text/css" />
     <link href="../../static/css/page_common.css" rel="stylesheet" type="text/css" />
+    <link href="../../static/css/dateTime.css" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -46,9 +68,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -76,9 +136,9 @@
                     <td>
                         <div class="auction_all_right2" id="auction_all_right_standard_type">
                             <script id="deptTypeData" type="text/html">
-                                <div class="auction_hall_table_tab auction_hall_table_tab_select" id="standardTypeAll">全部</div>
+                                <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="typeCheck('')" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
-                                    <div class="auction_hall_table_tab" id="standardType" onclick="typeCheck()">{{value.dictLabel}}</div>
+                                    <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</div>
                                 {{/each}}
                             </script>
                             <div class="auction_all_one2" id="deptTypeContent"></div>
@@ -92,13 +152,14 @@
                             <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="tabCheck('')" id="locInfoall">全部</div>
                         </div>
                         <div class="auction_all_right">
-                            <script id="deptLocationData" type="text/html">
-                                {{each deptLocationList as value i}}
-                                        <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
-                                {{/each}}
-                                <div class="clear"></div>
-                            </script>
-                            <div class="auction_all_one" id="deptLocationContent"></div>
+                            <div class="auction_all_one" id="deptLocationContent">
+                                <script id="deptLocationData" type="text/html">
+                                    {{each deptLocationList as value i}}
+                                    <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
+                                    {{/each}}
+                                    <div class="clear"></div>
+                                </script>
+                            </div>
                             <!-- 市 -->
                             <div class="auction_add_area auction_add_area_one" id="secondDept" style="display: none;">
                                 <script id="deptSecondLocationData" type="text/html">
@@ -119,15 +180,15 @@
                              onclick="selectedStatus('all')">全部
                         </div>
 
-                        <div class="auction_hall_table_tab" id="status1" onclick="selectedStatus('1')">正在报名</div>
+                        <div class="auction_hall_table_tab" id="status1" onclick="selectedStatus('1','正在报名')">正在报名</div>
 
-                        <div class="auction_hall_table_tab" id="status2" onclick="selectedStatus('2')">等待竞价</div>
+                        <div class="auction_hall_table_tab" id="status2" onclick="selectedStatus('2','等待竞价')">等待竞价</div>
 
-                        <div class="auction_hall_table_tab" id="status3" onclick="selectedStatus('3')">正在竞价</div>
+                        <div class="auction_hall_table_tab" id="status3" onclick="selectedStatus('3','正在竞价')">正在竞价</div>
 
-                        <div class="auction_hall_table_tab" id="status4" onclick="selectedStatus('4')">等待成交</div>
+                        <div class="auction_hall_table_tab" id="status4" onclick="selectedStatus('4','等待成交')">等待成交</div>
 
-                        <div class="auction_hall_table_tab" id="status8" onclick="selectedStatus('8')">已经成交</div>
+                        <div class="auction_hall_table_tab" id="status5" onclick="selectedStatus('5','已经成交')">已经成交</div>
 
                     </td>
                 </tr>
@@ -156,7 +217,7 @@
                         <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
-                        <div class="input_data_btn" onclick="auction_query()">查询</div>
+                        <div class="input_data_btn" onclick="goSearch()">查询</div>
                     </td>
                 </tr>
             </table>

view/login/login.html

@@ -16,56 +16,93 @@
 
 <body>
 <div class="main" id="page">
+    <!--顶部Title  -->
+    <div class="bg-f7 txc" style="display: none;">
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
-            <div class="fr">
+            <div class="fr" id="userInfo" style="display: none;">
                 <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                 <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                <p class="fl userName" id="userName2">Sherry</p>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
                 <div class="clear"></div>
             </div>
             <div class="headHover" id="headHover" style="display: none;">
                 <ul>
                     <li>
-                        <p>Sherry</p>
+                        <p id="userRealName2">Sherry</p>
                     </li>
                     <li class="m-t-5">
                         <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
-                        <p class="fl">我的资料</p>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
-                        <p class="fl">我的供求</p>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
-                        <p class="fl">我的咨询</p>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
                         <div class="clear"></div>
                     </li>
                     <li class="m-b-5">
                         <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
-                        <p class="fl">我的竞价</p>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
                         <div class="clear"></div>
                     </li>
-                    <li>
+                    <li onclick="outLogin()">
                         <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
-                        <p class="fl">退出登录</p>
+                        <a class="fl">退出登录</a>
                         <div class="clear"></div>
                     </li>
                 </ul>
             </div>
-            <!--            <div class="fr">-->
-            <!--                <a href="javascript:void(0)">请登录</a>-->
-            <!--                <a href="javascript:void(0)">免费注册</a>-->
-            <!--            </div>-->
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
             <div class="clear"></div>
         </div>
         <div class="clear"></div>

view/login/register.html

@@ -16,56 +16,93 @@
 
 <body>
     <div class="main" id="page">
+        <!--顶部Title  -->
+        <div class="bg-f7 txc" style="display: none;">
+            <div class="w-1200 topDress">
+                <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+                <p class="topTit02 fr">返回主站</p>
+                <div class="topTit02 fr" id="dress">
+                    <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                    <p class="fl">威海市</p>
+                    <div class="clear"></div>
+                </div>
+                <div class="clear"></div>
+                <div class="dressPc" id="dressList" style="display: none;">
+                    <ul>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                        <li>
+                            <p class="fl">文登区</p>
+                            <i class="jiantou"></i>
+                            <div class="clear"></div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
         <!--LOGO search -->
         <div class="logoSearch w-1200">
             <div class="wid50 logoSearch-div fl">
-                <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-                <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+                <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+                <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
                 <div class="clear"></div>
             </div>
             <div class="wid50 logoSearch-div fr">
-                <div class="fr">
+                <div class="fr" id="userInfo" style="display: none;">
                     <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                     <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                    <p class="fl userName" id="userName">Sherry</p>
+                    <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
                     <div class="clear"></div>
                 </div>
                 <div class="headHover" id="headHover" style="display: none;">
                     <ul>
                         <li>
-                            <p>Sherry</p>
+                            <p id="userRealName2">Sherry</p>
                         </li>
                         <li class="m-t-5">
                             <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
-                            <p class="fl">我的资料</p>
+                            <a href="../user/user.html?type=info" class="fl">我的资料</a>
                             <div class="clear"></div>
                         </li>
                         <li>
                             <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
-                            <p class="fl">我的供求</p>
+                            <a href="../user/user.html?type=info" class="fl">我的供求</a>
                             <div class="clear"></div>
                         </li>
                         <li>
                             <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
-                            <p class="fl">我的咨询</p>
+                            <a href="../user/user.html?type=info" class="fl">我的咨询</a>
                             <div class="clear"></div>
                         </li>
                         <li class="m-b-5">
                             <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
-                            <p class="fl">我的竞价</p>
+                            <a href="../user/user.html?type=info" class="fl">我的竞价</a>
                             <div class="clear"></div>
                         </li>
-                        <li>
+                        <li onclick="outLogin()">
                             <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
-                            <p class="fl">退出登录</p>
+                            <a class="fl">退出登录</a>
                             <div class="clear"></div>
                         </li>
                     </ul>
                 </div>
-                <!--            <div class="fr">-->
-                <!--                <a href="javascript:void(0)">请登录</a>-->
-                <!--                <a href="javascript:void(0)">免费注册</a>-->
-                <!--            </div>-->
+                <div class="fr" id="userLogin" style="display: none;">
+                    <a href="../login/login.html">请登录</a>
+                    <a href="../login/register.html">免费注册</a>
+                </div>
                 <div class="clear"></div>
             </div>
             <div class="clear"></div>
@@ -75,10 +112,10 @@
             <div class="w-1200">
                 <div class="registerView">
                     <p class="registerTit">请选择要注册的用户类型</p>
-                    <a href="registerExplain.html">
+                    <a href="registerExplain.html?type=1">
                         <img src="../../static/images/register_icon2.png" alt="" style="margin: 45px 95px 50px 0px;"/>
                     </a>
-                    <a href="registerExplain.html">
+                    <a href="registerExplain.html?type=2">
                         <img src="../../static/images/register_icon1.png" alt="" style="margin: 45px 0px 50px 0px;;"/>
                     </a>
                     <p>个人用户：参与农村产权交易的自然人；</p>

view/login/registerExplain.html

@@ -16,56 +16,93 @@
 
 <body>
 <div class="main" id="page">
+    <!--顶部Title  -->
+    <div class="bg-f7 txc" style="display: none;">
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
-            <div class="fr">
+            <div class="fr" id="userInfo" style="display: none;">
                 <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                 <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                <p class="fl userName" id="userName">Sherry</p>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
                 <div class="clear"></div>
             </div>
             <div class="headHover" id="headHover" style="display: none;">
                 <ul>
                     <li>
-                        <p>Sherry</p>
+                        <p id="userRealName2">Sherry</p>
                     </li>
                     <li class="m-t-5">
                         <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
-                        <p class="fl">我的资料</p>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
-                        <p class="fl">我的供求</p>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
-                        <p class="fl">我的咨询</p>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
                         <div class="clear"></div>
                     </li>
                     <li class="m-b-5">
                         <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
-                        <p class="fl">我的竞价</p>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
                         <div class="clear"></div>
                     </li>
-                    <li>
+                    <li onclick="outLogin()">
                         <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
-                        <p class="fl">退出登录</p>
+                        <a class="fl">退出登录</a>
                         <div class="clear"></div>
                     </li>
                 </ul>
             </div>
-            <!--            <div class="fr">-->
-            <!--                <a href="javascript:void(0)">请登录</a>-->
-            <!--                <a href="javascript:void(0)">免费注册</a>-->
-            <!--            </div>-->
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
             <div class="clear"></div>
         </div>
         <div class="clear"></div>
@@ -271,8 +308,8 @@
                     <br/>注册人声明：我已仔细阅读该须知，并同意该须知相关规定。
                 </p>
                 </div>
-                <input type="button" class="btn1" value="不同意"/>
-                <input type="button" class="btn2" id="agree" value="同意"/>
+                <input type="button" class="btn1" onclick="goRegister()" value="不同意"/>
+                <input type="button" class="btn2" onclick="goAgree()" value="同意"/>
             </div>
         </div>
     </div>

view/login/registerFrom.html

@@ -16,56 +16,93 @@
 
 <body>
 <div class="main" id="page">
+    <!--顶部Title  -->
+    <div class="bg-f7 txc" style="display: none;">
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
-            <div class="fr">
+            <div class="fr" id="userInfo" style="display: none;">
                 <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                 <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                <p class="fl userName" id="userName">Sherry</p>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
                 <div class="clear"></div>
             </div>
             <div class="headHover" id="headHover" style="display: none;">
                 <ul>
                     <li>
-                        <p>Sherry</p>
+                        <p id="userRealName2">Sherry</p>
                     </li>
                     <li class="m-t-5">
                         <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
-                        <p class="fl">我的资料</p>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
-                        <p class="fl">我的供求</p>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
-                        <p class="fl">我的咨询</p>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
                         <div class="clear"></div>
                     </li>
                     <li class="m-b-5">
                         <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
-                        <p class="fl">我的竞价</p>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
                         <div class="clear"></div>
                     </li>
-                    <li>
+                    <li onclick="outLogin()">
                         <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
-                        <p class="fl">退出登录</p>
+                        <a class="fl">退出登录</a>
                         <div class="clear"></div>
                     </li>
                 </ul>
             </div>
-            <!--            <div class="fr">-->
-            <!--                <a href="javascript:void(0)">请登录</a>-->
-            <!--                <a href="javascript:void(0)">免费注册</a>-->
-            <!--            </div>-->
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
             <div class="clear"></div>
         </div>
         <div class="clear"></div>
@@ -73,8 +110,8 @@
     <div style="border-top: 2px solid #007b76"></div>
     <div class="w-1200">
         <div class="topBtn">
-            <input type="button" value="个人用户" class="active"/>
-            <input type="button" value="单位用户"/>
+            <input type="button" value="个人用户" onclick="tabCheck('user',1)" id="userBtn" class="active"/>
+            <input type="button" value="单位用户" onclick="tabCheck('company',2)" id="companyBtn"/>
             <div class="clear"></div>
         </div>
         <div class="txc">
@@ -84,7 +121,7 @@
                         <span>*</span>手机号码：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="phone"/>
                     </td>
                     <td></td>
                 </tr>
@@ -93,9 +130,9 @@
                         <span>*</span>验证码：
                     </td>
                     <td>
-                        <input type="text" style="width: 28%;margin-right: 2%;" class="fl"/>
-                        <img src="../../static/images/banner.jpg" alt="" class="fl" style="width: 28%;margin-right: 2%;"/>
-                        <input type="button" value="看不清？点击更换" class="fl" style="width: 40%;padding: 0;"/>
+                        <input type="text" style="width: 28%;margin-right: 2%;" id="code" class="fl"/>
+                        <img id="graphicImg" alt="" class="fl" style="width: 28%;margin-right: 2%;"/>
+                        <input type="button" id="graphicImgBtn" value="看不清？点击更换" class="fl" style="width: 40%;padding: 0;"/>
                     </td>
                     <td>
                         请输入验证码
@@ -106,7 +143,7 @@
                         <span>*</span>密码：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="password" id="password"/>
                     </td>
                     <td>
                         8-20位必须包含数字和字母
@@ -117,7 +154,7 @@
                         <span>*</span>确认密码：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="password" id="passwordAgain"/>
                     </td>
                     <td>
                         请再次确认密码
@@ -125,13 +162,13 @@
                 </tr>
             </table>
             <div class="p-b-20" style="border-top: 1px solid #cfcfcf;"></div>
-            <table class="userTable" style="display: none;">
+            <table id="userTable" class="userTable">
                 <tr>
                     <td>
                         <span>*</span>姓名：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="realName"/>
                     </td>
                     <td>
                         必须填写真实姓名，否则不能通过审核
@@ -142,7 +179,7 @@
                         <span>*</span>身份证号码：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="idCardNum"/>
                     </td>
                     <td>
                         和姓名对应的证件号码，否则验证不能通过
@@ -153,20 +190,20 @@
                         <span>*</span>联系住址：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="address"/>
                     </td>
                     <td>
                         请填写您的详细地址
                     </td>
                 </tr>
             </table>
-            <table class="userTable">
+            <table id="companyTable" class="userTable" style="display: none;">
                 <tr>
                     <td>
                         <span>*</span>公司名称：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyName"/>
                     </td>
                     <td>
                         必须填写真实单位名称，否则不能通过审核
@@ -177,7 +214,7 @@
                         <span>*</span>负责人姓名：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyRealName"/>
                     </td>
                     <td></td>
                 </tr>
@@ -186,7 +223,7 @@
                         <span>*</span>身份证号：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyIdCardNum"/>
                     </td>
                     <td>
                         填写法人身份证号
@@ -197,7 +234,7 @@
                         <span>*</span>社会信用代码：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyCode"/>
                     </td>
                     <td>
                         填写公司的社会信用代码
@@ -208,7 +245,7 @@
                         <span>*</span>营业执照号：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyLicense"/>
                     </td>
                     <td>
                         填写公司的营业执照号
@@ -219,7 +256,7 @@
                         联系地址：
                     </td>
                     <td>
-                        <input type="text"/>
+                        <input type="text" id="companyAddress"/>
                     </td>
                     <td>
                         请填写详细地址
@@ -230,23 +267,22 @@
                 <tr>
                     <td></td>
                     <td colspan="2">
-                        <input type="checkbox"/>
+                        <input type="checkbox" id="iAgree" value="aaa"/>
                         我已经阅读并同意<span style="color: #007b76;">《农村产权交易信息服务平台会员注册协议》</span>
                     </td>
                 </tr>
                 <tr>
                     <td></td>
                     <td>
-                        <input type="button" value="立即注册"/>
+                        <input type="button" value="立即注册" id="register-submit"/>
                     </td>
                     <td></td>
                 </tr>
             </table>
         </div>
     </div>
-
 </div>
 </body>
 <script src="../../static/js/common/require.js" data-main="../../static/js/common/main.js?t=101" id="require-page"
-        target-module="../../static/js/project/user/register.js" defer type="text/javascript"></script>
+        target-module="../../static/js/project/user/registerFrom.js" defer type="text/javascript"></script>
 </html>

view/new/newDetail.html

@@ -18,25 +18,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -44,9 +65,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -76,12 +135,12 @@
             </div>
         </div>
         <div class="font24" id="newContent"></div>
-        <div class="share">
-            <p class="fl">分享到:</p>
-            <img src="../../static/images/icon5.png" alt=""/>
-            <img src="../../static/images/icon6.png" alt=""/>
-            <img src="../../static/images/icon7.png" alt=""/>
-        </div>
+<!--        <div class="share">-->
+<!--            <p class="fl">分享到:</p>-->
+<!--            <img src="../../static/images/icon5.png" alt=""/>-->
+<!--            <img src="../../static/images/icon6.png" alt=""/>-->
+<!--            <img src="../../static/images/icon7.png" alt=""/>-->
+<!--        </div>-->
     </div>
     <!--底部链接  -->
     <div class="bottomLink">

view/new/newList.html

@@ -22,13 +22,13 @@
         <div class="w-1200 topDress">
             <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
             <p class="topTit02 fr">返回主站</p>
-            <div class="topTit02 fr">
+            <div class="topTit02 fr" id="dress">
                 <img src="../../static/images/icon3.png" alt="" class="fl"/>
                 <p class="fl">威海市</p>
                 <div class="clear"></div>
             </div>
             <div class="clear"></div>
-            <div class="dressPc">
+            <div class="dressPc" id="dressList" style="display: none;">
                 <ul>
                     <li>
                         <p class="fl">文登区</p>
@@ -57,8 +57,8 @@
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -66,9 +66,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/policy/policy.html

@@ -21,25 +21,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -47,9 +68,47 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
-                <a href="javascript:void(0)">请登录</a>
-                <a href="javascript:void(0)">免费注册</a>
+            <div class="fr" id="userInfo" style="display: none;">
+                <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
+                <div class="clear"></div>
+            </div>
+            <div class="headHover" id="headHover" style="display: none;">
+                <ul>
+                    <li>
+                        <p id="userRealName2">Sherry</p>
+                    </li>
+                    <li class="m-t-5">
+                        <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li class="m-b-5">
+                        <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
+                        <div class="clear"></div>
+                    </li>
+                    <li onclick="outLogin()">
+                        <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
+                        <a class="fl">退出登录</a>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
+            </div>
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/user/user.html

@@ -20,25 +20,46 @@
 <div class="main" id="page">
     <!--顶部Title  -->
     <div class="bg-f7 txc">
-        <div class="w-1200 flex_dom flex_item_between flex_item_mid topDress">
-            <p class="topTit">Hi,欢迎来到农村产权交易中心</p>
-            <div class="flex_dom flex_item_end">
-                <el-select v-model="cityValue" placeholder="请选择">
-                    <el-option-group v-for="group in options" :key="group.label" :label="group.label">
-                        <el-option v-for="item in group.options" :key="item.value" :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-option-group>
-                </el-select>
-                <p class="topTit02">返回主站</p>
+        <div class="w-1200 topDress">
+            <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
+            <p class="topTit02 fr">返回主站</p>
+            <div class="topTit02 fr" id="dress">
+                <img src="../../static/images/icon3.png" alt="" class="fl"/>
+                <p class="fl">威海市</p>
+                <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            <div class="dressPc" id="dressList" style="display: none;">
+                <ul>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                    <li>
+                        <p class="fl">文登区</p>
+                        <i class="jiantou"></i>
+                        <div class="clear"></div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
     <!--LOGO search -->
     <div class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
-            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" />
-            <h1 class="fl" id="webConfigName">左云县农村产权交易网</h1>
+            <img src="../../static/images/logo.png" class="fl" alt="左云县农村产权交易网" onclick="goIndex()" />
+            <h1 class="fl" id="webConfigName" onclick="goIndex()">左云县农村产权交易网</h1>
             <div class="clear"></div>
         </div>
         <div class="wid50 logoSearch-div fr">
@@ -46,48 +67,48 @@
                 <input type="text" placeholder="请输入关键词搜索" class="searchClass" />
                 <input type="button" value="搜索" class="searchButton" />
             </div>
-            <div class="fr">
+            <div class="fr" id="userInfo" style="display: none;">
                 <img src="../../static/images/user_tips.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
                 <img src="../../static/images/member.png" class="block fl m-r-10" style="margin-top: 21px" alt=""/>
-                <p class="fl userName" id="userName">Sherry</p>
+                <a href="../user/user.html" class="fl userName" id="userRealName">Sherry</a>
                 <div class="clear"></div>
             </div>
             <div class="headHover" id="headHover" style="display: none;">
                 <ul>
                     <li>
-                        <p>Sherry</p>
+                        <p id="userRealName2">Sherry</p>
                     </li>
                     <li class="m-t-5">
                         <img src="../../static/images/user_icon1.png" class="fl" alt=""/>
-                        <p class="fl">我的资料</p>
+                        <a href="../user/user.html?type=info" class="fl">我的资料</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon2.png" class="fl" alt=""/>
-                        <p class="fl">我的供求</p>
+                        <a href="../user/user.html?type=info" class="fl">我的供求</a>
                         <div class="clear"></div>
                     </li>
                     <li>
                         <img src="../../static/images/user_icon3.png" class="fl" alt=""/>
-                        <p class="fl">我的咨询</p>
+                        <a href="../user/user.html?type=info" class="fl">我的咨询</a>
                         <div class="clear"></div>
                     </li>
                     <li class="m-b-5">
                         <img src="../../static/images/user_icon4.png" class="fl" alt=""/>
-                        <p class="fl">我的竞价</p>
+                        <a href="../user/user.html?type=info" class="fl">我的竞价</a>
                         <div class="clear"></div>
                     </li>
-                    <li>
+                    <li onclick="outLogin()">
                         <img src="../../static/images/user_icon5.png" class="fl" alt=""/>
-                        <p class="fl">退出登录</p>
+                        <a class="fl">退出登录</a>
                         <div class="clear"></div>
                     </li>
                 </ul>
             </div>
-<!--            <div class="fr">-->
-<!--                <a href="javascript:void(0)">请登录</a>-->
-<!--                <a href="javascript:void(0)">免费注册</a>-->
-<!--            </div>-->
+            <div class="fr" id="userLogin" style="display: none;">
+                <a href="../login/login.html">请登录</a>
+                <a href="../login/register.html">免费注册</a>
+            </div>
             <div class="clear"></div>
         </div>
         <div class="clear"></div>
@@ -97,12 +118,12 @@
         <ul class="container w-1200">
             <li><a href="../../index.html">首页</a></li>
             <li><a href="../listingItems/itemsList.html">挂牌项目</a></li>
-            <li><a href="javascript:void(0)">竞价大厅</a></li>
-            <li><a href="javascript:void(0)">项目公告</a></li>
-            <li><a href="javascript:void(0)">个人供求</a></li>
-            <li><a href="javascript:void(0)">新闻资讯</a></li>
-            <li><a href="javascript:void(0)">政策法规</a></li>
-            <li><a href="javascript:void(0)">互动交流</a></li>
+            <li><a href="../bidding/biddingList.html">竞价大厅</a></li>
+            <li><a href="../announcement/announcement.html">项目公告</a></li>
+            <li><a href="../demand/demand.html">个人供求</a></li>
+            <li><a href="../new/newList.html">新闻资讯</a></li>
+            <li><a href="../policy/policy.html">政策法规</a></li>
+            <li><a href="../interact/interactList.html">互动交流</a></li>
         </ul>
     </div>
 
@@ -163,10 +184,11 @@
                     <td><input type="text" value="{{userInformationDetail.address}}" class="p-l-10" style="width: 30%"/></td>
                 </tr>
                 <tr>
-                    <td>上传相关附件:</td>
-                    <td>
-                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/><br/>
-                        <span>*身份证照片、本人和身份证的合影</span>
+                    <td><span>*</span>上传附件:</td>
+                    <td colspan="3">
+                        <div id="cupload-3" class="m-l-10 m-b-5"></div>
+                        <span>* 身份证照片、本人和身份证的合影</span>
+                        <!--                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/>-->
                     </td>
                 </tr>
                 <tr>
@@ -180,50 +202,54 @@
                 <tr>
                     <td><span>*</span>手机号码:</td>
                     <td><p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p><span onclick="phoneUpdate('company')">修改手机号</span></td>
-                    <td><span>*</span>密码:</td>
-                    <td><input type="text"/></td>
+<!--                    <td><span>*</span>密码:</td>-->
+<!--                    <td><input type="text" id="password"/></td>-->
                 </tr>
                 <tr>
                     <td><span>*</span>公司名称:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyName}}" onchange="formAction('companyName')"/></td>
+                    <td><input type="text" id="companyName" value="{{userInformationDetail.companyName}}" onchange="formAction('companyName')"/></td>
                     <td><span>*</span>身份证号:</td>
-                    <td><input type="text" value="{{userInformationDetail.idCardNum}}" onchange="formAction('idCardNum')"/></td>
+                    <td><input type="text" id="idCardNum" value="{{userInformationDetail.idCardNum}}" onchange="formAction('idCardNum')"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>负责人姓名:</td>
-                    <td><input type="text" value="{{userInformationDetail.realname}}"/></td>
+                    <td><input type="text" id="realname" value="{{userInformationDetail.realname}}"/></td>
                     <td>社会信用代码:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyCode}}"/></td>
+                    <td><input type="text" id="companyCode" value="{{userInformationDetail.companyCode}}"/></td>
                 </tr>
                 <tr>
                     <td>企业性质:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyNature}}"/></td>
+                    <td><input type="text" id="companyNature" value="{{userInformationDetail.companyNature}}"/></td>
                     <td>经营范围:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyScope}}"/></td>
+                    <td><input type="text" id="companyScope" value="{{userInformationDetail.companyScope}}"/></td>
                 </tr>
                 <tr>
                     <td>经营期限:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyTimeLimit}}"/></td>
+                    <td><input type="text" id="companyTimeLimit" value="{{userInformationDetail.companyTimeLimit}}"/></td>
                     <td>成立时间:</td>
-                    <td><input type="text" value="{{userInformationDetail.companySetupTime}}"/></td>
+                    <td><input type="text" id="companySetupTime" value="{{userInformationDetail.companySetupTime}}"/></td>
                 </tr>
                 <tr>
                     <td>注册资金:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyCapital}}"/></td>
+                    <td><input type="text" id="companyCapital" value="{{userInformationDetail.companyCapital}}"/></td>
                     <td>营业执照号:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyLicense}}"/></td>
+                    <td><input type="text" id="companyLicense" value="{{userInformationDetail.companyLicense}}"/></td>
                 </tr>
                 <tr>
                     <td>联系地址:</td>
-                    <td><input type="text" value="{{userInformationDetail.companyLicense}}"/></td>
-                    <td><span>*</span>上传相关附件:</td>
-                    <td>
-                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/>
+                    <td><input type="text" id="address" value="{{userInformationDetail.address}}"/></td>
+                </tr>
+                <tr>
+                    <td><span>*</span>上传附件:</td>
+                    <td colspan="3">
+                        <div id="cupload-2" class="m-l-10 m-b-5"></div>
+                        <span>* 营业执照副本、单位负责人身份证</span>
+<!--                        <img src="../../static/images/upload.png" alt="" class="m-l-10"/>-->
                     </td>
                 </tr>
                 <tr>
                     <td></td>
-                    <td><input type="button" value="保存"/></td>
+                    <td><input type="button" id="userAction" value="保存"/></td>
                 </tr>
             </script>
             <table width="100%" id="companyInformationContent"></table>
@@ -244,7 +270,7 @@
                 </tr>
                 <tr>
                     <td></td>
-                    <td><input type="button" value="保存" style="width: 30%"/></td>
+                    <td><input type="button" id="bankAction" value="保存" style="width: 30%"/></td>
                 </tr>
             </table>
 
@@ -272,7 +298,7 @@
 
         <!--  我的供求     -->
         <div class="fl supplyTable" id="supplyInformation" style="display: none;">
-            <input type="button" value="发布供求"/>
+            <input type="button" onclick="goSupply()" value="发布供求"/>
             <div class="clear"></div>
             <script id="userSupplyInformationData" type="text/html">
                 <tr>
@@ -304,7 +330,7 @@
                             <p class="fl">修改</p>
                             <div class="clear"></div>
                         </div>
-                        <div class="fr">
+                        <div class="fr" onclick="deleteUserSupply({{value.id}})">
                             <img src="../../static/images/detail.png" alt="" class="fl"/>
                             <p class="fl">删除</p>
                             <div class="clear"></div>
@@ -323,9 +349,9 @@
         </div>
 
         <!--  我的供求 - 发布     -->
-        <div class="fl releaseSupply" style="display: none;">
+        <div class="fl releaseSupply" id="releaseSupply" style="display: none;">
             <p class="fl releaseSupplyTit">添加个人供求</p>
-            <input type="button" value="发布供求" class="releaseSupplyBtn"/>
+            <input type="button" onclick="gosupplyTable()" value="我的供求" class="releaseSupplyBtn"/>
             <div class="clear"></div>
             <table width="100%">
                 <tr>
@@ -339,28 +365,28 @@
                 </tr>
                 <tr>
                     <td><span>*</span>项目名称:</td>
-                    <td><input type="text" placeholder="请输入项目名称"/></td>
+                    <td><input type="text" id="projectName" placeholder="请输入项目名称"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>项目地址:</td>
-                    <td><input type="text" placeholder="请输入项目地址"/></td>
+                    <td><input type="text" id="location" placeholder="请输入项目地址"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>姓名:</td>
-                    <td><input type="text" placeholder="请输入姓名"/></td>
+                    <td><input type="text" id="projectRealName" placeholder="请输入姓名"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>联系电话:</td>
-                    <td><input type="text" placeholder="请输入联系电话"/></td>
+                    <td><input type="text" id="projectPhone" placeholder="请输入联系电话"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>项目详情:</td>
-                    <td><input type="text" placeholder="请输入项目详情"/></td>
+                    <td><input type="text" id="projectContent" placeholder="请输入项目详情"/></td>
                 </tr>
             </table>
             <div class="submitBtn">
-                <input type="button" value="确定"/>
-                <input type="button" value="取消"/>
+                <input type="button" id="supplyAction" value="确定"/>
+                <input type="button" onclick="gosupplyTable()" value="取消"/>
             </div>
         </div>
 
@@ -372,7 +398,7 @@
                 <p class="fl m-r-5">内容:</p>
                 <input type="text" class="fl m-r-25"/>
                 <input type="button" value="搜索" class="fl m-r-25"/>
-                <input type="button" value="我要发布" class="fl"/>
+                <input type="button" onclick="goRelease()" value="我要发布" class="fl"/>
                 <div class="clear"></div>
             </div>
             <div class="interactList">
@@ -404,31 +430,31 @@
         </div>
 
         <!--  我的咨询 - 发布     -->
-        <div class="fl releaseSupply" style="display: none;">
+        <div class="fl releaseSupply" id="release" style="display: none;">
             <p class="fl releaseSupplyTit">添加互动交流</p>
-            <input type="button" value="发布咨询" class="releaseSupplyBtn"/>
+            <input type="button" onclick="goReleaseTable()" value="我的咨询" class="releaseSupplyBtn"/>
             <div class="clear"></div>
             <table width="100%">
                 <tr>
                     <td><span>*</span>标题:</td>
-                    <td><input type="text" placeholder="请输入标题"/></td>
+                    <td><input type="text" id="title" placeholder="请输入标题"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>姓名:</td>
-                    <td><input type="text" placeholder="请输入姓名"/></td>
+                    <td><input type="text" id="releaseRealName" placeholder="请输入姓名"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>联系电话:</td>
-                    <td><input type="text" placeholder="请输入联系电话"/></td>
+                    <td><input type="text" id="releasePhone" placeholder="请输入联系电话"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>咨询内容:</td>
-                    <td><input type="text" placeholder="请输入咨询内容"/></td>
+                    <td><input type="text" id="releaseContent" placeholder="请输入咨询内容"/></td>
                 </tr>
             </table>
             <div class="submitBtn">
-                <input type="button" value="确定"/>
-                <input type="button" value="取消"/>
+                <input type="button" id="releaseAction" value="确定"/>
+                <input type="button" onclick="goReleaseTable()" value="取消"/>
             </div>
         </div>