浏览代码

全站添加页面下拉显示来源功能

liguorui 6 年之前
父节点
当前提交
3472c0a12e
共有 58 个文件被更改,包括 379 次插入195 次删除
  1. 2 5
      app.json
  2. 3 5
      app.wxss
  3. 2 1
      common/stylemap.js
  4. 62 7
      components/page-scroll/page-scroll.js
  5. 27 7
      components/page-scroll/page-scroll.wxml
  6. 18 1
      components/page-scroll/page-scroll.wxss
  7. 0 0
      module/caritem/mybuycaritem.wxml
  8. 8 2
      module/footer.wxml
  9. 1 2
      module/header.wxml
  10. 1 0
      module/logs/logs.wxss
  11. 13 1
      pages/buy/buy.js
  12. 3 1
      pages/buy/buy.json
  13. 25 21
      pages/buy/buy.wxml
  14. 1 0
      pages/buy/buy.wxss
  15. 5 1
      pages/cardetail/cardetail.json
  16. 12 6
      pages/cardetail/cardetail.wxml
  17. 5 1
      pages/collect/collect.json
  18. 13 7
      pages/collect/collect.wxml
  19. 5 1
      pages/evaluate/evaluate.json
  20. 11 10
      pages/evaluate/evaluate.wxml
  21. 5 1
      pages/hot/hot.json
  22. 8 8
      pages/hot/hot.wxml
  23. 5 1
      pages/hotdt/hotdt.json
  24. 9 9
      pages/hotdt/hotdt.wxml
  25. 1 1
      pages/hotdt/hotdt.wxss
  26. 5 0
      pages/index/index.json
  27. 14 15
      pages/index/index.wxml
  28. 5 1
      pages/loans/loans.json
  29. 8 9
      pages/loans/loans.wxml
  30. 0 3
      pages/logs/logs.json
  31. 5 1
      pages/mybuy/mybuy.json
  32. 11 10
      pages/mybuy/mybuy.wxml
  33. 2 1
      pages/myloan/myloan.json
  34. 8 9
      pages/myloan/myloan.wxml
  35. 5 1
      pages/mysuggest/mysuggest.json
  36. 7 8
      pages/mysuggest/mysuggest.wxml
  37. 0 1
      pages/search/search.json
  38. 0 1
      pages/searchresult/searchresult.json
  39. 5 1
      pages/sell/sell.json
  40. 9 9
      pages/sell/sell.wxml
  41. 5 1
      pages/shop/shop.json
  42. 9 9
      pages/shop/shop.wxml
  43. 1 1
      pages/test/test.js
  44. 8 7
      pages/test/test.wxml
  45. 5 1
      pages/usercenter/usercenter.json
  46. 7 7
      pages/usercenter/usercenter.wxml
  47. 0 0
      recycle/logs/logs.js
  48. 5 0
      recycle/logs/logs.json
  49. 0 0
      recycle/logs/logs.wxml
  50. 0 0
      recycle/logs/logs.wxss
  51. 0 0
      recycle/search/search.js
  52. 5 0
      recycle/search/search.json
  53. 0 0
      recycle/search/search.wxml
  54. 0 0
      recycle/search/search.wxss
  55. 0 0
      recycle/searchresult/searchresult.js
  56. 5 0
      recycle/searchresult/searchresult.json
  57. 0 0
      recycle/searchresult/searchresult.wxml
  58. 0 0
      recycle/searchresult/searchresult.wxss

+ 2 - 5
app.json

