上线前优化

components/brandlist/brandlist.json

@@ -1,4 +1,6 @@
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+	  "page-scroll":"../../components/page-scroll/page-scroll"
+  }
 }

components/brandlist/brandlist.wxml

@@ -149,7 +149,8 @@
     </view>
     <view class="brandw_title_w">车型</view>
   </view>
-  <scroll-view
+  <page-scroll 
+    styleSheet="height:{{windowh-headerheight}}rpx;"
     scroll-y=true
     style="height: {{windowh-headerheight}}rpx;"
   >
@@ -171,5 +172,5 @@
     <view wx:else class="no_model">
       暂无车型信息
     </view>
-  </scroll-view>
+  </page-scroll>
 </view>

components/brandlist/brandlist.wxss

@@ -38,6 +38,7 @@
 	height: 44rpx;
 	line-height: 44rpx;
 	text-align: center;
+	font-family: PingFangSC-Medium,NotoSansHans-Medium;
 }
 .brandw_t_line{
 	height: 58rpx;

components/page-scroll/page-scroll.js

@@ -15,6 +15,10 @@ Component({
     "upper-threshold":{      
       value:5,
       type:Number
+    },
+    "scroll-into-view":{
+      value:"",
+      type:String
     }
   },
 
@@ -49,7 +53,7 @@ Component({
           })
         }
       }
