产权交易

static/js/project/index.js

@@ -699,7 +699,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa
             var newTop = oldTop + 1;
             divScroll.scrollTop = newTop;
             var counst = divScroll.scrollHeight - divScroll.scrollTop - divScroll.clientHeight;
-            if (1 > counst) {
+            console.log(counst)
+            if (2 > counst) {
                 divScroll.scrollTop = 0;
             }
         }, 30)

static/js/project/listingItems/items.js

@@ -183,6 +183,12 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     }
 
     goBond = function(){
+        var nowTime = Date.parse(new Date());
+        var signupStopTime = Date.parse(module.data.outProjectInformationDetail.signupStopTime)
+        if (nowTime>signupStopTime){
+            tools.initError('报名结束！');
+            return;
+        }
         tools.skip('bond.html?id='+getQueryVariable('id'))
     }
 

static/js/project/user/registerFrom.js

@@ -165,11 +165,9 @@ define(['jquery', "template", "Tools", "echarts", 'register', 'swiper'], functio
         var codeVal = $('#code').val();
         var realName = $('#realName').val();
         var idCardNum = $('#idCardNum').val();
-        var address = $('#address').val();
 
         var companyRealName = $('#companyRealName').val();
         var companyIdCardNum = $('#companyIdCardNum').val();
-        var companyAddress = $('#companyAddress').val();
         /* 手机号 */
         if (phone == '') {
             $('#phone')[0].focus()

view/login/register.html

@@ -21,11 +21,11 @@
             <div class="w-1200 topDress">
                 <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
                 <a href="../../index.html" class="topTit02 fr">返回主站</a>
-<!--                <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="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>
@@ -54,7 +54,7 @@
             </div>
         </div>
         <!--LOGO search -->
-        <div class="logoSearch w-1200">
+        <div style="height: calc(100vh - (100vh - 112px));" class="logoSearch w-1200">
             <div class="wid50 logoSearch-div fl">
                 <div class="logo" onclick="goIndex()"></div>
                 <h1 class="fl" id="webConfigName" onclick="goIndex()"></h1>
@@ -101,7 +101,7 @@
                 </div>
                 <div class="fr" id="userLogin" style="display: none;">
                     <a href="../login/login.html">请登录</a>
-                    <a href="../login/register.html">免费注册</a>
+                    <a href="../login/register.html" style="margin-left: 0;">免费注册</a>
                 </div>
                 <div class="clear"></div>
             </div>

view/login/registerExplain.html

@@ -21,11 +21,11 @@
         <div class="w-1200 topDress">
             <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
             <a href="../../index.html" class="topTit02 fr">返回主站</a>
-<!--            <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="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>
@@ -54,7 +54,7 @@
         </div>
     </div>
     <!--LOGO search -->
-    <div class="logoSearch w-1200">
+    <div style="height: calc(100vh - (100vh - 112px));" class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
             <div class="logo" onclick="goIndex()"></div>
             <h1 class="fl" id="webConfigName" onclick="goIndex()"></h1>
@@ -101,7 +101,7 @@
             </div>
             <div class="fr" id="userLogin" style="display: none;">
                 <a href="../login/login.html">请登录</a>
-                <a href="../login/register.html">免费注册</a>
+                <a href="../login/register.html" style="margin-left: 0;">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>

view/login/registerFrom.html

@@ -21,11 +21,11 @@
         <div class="w-1200 topDress">
             <p class="topTit fl">Hi,欢迎来到农村产权交易中心</p>
             <a href="../../index.html" class="topTit02 fr">返回主站</a>
-<!--            <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="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>
@@ -54,7 +54,7 @@
         </div>
     </div>
     <!--LOGO search -->
-    <div class="logoSearch w-1200">
+    <div style="height: calc(100vh - (100vh - 112px));" class="logoSearch w-1200">
         <div class="wid50 logoSearch-div fl">
             <div class="logo" onclick="goIndex()"></div>
             <h1 class="fl" id="webConfigName" onclick="goIndex()"></h1>
@@ -101,7 +101,7 @@
             </div>
             <div class="fr" id="userLogin" style="display: none;">
                 <a href="../login/login.html">请登录</a>
-                <a href="../login/register.html">免费注册</a>
+                <a href="../login/register.html" style="margin-left: 0;">免费注册</a>
             </div>
             <div class="clear"></div>
         </div>
@@ -187,7 +187,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <span>*</span>联系住址：
+                        联系住址：
                     </td>
                     <td>
                         <input type="text" id="address"/>