@@ -1,7 +1,6 @@
 {
   "pages":[
     "pages/index/index",
-    "pages/test/test",
     "pages/hot/hot",
     "pages/hotdt/hotdt",
     "pages/myloan/myloan",
@@ -10,14 +9,12 @@
     "pages/loans/loans",
     "pages/collect/collect",
     "pages/buy/buy",
-    "pages/search/search",
-    "pages/searchresult/searchresult",
-    "pages/logs/logs",
     "pages/shop/shop",
     "pages/cardetail/cardetail",
     "pages/usercenter/usercenter",
     "pages/mysuggest/mysuggest",
-    "pages/mybuy/mybuy"
+    "pages/mybuy/mybuy",
+    "pages/test/test"
   ],
   "window":{
     "navigationBarBackgroundColor": "#fede18",

+ 3 - 5
app.wxss

@@ -2,6 +2,9 @@
 page{
   font-family: "NotoSansHans-Medium";
 }
+.navigator-hover{
+  background-color: transparent;
+}
 .container {
   height: 100%;
   display: flex;
@@ -13,11 +16,6 @@ page{
 } 
 /***********header************/
 .page_head_place{
-  padding-top:70rpx;
-  height:58rpx;
-  text-align: center;
-  line-height: 36rpx;
-  font-size:26rpx;
   background: white;
 }
 .page_head{

+ 2 - 1
common/stylemap.js

@@ -1,4 +1,5 @@
 export default {
 	"headerheight":128,
-	"topsearchheight":78
+	"topsearchheight":78,
+	"footerheight":98
 }

+ 62 - 7
components/page-scroll/page-scroll.js

@@ -4,20 +4,75 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    "className":{
+      value:"",
+      type:String
+    },
+    "styleSheet":{
+      value:"",
+      type:String
+    },
+    "upper-threshold":{      
+      value:5,
+      type:Number
+    }
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-
+    height:0,
+    upper:true
+  },
+  ready:function(){
   },
-
-  /**
-   * 组件的方法列表
-   */
   methods: {
-
+    scrollLower:function(e){
+      this.triggerEvent("scrolltolower",e.detail);
+    },
+    scrollUpper:function(e){
+      this.triggerEvent("scrolltoupper",e.detail);
+    },
+    scroll:function(e){
+      if(this.data.upper){
+        if(e.detail.scrollTop>this.data["upper-threshold"]){
+          this.setData({
+            upper:false,
+            height:0
+          })
+        }
+      }else{
+        if(e.detail.scrollTop<this.data["upper-threshold"]){
+          this.setData({
+            upper:true
+          })
+        }
+      }
+      this.triggerEvent("scroll",this.data.upper);
+    },
+    changeHeight:function(e){
+      var _self=this;
+      if(this.data.starttop){
+        this.setData({
+          height:(e.touches[0].pageY-this.data.starttop)/2
+        })
+        this.triggerEvent("topheight",this.data.height);
+      }else{
+        this.setData({
+          starttop:e.touches[0].pageY
+        })
+      }
+    },
+    endChange:function(e){
+      var obj = {
+        starttop:0
+      }
+      if(this.data.height){
+        obj.height=0;
+      }
+      this.setData(obj);
+      this.triggerEvent("topheight",this.data.height);
+    }
   }
 })

+ 27 - 7
components/page-scroll/page-scroll.wxml

@@ -1,8 +1,28 @@
 <!--components/page-scroll/page-scroll.wxml-->
-<scroll-view 
-  class="{{class||''}}"
-  style="{{style||''}}"
-  scroll-y="{{scroll-y||true}}"
-  bindscroll=""
->
-</scroll-view>
+<view 
+	class="page_scroll"
+  	style="{{styleSheet}}">
+	<view 
+		class="page_info"
+		style="height:{{height}}rpx; {{height?'':'transition:height 0.5s;'}}">
+		<view class="page_info_t">
+	    	本网页由m.dyhc.com提供
+	    </view>
+	</view>
+	<scroll-view 
+  	  style="{{styleSheet}}"
+	  class="{{className}}"
+	  scroll-y="{{height==0}}"
+	  bindscroll="scroll"
+	  bindscrolltolower="scrollLower"
+	  bindscrolltoupper="scrollUpper"
+	  upper-threshold="0"
+	>
+		<view
+		  bindtouchmove="{{upper?'changeHeight':''}}"
+		  bindtouchend="endChange"
+		>
+			<slot></slot>
+		</view>
+	</scroll-view>
+</view>

+ 18 - 1
components/page-scroll/page-scroll.wxss

@@ -1 +1,18 @@
-/* components/page-scroll/page-scroll.wxss */
+.page_scroll{
+	overflow-y: hidden;
+}
+.page_info{
+	/*height: 0rpx;*/
+	background-color: #fede18;
+	overflow: hidden;
+	position: relative;
+}
+.page_info_t{
+	position: absolute;
+	top:20%;
+	width:100%;
+	text-align: center;
+	line-height: 36rpx;
+	font-size:26rpx;
+	color:#383735;
+}

+ 0 - 0
module/caritem/mybuycaritem.wxml


+ 8 - 2
module/footer.wxml

@@ -1,6 +1,12 @@
 <template name="footer">
-  <view class="page_footer_place"></view>
-  <view class="page_footer">
+  <view 
+    class="page_footer_place"
+    style="height:{{footerheight}}rpx;"
+    ></view>
+  <view 
+    class="page_footer"
+    style="height:{{footerheight}}rpx;"
+    >
     <view class="page_footer_item">
       <navigator 
         class='page_footer_navs'

+ 1 - 2
module/header.wxml

@@ -3,9 +3,8 @@
 <template name="header">  
   <view 
     class="page_head_place"
-    style="height:{{headerheight-70}}rpx;"
+    style="height:{{headerheight}}rpx;"
   >
-    本网页由m.dyhc.com提供
   </view>
   <view 
     class="page_head"    

+ 1 - 0
module/logs/logs.wxss

@@ -4,6 +4,7 @@
 	width:100%;
 	height:100%;
 	background-color: rgba(56,55,53,0.7);
+	z-index:200;
 }
 
 .logs_back{

+ 13 - 1
pages/buy/buy.js

@@ -72,7 +72,8 @@ Page({
       transmission:"",
       displacement:"",
       emission:"",
-      colour:""
+      colour:"",
+      filterlock:true
     }
   },
 
@@ -347,5 +348,16 @@ Page({
   },
   submitsearchword:function(value){    
     this.getList(Object.assign(this.data.searchdata,{keys:value}));
+  },
+  lockFilter:function(e){
+    if(e.detail&&!this.data.filterlock){
+      this.setData({
+        filterlock:true
+      })
+    }else if(!e.detail&&this.data.filterlock){
+      this.setData({
+        filterlock:false
+      })
+    }
   }
 })