-      this.triggerEvent("scroll",this.data.upper);
+      this.triggerEvent("scroll",{scrollTop:e.detail.scrollTop,isuper:this.data.upper});
     },
     changeHeight:function(e){
       var _self=this;

components/page-scroll/page-scroll.wxml

@@ -13,6 +13,7 @@
 	  class="{{className}}"
   	  style="{{styleSheet}}"
 	  scroll-y="{{height==0}}"
+	  scroll-into-view="{{scroll-into-view}}"
 	  bindscroll="scroll"
 	  bindscrolltolower="scrollLower"
 	  bindscrolltoupper="scrollUpper"

pages/buy/buy.wxss

@@ -145,6 +145,7 @@
 	height: 44rpx;
 	line-height: 44rpx;
 	text-align: center;
+	font-family: PingFangSC-Medium;
 }
 .wheres_more_i{
 	margin-top:20rpx;

pages/buy/more.wxml

@@ -1,8 +1,7 @@
 <!--  更多筛选条件 -->
-<scroll-view
+<view
   class="more_c"
   style="{{selectbar=='more'?'left:0rpx;':''}}"
-  scroll-y=true
 >
   <view      
     style="height:{{headerheight}}rpx;"
@@ -19,135 +18,140 @@
     </view>
     <view class="brandw_title_w">更多筛选</view>
   </view>
-  <view class="wheres_more_i">
-    <view class="more_n">车龄</view>
-    <view class="more_list">
-      <view
-        class="more_detail_i {{searchdata.car_age==''?'more_detail_active':''}}"
-        data-type="car_age"
-        data-value=""
-        bindtap="getMoreFilter"
-      >不限</view>
-      <view 
-        wx:for="{{wheres.car_age}}"
-        wx:key="car_age_id"
-        class="more_detail_i {{searchdata.car_age==item.car_age_id?'more_detail_active':''}}"          
-        data-type="car_age"
-        data-value="{{item.car_age_id}}"
-        bindtap="getMoreFilter"
-      >
-        {{item.car_age_name}}
+  <page-scroll 
+    styleSheet="height:{{windowh-headerheight}}rpx;"
+    scroll-y=true
+  >
+    <view class="wheres_more_i">
+      <view class="more_n">车龄</view>
+      <view class="more_list">
+        <view
+          class="more_detail_i {{searchdata.car_age==''?'more_detail_active':''}}"
+          data-type="car_age"
+          data-value=""
+          bindtap="getMoreFilter"
+        >不限</view>
+        <view 
+          wx:for="{{wheres.car_age}}"
+          wx:key="car_age_id"
+          class="more_detail_i {{searchdata.car_age==item.car_age_id?'more_detail_active':''}}"          
+          data-type="car_age"
+          data-value="{{item.car_age_id}}"
+          bindtap="getMoreFilter"
+        >
+          {{item.car_age_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="wheres_more_i">
-    <view class="more_n">里程</view>
-    <view class="more_list">
-      <view
-        class="more_detail_i {{searchdata.mileage==''?'more_detail_active':''}}"
-        data-type="mileage"
-        data-value=""
-        bindtap="getMoreFilter"
-      >不限</view>
-      <view 
-        wx:for="{{wheres.mileage}}"
-        wx:key="mileage_id"
-        class="more_detail_i {{searchdata.mileage==item.mileage_id?'more_detail_active':''}}"          
-        data-type="mileage"
-        data-value="{{item.mileage_id}}"
-        bindtap="getMoreFilter"
-      >
-        {{item.mileage_name}}
+    <view class="wheres_more_i">
+      <view class="more_n">里程</view>
+      <view class="more_list">
+        <view
+          class="more_detail_i {{searchdata.mileage==''?'more_detail_active':''}}"
+          data-type="mileage"
+          data-value=""
+          bindtap="getMoreFilter"
+        >不限</view>
+        <view 
+          wx:for="{{wheres.mileage}}"
+          wx:key="mileage_id"
+          class="more_detail_i {{searchdata.mileage==item.mileage_id?'more_detail_active':''}}"          
+          data-type="mileage"
+          data-value="{{item.mileage_id}}"
+          bindtap="getMoreFilter"
+        >
+          {{item.mileage_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="wheres_more_i">
-    <view class="more_n">变数箱</view>
-    <view class="more_list">
-      <view
-        class="more_detail_i {{searchdata.transmission==''?'more_detail_active':''}}"
-        data-type="transmission"
-        data-value=""
-        bindtap="getMoreFilter"
-      >不限</view>
-      <view 
-        wx:for="{{wheres.transmission}}"
-        wx:key="transmission_id"
-        class="more_detail_i {{searchdata.transmission==item.transmission_id?'more_detail_active':''}}"          
-        data-type="transmission"
-        data-value="{{item.transmission_id}}"
-        bindtap="getMoreFilter"
-      >
-        {{item.transmission_name}}
+    <view class="wheres_more_i">
+      <view class="more_n">变数箱</view>
+      <view class="more_list">
+        <view
+          class="more_detail_i {{searchdata.transmission==''?'more_detail_active':''}}"
+          data-type="transmission"
+          data-value=""
+          bindtap="getMoreFilter"
+        >不限</view>
+        <view 
+          wx:for="{{wheres.transmission}}"
+          wx:key="transmission_id"
+          class="more_detail_i {{searchdata.transmission==item.transmission_id?'more_detail_active':''}}"          
+          data-type="transmission"
+          data-value="{{item.transmission_id}}"
+          bindtap="getMoreFilter"
+        >
+          {{item.transmission_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="wheres_more_i">
-    <view class="more_n">排量</view>
-    <view class="more_list">
-      <view
-        class="more_detail_i {{searchdata.displacement==''?'more_detail_active':''}}"
-        data-type="displacement"
-        data-value=""
-        bindtap="getMoreFilter"
-      >不限</view>
-      <view 
-        wx:for="{{wheres.displacement}}"
-        wx:key="displacement_id"
-        class="more_detail_i {{searchdata.displacement==item.displacement_id?'more_detail_active':''}}"          
-        data-type="displacement"
-        data-value="{{item.displacement_id}}"
-        bindtap="getMoreFilter"
-      >
-        {{item.displacement_name}}
+    <view class="wheres_more_i">
+      <view class="more_n">排量</view>
+      <view class="more_list">
+        <view
+          class="more_detail_i {{searchdata.displacement==''?'more_detail_active':''}}"
+          data-type="displacement"
+          data-value=""
+          bindtap="getMoreFilter"
+        >不限</view>
+        <view 
+          wx:for="{{wheres.displacement}}"
+          wx:key="displacement_id"
+          class="more_detail_i {{searchdata.displacement==item.displacement_id?'more_detail_active':''}}"          
+          data-type="displacement"
+          data-value="{{item.displacement_id}}"
+          bindtap="getMoreFilter"
+        >
+          {{item.displacement_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="wheres_more_i">
-    <view class="more_n">排放标准</view>
-    <view class="more_list">
-      <view
-        class="more_detail_i {{searchdata.emission==''?'more_detail_active':''}}"
-        data-type="emission"
-        data-value=""
-        bindtap="getMoreFilter"
-      >不限</view>
-      <view 
-        wx:for="{{wheres.emission}}"
-        wx:key="emission_id"
-        class="more_detail_i {{searchdata.emission==item.emission_id?'more_detail_active':''}}"          
-        data-type="emission"
-        data-value="{{item.emission_id}}"
-        bindtap="getMoreFilter"
-      >
-        {{item.emission_name}}
+    <view class="wheres_more_i">
+      <view class="more_n">排放标准</view>
+      <view class="more_list">
+        <view
+          class="more_detail_i {{searchdata.emission==''?'more_detail_active':''}}"
+          data-type="emission"
+          data-value=""
+          bindtap="getMoreFilter"
+        >不限</view>
+        <view 
+          wx:for="{{wheres.emission}}"
+          wx:key="emission_id"
+          class="more_detail_i {{searchdata.emission==item.emission_id?'more_detail_active':''}}"          
+          data-type="emission"
+          data-value="{{item.emission_id}}"
+          bindtap="getMoreFilter"
+        >
+          {{item.emission_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="wheres_more_i">
-    <view class="more_n">颜色</view>
-    <view class="more_list">
-      <view 
-        wx:for="{{wheres.colour}}"
-        wx:key="colour_id"
-        class="more_detail_i {{searchdata.colour==item.colour_id?'more_detail_active':''}}"          
-        data-type="colour"
-        data-value="{{item.colour_id}}"
-        bindtap="getMoreFilter"
-      >
-        <image src="../../img/{{item.colour_id}}.png"/>
-        {{item.colour_name}}
+    <view class="wheres_more_i">
+      <view class="more_n">颜色</view>
+      <view class="more_list">
+        <view 
+          wx:for="{{wheres.colour}}"
+          wx:key="colour_id"
+          class="more_detail_i {{searchdata.colour==item.colour_id?'more_detail_active':''}}"          
+          data-type="colour"
+          data-value="{{item.colour_id}}"
+          bindtap="getMoreFilter"
+        >
+          <image src="../../img/{{item.colour_id}}.png"/>
+          {{item.colour_name}}
+        </view>
       </view>
     </view>
-  </view>
-  <view class="more_bts">
-    <view 
-      class="more_bt_reset"
-      bindtap="resetFilter"
-      >重置</view>
-    <view 
-      bindtap="moreSearch"
-      class="more_bt_check"
-    >查看车源</view>
-  </view>
-</scroll-view>
+    <view class="more_bts">
+      <view 
+        class="more_bt_reset"
+        bindtap="resetFilter"
+        >重置</view>
+      <view 
+        bindtap="moreSearch"
+        class="more_bt_check"
+      >查看车源</view>
+    </view>
+  </page-scroll>
+</view>

pages/cardetail/cardetail.js

@@ -150,7 +150,7 @@ Page(Object.assign({
             })
           })
         })
-        var imgh = 444*detail.imgslength+1674;
+        var imgh = 444*detail.imgslength+1878;
         var scrollitem = [532,1586,imgh].map(function(item){
           return item/app.globalData.scale;
         })

pages/cardetail/cardetail.json

@@ -1,6 +1,7 @@
 {
 	"disableScroll":true,
   	"usingComponents":{
+		"page-scroll":"../../components/page-scroll/page-scroll",
 		"swc-scroll":"../../components/swc-scroll/swc-scroll"
 	}
 }

pages/cardetail/cardetail.wxml

@@ -228,6 +228,7 @@
 			</block>  
 		</view>
 	</view>
+	<view class="no_more">——没有更多——</view>
 	<view class="cardetail_op_list_space"></view>
 	<view class="cardetail_op_list">
 		<view 
@@ -359,8 +360,8 @@
 	    </view>
 		<view class="check_title_w">检测报告</view>
 	</view>
-	<scroll-view 
-		style="height:{{windowh-headerheight}}rpx;"
+	<page-scroll 
+		styleSheet="height:{{windowh-headerheight}}rpx;"
   		scroll-y=true
 		class="cardetail_check_report">
 		<view class="checkw_result">
@@ -403,6 +404,6 @@
 				</view>
 			</view>
 		</block>  
-	</scroll-view>
+	</page-scroll>
 </view>
 <include src="../../module/logs/logs.wxml"/>

pages/cardetail/cardetail.wxss

@@ -207,10 +207,10 @@
 
 .cardetail_describe{
 	line-height: 34rpx;
-	height: 68rpx;
+	height: 272rpx;
 	color: rgba(56, 55, 53, 1);
 	font-size: 24rpx;
-	margin: 48rpx;
+	margin: 30rpx 48rpx;
 	overflow: hidden;
 	word-break: break-all;
 }
@@ -222,6 +222,7 @@
 	text-indent:10rpx;
 	border-left:6rpx solid #FFE600;
 	margin:0rpx 40rpx;
+	font-family: PingFangSC-Medium,NotoSansHans-Medium;
 }
 .cardetail_baseinfo_c{
 	display: flex;
@@ -251,8 +252,8 @@
 	text-indent: 40rpx;
 	height: 30rpx;
 	line-height: 30rpx;
-	color: rgba(104, 104, 104, 1);
-	font-size: 20rpx;
+	color:rgba(56, 55, 53, 1);
+	font-size:24rpx;
 }
 .cardetail_collocate_list{
 	margin-top:40rpx;
@@ -366,6 +367,15 @@
 }
 
 /*******底部操作样式*******/
+.no_more{
+	height: 144rpx;
+	line-height: 144rpx;
+	color: rgba(183, 183, 183, 1);
+	font-size: 24rpx;
+	text-align: center;
+	font-family: PingFangSC-Medium,NotoSansHans-Medium;
+}
+
 .cardetail_op_list_space{
 	background-color: white;
 	height: 120rpx;
@@ -516,7 +526,8 @@
 }
 .scheme_condition_po{
 	color:black;
-	font-family: PingFangSC-Medium,NotoSansHans-Medium;
+	color:#c4ab75;
+	margin-top:40rpx;
 }
 
 

pages/loans/loans.wxml

@@ -17,7 +17,7 @@
 			open-type="navigate"
 			class="to_loan" 
 			url="../myloan/myloan">
-			好一车贷款计算器
+			第一好车贷款计算器
 		</navigator>
 	</view>
 </page-scroll>

pages/loans/loans.wxss

@@ -17,5 +17,5 @@
 	color: rgba(56, 55, 53, 1);
 	font-size: 30rpx;
 	text-align: center;
-	font-family: PingFangSC-Regular,NotoSansHans-DemiLight;
+	font-family: PingFangSC-Medium,NotoSansHans-Medium;
 }

pages/myloan/myloan.wxml

@@ -94,10 +94,10 @@
 		</view>
 	</view>
 	<view class="myloan_condition">
-		<view>首付条件：</view>
+		<!-- <view>首付条件：</view>
 		<view>一成 需芝麻信用分600分以上，需有房产证明；</view>
 		<view>二成 需芝麻信用分550分以上</view>
-		<view>三成 需芝麻信用分450分以上</view>
+		<view>三成 需芝麻信用分450分以上</view> -->
 		<view class='myloan_condition_po'>※本页面试算结果仅供参考，实际结果以最终复批结果为准</view>
 	</view>
 </page-scroll>