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

static/js/api/register.js

@@ -18,7 +18,7 @@ var Dictionaries = '/transaction/website/transfer'//成交公告字典
 @purl /common/base64Attach
 @param
 */
-var base64Upload = '/transaction/website/common/base64Upload'  //数据字典
+var base64Upload2 = '/transaction/website/common/base64Upload'  //数据字典
 
 
 var depositListPub = '/open/villageAffairs/public/realtimeBackList'  //查询开户行

static/js/project/listingItems/items.js

@@ -10,7 +10,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             showImgInformationDetail:'',
             loginNow:'',
             timer:null,
-            biddinglistInformationDetailLength:0,
+            biddinglistInformationDetailLength:1,
             biddingTimeType:0,
             biddinglistInformationDetail:[]
         },
@@ -197,9 +197,9 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
             $('#countType').html('未开始')
             $('#countDown').html('<span>距报名开始还有：'+d+'</span>天<span>'+h+'</span>时<span>'+m+'</span>分<span>'+s+'</span>秒')
         }
-        if(module.data.outProjectInformationDetail.biddingType != '公开竞价' && module.data.biddingTimeType != 2){
-            document.getElementById('biddingTable').style.display = 'none';
-            document.getElementById('biddingTitle').style.display = 'block';
+        if(module.data.outProjectInformationDetail.biddingType != '自由竞价' && module.data.biddingTimeType != 2){
+            document.getElementById('biddingTable').style.display = 'table-block';
+            document.getElementById('biddingTitle').style.display = 'none';
         }
     }
 
@@ -365,27 +365,14 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
         if (data.code == 200) {
             console.log(data)
             var content = data.rows;
-            // for (var i = 0; i < content.length-1; i++) {
-            //     for (var j = 0; j < content.length - 1 - i; j++) {
-            //         // 相邻元素两两对比，元素交换，大的元素交换到后面
-            //         if (content[j].money < content[j + 1].money) {
-            //             var temp = content[j];
-            //             content[j] = content[j+1];
-            //             content[j+1] = temp;
-            //         }
-            //     }
-            // }
-            console.log(content)
+            if(module.data.biddinglistInformationDetailLength == content.length){
+                return;
+            }
             module.data.biddinglistInformationDetail = content;
             module.data.biddinglistInformationDetailLength = content.length;
             var biddinglistInformationData = template('biddinglistInformationData', module.data);
             $("#tabDetail4").html(biddinglistInformationData);
             $("#nowMoney").html(content[0].money);
-
-
-
-            console.log(module.data.biddingTimeType)
-
         }
     }
 
@@ -482,6 +469,10 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
 
     //出价
     biddingSubmitMethod = function (data) {
+        if ($('#money').val()<=0){
+            tools.initError('请正常出价！');
+            return;
+        }
         if (module.data.outProjectInformationDetail.biddingDirect == '反向竞价'){
             //判断用户出价不能高于挂牌价
             if(module.data.outProjectInformationDetail.price<$('#money').val()){

static/js/project/user/registerFrom.js

@@ -207,13 +207,13 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper',"
             $('#cupload-3').find('input').each(function() {
                 if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
                     module.data.upType1 = true;
-                    tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo1);
+                    tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo1);
                 }
             })
             $('#cupload-4').find('input').each(function() {
                 if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
                     module.data.upType2 = true;
-                    tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo2);
+                    tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo2);
                 }
             })
             setTimeout(module.register,1000);
@@ -222,7 +222,7 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper',"
             $('#cupload-5').find('input').each(function() {
                 if($(this).val()!=''&&$(this).val().indexOf('http') == -1){
                     module.data.upType5 = true;
-                    tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo5);
+                    tools.doPostImg(base64Upload2, {file:$(this).val()}, module.upLoadOverInfo5);
                 }
             })
             setTimeout(module.register,1000);
@@ -312,7 +312,6 @@ define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper',"
         }
         if (data.code == 200){
             tools.initError("注册成功");
-            return;
             setTimeout(function(){
                 tools.skip('login.html')
             },2000)

view/listingItems/itemsDetail.html

@@ -624,7 +624,7 @@
             </table>
             <p id="biddingTitle" style="display: none;text-align: center;font-size: 24px;color: #999;">竞价进行中...</p>
         </script>
-        <div style="display: none;" id="tabDetail4"></div>
+        <div style="display: none;height: 500px;overflow-y: scroll;" id="tabDetail4"></div>
     </div>
     <!--底部链接  -->
     <div class="bottomLink">