+ 3 - 1
pages/buy/buy.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "我要买车"
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
 }

+ 25 - 21
pages/buy/buy.wxml

@@ -2,21 +2,26 @@
 <import src="../../module/header.wxml"/>
 <import src="../../module/footer.wxml"/>
 <import src="../../module/caritem/caritem.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+  is="header"
+  data="{{title:'我要买车',headerheight:headerheight}}"
+/>
+<include src="../../module/search/search.wxml"/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight-topsearchheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'loadListMore'}}"
+  bind:topheight="lockFilter"
+  bind:scrolltolower="{{hasloadall?'':'loadListMore'}}"
 >
-  <template 
-    is="header"
-    data="{{title:'我要买车',headerheight:headerheight}}"
-  />
-  <include src="../../module/search/search.wxml"/>
-  <view class="filter_space"></view>
-
+  <view 
+    class="filter_space"
+    ></view>
   <!--筛选模块-->
-  <view class="filter_c">
+  <view 
+    class="filter_c"
+    style="{{filterlock?'position: absolute; top:0rpx':'position: fixed; top:206rpx;'}}"
+    >
     <view class="filter_nav">
       <block wx:for="{{filters}}" wx:key="name">
         <view  
@@ -30,18 +35,13 @@
           <image src="../../img/sortby.png" class="filter_nav_switch"/>
         </view>
       </block>
-    </view>
+    </view>    
     <!--筛选排序模块-->
     <include src="./sort.wxml"/>
-    
+
     <!--筛选价格模块-->
     <include src="./pricespace.wxml"/>
-    
   </view>
-  <!--筛选品牌模块-->
-  <include src="./brandlist.wxml"/>
-  <!--  更多筛选条件 -->
-  <include src="./more.wxml"/>
   <view wx:if="{{!list}}"></view>
   <view wx:if="{{list.length>0}}" class="cart_list">
     <block wx:for="{{list}}" wx:key="id">
@@ -64,6 +64,10 @@
   </view>
   <template 
     is="footer"
-    data="{{local:1}}"
+    data="{{local:1,footerheight:footerheight}}"
   />
-</scroll-view>
+</page-scroll>
+<!--筛选品牌模块-->
+<include src="./brandlist.wxml"/>
+<!--  更多筛选条件 -->
+<include src="./more.wxml"/>

+ 1 - 0
pages/buy/buy.wxss

@@ -10,6 +10,7 @@
   top:206rpx;
   width:100%;
   background: white;
+  z-index:1;
 }
 .filter_nav{
 	display: flex;

+ 5 - 1
pages/cardetail/cardetail.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 12 - 6
pages/cardetail/cardetail.wxml

@@ -1,14 +1,20 @@
 <!--pages/cardetail/cardetail.wxml-->
 <import src="../../module/header.wxml"/>
-<scroll-view 
+<!-- <scroll-view 
   class="conent"
   style="height:{{windowh}}rpx;{{openlog?'filter: blur(5rpx)':''}}"
   scroll-y="{{openlog?'false':'true'}}"
+> -->
+<template 
+	is="header"
+	data="{{title:'',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
+  scroll-y="{{openlog?'false':'true'}}"
 >
-	<template 
-		is="header"
-		data="{{title:'',headerheight:headerheight,hasback:true}}"
-	/>
+	
 	<view 
 		class="cardetail_img"
 	>
@@ -214,7 +220,7 @@
 			分期购车
 		</view>
 	</view>
-</scroll-view>
+</page-scroll>
 <view 
 	style="left:{{openscheme?'0rpx':'100%'}}"
 	class="buy_scheme">

+ 5 - 1
pages/collect/collect.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 13 - 7
pages/collect/collect.wxml

@@ -2,17 +2,23 @@
 
 <import src="../../module/header.wxml"/>
 <import src="../../module/caritem/collectcaritem.wxml"/>
-<scroll-view 
+<template 
+    is="header"
+    data="{{title:'我的收藏',headerheight:headerheight,hasback:true}}"
+  />
+
+<!-- <scroll-view 
   class="conent"
   style="height:{{windowh}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
   bindscrolltolower="{{hasloadall?'':'getCollect'}}"
+> -->
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
+  scroll-y="{{openlog?'false':'true'}}"
+  bind:scrolltolower="{{hasloadall?'':'getCollect'}}"
 >
-  <template 
-    is="header"
-    data="{{title:'我的收藏',headerheight:headerheight,hasback:true}}"
-  />
-
   <view wx:if="{{list.length>0}}" class="collect_list">
     <block wx:for="{{list}}" wx:key="id">
       <template is="collectcaritem" data="{{car:item,index:index}}"/>
@@ -26,4 +32,4 @@
       class="collect_empty_bt">去逛逛</navigator>
   </view> 
   
-</scroll-view>
+</page-scroll>

+ 5 - 1
pages/evaluate/evaluate.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 11 - 10
pages/evaluate/evaluate.wxml

@@ -1,14 +1,15 @@
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
-  scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
+<template 
+    is="header"
+    data="{{title:'我要估价',headerheight:headerheight,hasback:true}}"
+	/>
+<page-scroll 
+	className="conent"
+	styleSheet="height:{{windowh-headerheight}}rpx;"
+	scroll-y="{{selectbar==''?'true':'false'}}"
+	bind:scrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-	<template 
-	    is="header"
-	    data="{{title:'我要估价',headerheight:headerheight,hasback:true}}"
-  	/>
+	
   	<view
   		class="evaluate_form"
   	>
@@ -239,4 +240,4 @@
 		    </swiper>
   		</view>
   	</view>
-</scroll-view>
+</page-scroll>

+ 5 - 1
pages/hot/hot.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 8 - 8
pages/hot/hot.wxml

@@ -1,16 +1,16 @@
 <!--pages/hot/hot.wxml-->
 
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+  is="header"
+  data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
   bindscrolltolower="{{hasloadall?'':'getHots'}}"
 >
-  <template 
-    is="header"
-    data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
-  />
 
   <view wx:if="{{list.length>0}}" class="hot_list">
     <block wx:for="{{list}}" wx:key="id">
@@ -44,4 +44,4 @@
       class="hot_empty_bt">去看看车</navigator>
   </view> 
   
-</scroll-view>
+</page-scroll>

+ 5 - 1
pages/hotdt/hotdt.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 9 - 9
pages/hotdt/hotdt.wxml

@@ -1,13 +1,13 @@
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+    is="header"
+    data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
+	/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="true"
->
-	<template 
-	    is="header"
-	    data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
-  	/>
+>	
 	<view class="hotdt_c">
 		<view class="hotdt_title">
 			{{title}}
@@ -29,4 +29,4 @@
 			</rich-text>
 		</view>
 	</view>
-</scroll-view>
+</page-scroll>

+ 1 - 1
pages/hotdt/hotdt.wxss

@@ -4,7 +4,7 @@
 }
 .hotdt_c{
 	width:674rpx;
-	margin:0rpx auto;
+	margin:30rpx auto 0rpx;
 	padding-bottom: 60rpx;
 }
 .hotdt_title{

+ 5 - 0
pages/index/index.json

@@ -0,0 +1,5 @@
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 14 - 15
pages/index/index.wxml

@@ -7,25 +7,24 @@
 <import src="../../module/caritem/caritem.wxml"/>
 
 
- <!--  upper-threshold="0"
-  bindscrolltoupper="sourceUp"
-  bindtouchstart="{{scrollsource.scrolltop?'':'sourceStart'}}"
-  bindtouchend="{{scrollsource.startdot?'sourceEnd':''}}"
-  bindtouchcancel="{{scrollsource.startdot?'sourceEnd':''}}" -->
-<scroll-view 
+<!-- <scroll-view 
   class="conent"
   style="height:{{windowh}}rpx;"
   scroll-y="{{scrollsource.startdot&&scrollsource.distance>0?false:true}}"
   bindscroll=""
+> -->
+<template 
+  is="header" 
+  data="{{title:'第一好车',headerheight:headerheight}}"
+/>  
+<include src="../../module/search/search.wxml"/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight-topsearchheight}}rpx;"
+  scroll-y="{{scrollsource.startdot&&scrollsource.distance>0?false:true}}"
 >
-    <!-- bindtouchmove="sourceMove" -->
   <view
-  >    
-    <template 
-      is="header" 
-      data="{{title:'第一好车',headerheight:headerheight}}"
-    />    
-    <include src="../../module/search/search.wxml"/>
+  >      
     <view 
       class="page_head_source"
       style="height:{{scrollsource.distance/2}}rpx;"
@@ -146,7 +145,7 @@
     <image class="bottom_banner" src="../../img/banner.png"></image>
     <template 
       is="footer" 
-      data="{{local:0}}"
+      data="{{local:0,footerheight:footerheight}}"
     />     
   </view>                                    
-</scroll-view>
+</page-scroll>

+ 5 - 1
pages/loans/loans.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 8 - 9
pages/loans/loans.wxml

@@ -1,15 +1,14 @@
 <!--pages/loans/loans.wxml-->
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+	is="header"
+	data="{{title:'我要贷款',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-	<template 
-		is="header"
-		data="{{title:'我要贷款',headerheight:headerheight,hasback:true}}"
-	/>
 	<view class="page-content">
 		<image src="../../img/loans.png"/>
 	</view>
@@ -19,4 +18,4 @@
 		url="../myloan/myloan">
 		好一车贷款计算器
 	</navigator>
-</scroll-view>
+</page-scroll>

+ 0 - 3
pages/logs/logs.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "查看启动日志"
-}

+ 5 - 1
pages/mybuy/mybuy.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 11 - 10
pages/mybuy/mybuy.wxml

@@ -1,15 +1,15 @@
 <import src="../../module/header.wxml"/>
 <import src="../../module/caritem/mybuycaritem.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+  is="header"
+  data="{{title:'我买的车',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
+  bind:scrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-  <template 
-    is="header"
-    data="{{title:'我买的车',headerheight:headerheight,hasback:true}}"
-  />
 
   <view wx:if="{{list.length>0}}" class="mybuy_list">
     <block wx:for="{{list}}" wx:key="id">
@@ -21,7 +21,8 @@
     <navigator 
       open-type="reLaunch"
       url="../buy/buy" 
-      class="mybuy_empty_bt">去逛逛</navigator>
+      class="mybuy_empty_bt">去逛逛
+    </navigator>
   </view> 
   
-</scroll-view>
+</page-scroll>

+ 2 - 1
pages/myloan/myloan.json

@@ -1,5 +1,6 @@
 {
 	"usingComponents":{
-		"carslider":"../../components/carslider/carslider"
+		"carslider":"../../components/carslider/carslider",
+		"page-scroll":"../../components/page-scroll/page-scroll"
 	}
 }

+ 8 - 9
pages/myloan/myloan.wxml

@@ -1,15 +1,14 @@
 <!--pages/loans/loans.wxml-->
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+	is="header"
+	data="{{title:'贷款计算器',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-	<template 
-		is="header"
-		data="{{title:'贷款计算器',headerheight:headerheight,hasback:true}}"
-	/>
 	<view class="myloan_con_c">
 		<view class="myloan_con_i">
 			<view class="myloan_con_it">
@@ -100,4 +99,4 @@
 		<view>三成 需芝麻信用分450分以上</view>
 		<view class='myloan_condition_po'>※本页面试算结果仅供参考,实际结果以最终复批结果为准</view>
 	</view>
-</scroll-view>
+</page-scroll>

+ 5 - 1
pages/mysuggest/mysuggest.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 7 - 8
pages/mysuggest/mysuggest.wxml

@@ -1,15 +1,14 @@
 <!--pages/mysuggest/mysuggest.wxml-->
 <import src="../../module/header.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
-  scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
->
-	<template 
+<template 
 	is="header"
 	data="{{title:'意见反馈',headerheight:headerheight,hasback:true}}"
 	/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
+  scroll-y="{{selectbar==''?'true':'false'}}"
+>
 	<view class="mysuggest_c">
 		<textarea 
 			class="mysuggest_area" 
@@ -20,4 +19,4 @@
 			name="textarea"/>
 		<view bindtap="subSuggest" class="mysuggest_bt">提交反馈</view>
 	</view>
-</scroll-view>
+</page-scroll>

+ 0 - 1
pages/search/search.json

@@ -1 +0,0 @@
-{}

+ 0 - 1
pages/searchresult/searchresult.json

@@ -1 +0,0 @@
-{}

+ 5 - 1
pages/sell/sell.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 9 - 9
pages/sell/sell.wxml

@@ -1,15 +1,15 @@
 <import src="../../module/header.wxml"/>
 <import src="../../module/footer.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+    is="header"
+    data="{{title:'预约卖车',headerheight:headerheight,hasback:false}}"
+	/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
   bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-	<template 
-	    is="header"
-	    data="{{title:'预约卖车',headerheight:headerheight,hasback:false}}"
-  	/>
   	<view class="sell_banner">
   		
   	</view>
@@ -170,7 +170,7 @@
   	<image class="sell_bottom_banner" src="../../img/sell.png"/>
   	<template 
       is="footer" 
-      data="{{local:2}}"
+      data="{{local:2,footerheight:footerheight}}"
     />  
-</scroll-view>
+</page-scroll>
 <include src="../../module/logs/logs.wxml"/>

+ 5 - 1
pages/shop/shop.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 9 - 9
pages/shop/shop.wxml

@@ -1,16 +1,16 @@
 <!--pages/shop/shop.wxml-->
 <import src="../../module/header.wxml"/>
 <import src="../../module/caritem/caritem.wxml"/>
-<scroll-view 
-  class="conent"
-  style="height:{{windowh}}rpx;"
+<template 
+	is="header"
+	data="{{title:'店铺主页',headerheight:headerheight,hasback:true}}"
+/>
+<page-scroll 
+  className="conent"
+  styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y
-  bindscrolltolower="{{hasloadall?'':'loadCars'}}"
+  bind:scrolltolower="{{hasloadall?'':'loadCars'}}"
 >
-	<template 
-		is="header"
-		data="{{title:'店铺主页',headerheight:headerheight,hasback:true}}"
-	/>
 	<view class="shop_info">
 		<view 
 			class="shop_img"
@@ -42,4 +42,4 @@
   		style="display:none"
   		class="loading"
   		></view> -->
-</scroll-view>
+</page-scroll>

+ 1 - 1
pages/test/test.js

@@ -87,7 +87,7 @@ Page({
       get(pathmap.goodcar, para, function (json) {
         var list = json.data&&json.data.list;
         var obj = {          
-          list:_self.data.list.concat(list),
+          list:_self.data.list.concat(list,list,list,list),
           offset:_self.data.offset+_self.data.limit,
           lock:false
         }

+ 8 - 7
pages/test/test.wxml

@@ -1,16 +1,17 @@
 <!--pages/hot/hot.wxml-->
 
 <import src="../../module/header.wxml"/>
+<template 
+  is="header"
+  data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
+/>
 <page-scroll
-  class="conent"
-  style="height:{{windowh}}rpx;"
+  className="conent"
+  styleSheet="height:{{windowh-70}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
-  bindscrolltolower="{{hasloadall?'':'getHots'}}"
+  bind:scrolltolower="{{hasloadall?'':'getHots'}}"
+  upper-threshold="0"
 >
-  <template 
-    is="header"
-    data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
-  />
 
   <view wx:if="{{list.length>0}}" class="hot_list">
     <block wx:for="{{list}}" wx:key="id">

+ 5 - 1
pages/usercenter/usercenter.json

@@ -1 +1,5 @@
-{}
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

+ 7 - 7
pages/usercenter/usercenter.wxml

@@ -1,8 +1,8 @@
 <!--pages/usercenter/usercenter.wxml-->
 <import src="../../module/footer.wxml"/>
-<view 
-	class="content"
-	style="height:{{windowh}}rpx;"
+<page-scroll
+	className="conent"
+	styleSheet="height:{{windowh}}rpx;"
 >
 	<view class="usercenter_top_b">
 		<view class="usercenter_top_w">用户中心</view>
@@ -21,8 +21,8 @@
 
 		<navigator 
 			open-type="navigate"
-			class="usercenter_op_i" u
-			rl="../mybuy/mybuy">
+			class="usercenter_op_i" 
+			url="../mybuy/mybuy">
 			<image class="usercenter_op_img" src="../../img/mybuy.png"/>
 			<view class="usercenter_op_w">我买的车</view>
 			<image class="usercenter_op_bt" src="../../img/right.png"/>
@@ -39,7 +39,7 @@
 	</view>
 	<template 
       is="footer" 
-      data="{{local:3}}"
+      data="{{local:3,footerheight:footerheight}}"
     /> 
-</view>
+</page-scroll>
 <include src="../../module/logs/logs.wxml"/>

pages/logs/logs.js → recycle/logs/logs.js


+ 5 - 0
recycle/logs/logs.json

@@ -0,0 +1,5 @@
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

pages/logs/logs.wxml → recycle/logs/logs.wxml


pages/logs/logs.wxss → recycle/logs/logs.wxss


pages/search/search.js → recycle/search/search.js


+ 5 - 0
recycle/search/search.json

@@ -0,0 +1,5 @@
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

pages/search/search.wxml → recycle/search/search.wxml


pages/search/search.wxss → recycle/search/search.wxss


pages/searchresult/searchresult.js → recycle/searchresult/searchresult.js


+ 5 - 0
recycle/searchresult/searchresult.json

@@ -0,0 +1,5 @@
+{
+  	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll"
+	}
+}

pages/searchresult/searchresult.wxml → recycle/searchresult/searchresult.wxml


pages/searchresult/searchresult.wxss → recycle/searchresult/searchresult.wxss