liguorui 7 år sedan
förälder
incheckning
09092e7ba9

+ 3 - 1
app.wxss

@@ -1,6 +1,7 @@
 /**app.wxss**/
 page{
-  font-family: "PingFangSC-Medium,NotoSansHans-Medium";
+  font-family: PingFangSC-Regular,NotoSansHans-Regular;
+  /*font-family: "PingFangSC-Medium,NotoSansHans-Medium";*/
 }
 .navigator-hover{
   background-color: transparent;
@@ -43,6 +44,7 @@ page{
   height: 44rpx;
   line-height: 44rpx;
   text-align: center;
+  font-family: PingFangSC-Medium;
 }
 .page_head_source{
   overflow: hidden;

+ 13 - 5
components/brandlist/brandlist.wxml

@@ -11,11 +11,15 @@
     class="brandw_title"
     style="height:{{headerheight}}rpx;"
   >
-    <image 
+    <!-- <image 
       class="brandw_back" 
       src="../../img/back.png"
       bindtap="filterBack"
-    />
+    /> -->
+    <view 
+      style="background-image: url(../../img/back.png); "
+      class="brandw_back" 
+      bindtap="filterBack"></view>
     <view class="brandw_title_w">品牌</view>
   </view>
   <scroll-view
@@ -41,7 +45,7 @@
         </block>
       </view>
 
-      <view class="brandw_t_line">不限品牌</view>
+      <view class="brandw_a_line">不限品牌</view>
       <block wx:for="{{brandlist}}" wx:key="initial">
         <view class="brandw_binitial" id="{{item.initial}}">
           {{item.initial}}
@@ -130,11 +134,15 @@
     class="brandw_title"
     style="height:{{headerheight}}rpx;"
   >
-    <image 
+    <!-- <image 
       class="brandw_back" 
       src="../../img/back.png"
       bindtap="modelBack"
-    />
+    /> -->
+    <view 
+      style="background-image: url(../../img/back.png); "
+      class="brandw_back" 
+      bindtap="modelBack"></view>
     <view class="brandw_title_w">车型</view>
   </view>
   <view wx:if="{{modellist.length>0}}" class="brandw_list">

+ 17 - 4
components/brandlist/brandlist.wxss

@@ -13,17 +13,20 @@
 .brandw_title{
 	background-color:#fede18;
 	height:128rpx;
-	position: fixed;
-	z-index:100;
+	position: absolute;
 	top:0rpx;
 	width: 100%;
 }
 .brandw_back{
-	width:30rpx;
-	height: 30rpx;
+	width:50rpx;
+	height: 50rpx;
 	position: absolute;
 	top:100rpx;
 	left:40rpx;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 30rpx 30rpx;
+
 }
 .brandw_title_w{
 	padding-top: 105rpx;
@@ -40,6 +43,15 @@
 	font-size: 22rpx;
 	text-indent: 38rpx;
 }
+.brandw_a_line{
+	height: 58rpx;
+	line-height: 58rpx;
+	background-color: rgba(242, 242, 245, 1);
+	color: rgba(56, 55, 53, 1);
+	font-size: 22rpx;
+	text-indent: 38rpx;
+	font-family: NotoSansHans-DemiLight;
+}
 .brandw_hotlist{
 	padding: 0rpx 40rpx;
 	display: flex;
@@ -75,6 +87,7 @@
 	color:#FFE600;
 	font-size: 24rpx;
 	text-indent: 48rpx;
+	font-family: PingFangSC-Semibold;
 }
 .brandw_bitem{
 	left: 0px;

BIN
img/close.png


+ 3 - 1
module/caritem/caritem.wxml

@@ -17,7 +17,9 @@
         <navigator 
           open-type="navigateTo"
           url="../cardetail/cardetail?id={{car.id}}" 
-          class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</navigator>
+          class="caritem_time_i">
+          {{car.licensetime}}年上牌 | {{car.mileage}}万公里
+        </navigator>
         <navigator 
           wx:if='{{car.store_id}}'
           open-type="navigateTo"

+ 5 - 5
module/caritem/caritem.wxss

@@ -4,7 +4,7 @@
   width:100%;
   display: flex;
   margin-top:20rpx;
-  border-top:1px solid #F9F9F9;
+  border-top:1rpx solid #F9F9F9;
   background: white;
   position: relative;
 }
@@ -51,20 +51,20 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow:ellipsis;
-  line-height: 28rpx;
+  line-height: 30rpx;
   color: rgba(245, 166, 35, 1);
   font-size: 20rpx;
   text-align: center;
   display: inline-block;
-  border:1px solid rgba(245, 166, 35, 1);
-  border-radius: 8rpx;
+  border:1rpx solid rgba(245, 166, 35, 1);
+  border-radius: 4rpx;
 } 
 .caritem_p{
   height: 33rpx;
   line-height: 33rpx;
   color: rgba(33, 36, 37, 1);
   font-size: 28rpx;
-  font-family: PingFangSC-Medium,NotoSansHans-Medium;
+  font-family: PingFangSC-Semibold;
 }
 .caritem_p_img{
   width: 20rpx;

+ 1 - 1
module/caritem/collectcaritem.wxml

@@ -14,7 +14,7 @@
         class="caritem_t"
       >{{car.title?car.title:'--'}}</navigator>
       <view class="caritem_time">
-        {{car.licensetime}}年上牌|{{car.mileage}}万公里
+        {{car.licensetime}}年上牌 | {{car.mileage}}万公里
         <navigator 
           open-type="navigateTo"
           catchtap=""

+ 3 - 1
module/caritem/mybuycaritem.wxml

@@ -19,7 +19,9 @@
           <navigator 
             url="../orderdetail/orderdetail?id={{car.id}}"
             open-type="navigateTo"  
-            class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</navigator>
+            class="caritem_time_i">
+            {{car.licensetime}}年上牌 | {{car.mileage}}万公里
+          </navigator>
           <navigator 
             wx:if='{{car.store_id}}'
             open-type="navigateTo"

+ 6 - 30
module/search/search.wxss

@@ -1,30 +1,5 @@
 /***********search************/
-/*.search{
-  display: block;
-  height: 78rpx;
-  background: #fede18;
-  overflow: hidden;
-}
-.search_input{
-  height: 52rpx;
-  width:674rpx;
-  margin: 13rpx auto 0rpx;
-  background: white;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 52rpx;
-  color: rgba(183, 183, 183, 1);
-  font-size: 24rpx;
-  position: relative;
-}
-.search_input_icon{
-  width:22rpx;
-  height:22rpx;
-  position: absolute;
-  top:15rpx;
-  left:285rpx;
-}*/
-/* pages/search/search.wxss */
+
 .content{
   
 }
@@ -54,19 +29,19 @@
   top:13rpx;
   left:315rpx;
   display: flex;
+  align-items:center;
   transition:all 0.5s;
 }
 .search_input_ic{
   width:22rpx;
   height:22rpx;
-  margin-top:14rpx;
 }
 .search_input{
-  margin-left:15rpx;
+  margin-left:10rpx;
   width:500rpx;
   line-height: 52rpx;
   font-size: 24rpx;
-  font-family: PingFangSC-Regular, sans-serif;
+  font-family: PingFangSC-Regular,NotoSansHans-DemiLight;
 }
 .search_input_holder{
   color: rgba(183, 183, 183, 1);
@@ -118,7 +93,8 @@
 }
 .hot_search_i{
   display: block;
-  width:142rpx;
+/*  width:142rpx;*/
+  padding:0rpx 25rpx;
   height: 52rpx;
   margin-top:30rpx;
   margin-left:28rpx;

+ 3 - 4
pages/buy/brandlist.wxml

@@ -13,11 +13,10 @@
     class="brandw_title"
     style="height:{{headerheight}}rpx;"
   >
-    <image 
+    <view 
+      style="background-image: url(../../img/back.png); "
       class="brandw_back" 
-      src="../../img/back.png"
-      bindtap="filterBack"
-    />
+      bindtap="filterBack"></view>
     <view class="brandw_title_w">品牌</view>
   </view>
   <view class="brandw_list">

+ 1 - 1
pages/buy/buy.wxml

@@ -12,7 +12,7 @@
   data="{{topsearchheight:topsearchheight,searchshow:searchshow,searchfocus:searchfocus,windowh:windowh,brandrecommend:brandrecommend,keys:searchdata.keys,headerheight:headerheight}}"
 />
 <page-scroll 
-  className="conent"
+  className="content"
   styleSheet="height:{{windowh-headerheight-topsearchheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
   bind:topheight="lockFilter"

+ 16 - 7
pages/buy/buy.wxss

@@ -1,8 +1,11 @@
 /* pages/buy/buy.wxss */
 @import "../../module/search/search.wxss"
 @import "../../module/caritem/caritem.wxss"
+.content{
+  background-color:#F9F9F9;
+}
 .filter_space{
-	height: 88rpx;
+	height: 66rpx;
 }
 .filter_c{
   height: 88rpx;
@@ -31,6 +34,7 @@
 	color: rgba(56, 55, 53, 1);
 	font-size: 28rpx;
 	display: inline;
+	font-family: PingFangSC-Medium;
 }
 .filter_nav_switch{
 	transition: all 0.5s;
@@ -54,7 +58,7 @@
 	border-bottom: 2rpx solid #EBEBEB;
 }
 .sortby_item{
-	border-top:2rpx solid rgba(235, 235, 235, 1);
+	border-top:1rpx solid rgba(235, 235, 235, 1);
 	height: 78rpx;
 	line-height: 78rpx;
 	font-size:26rpx;
@@ -119,17 +123,20 @@
 .brandw_title{
 	background-color:#fede18;
 	height:128rpx;
-	position: fixed;
-	z-index:100;
+	position: absolute;
 	top:0rpx;
 	width: 100%;
 }
 .brandw_back{
-	width:30rpx;
-	height: 30rpx;
+	width:50rpx;
+	height: 50rpx;
 	position: absolute;
 	top:100rpx;
 	left:40rpx;
+
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 30rpx 30rpx;
 }
 .brandw_title_w{
 	padding-top: 105rpx;
@@ -147,7 +154,7 @@
 	color: rgba(56, 55, 53, 1);
 	font-size: 28rpx;
 	text-indent: 38rpx;
-	font-family: PingFangSC-Regular,NotoSansHans-Regular;
+	font-family: PingFangSC-Medium;
 }
 .more_list{
 	background: white;
@@ -186,11 +193,13 @@
 .more_bt_reset{
 	border-top:1px solid #EBEBEB;
 	width: 240rpx;
+	font-family: PingFangSC-Medium;
 }
 .more_bt_check{
 	flex: 1;
 	border-top:1px solid #FFD800;
 	background: linear-gradient(270deg,#FFD800,#FFE600);
+	font-family: PingFangSC-Medium;
 }
 /*******like*******/
 .nocar_w{

+ 3 - 4
pages/buy/more.wxml

@@ -11,11 +11,10 @@
     class="brandw_title"
     style="height:{{headerheight}}rpx;"
   >
-    <image 
+    <view 
+      style="background-image: url(../../img/back.png); "
       class="brandw_back" 
-      src="../../img/back.png"
-      bindtap="filterBack"
-    />
+      bindtap="filterBack"></view>
     <view class="brandw_title_w">更多筛选</view>
   </view>
   <view class="wheres_more_i">

+ 7 - 0
pages/evaluate/evaluate.js

@@ -216,6 +216,13 @@ Page({
     // if(!this.data.mobile&&/^[1][3|4|5|6|7|8|9][0-9]{9}$/.test(this.data.mobile)){
     //   title="请填写有效手机号"
     // }
+    if(!this.data.model){
+      wx.showToast({
+        title:"请选择车型!",
+        icon:"none"
+      });
+      return;
+    }
     postwithoutahth(pathmap.estimatedprice,{
       mobile:this.data.mobile,
       model_types:this.data.model.car_model_id,

+ 1 - 1
pages/evaluate/evaluate.wxml

@@ -178,7 +178,7 @@
   		<view class="show_evaluate_header"></view>
 	  	<view class="show_evaluate_tb">
 	  		<view class="show_evaluate_t">
-	  			{{series['2'][selectseries['2']].car_model_name}}
+	  			{{model.car_model_name}}
 	  		</view>
 	  		<view class="show_evaluate_dt">
 	  			{{data.split("-")[0]}}年{{data.split("-")[1]}}月上牌|{{mileage}}万公里|{{area['1'][areaselect['1']].area_name}}

+ 2 - 1
pages/evaluate/evaluate.wxss

@@ -13,7 +13,7 @@
 	height: 88rpx;
 	line-height: 88rpx;
 	display: flex;
-	border-bottom: 1px solid rgba(235, 235, 235, 1);
+	border-bottom: 1rpx solid rgba(235, 235, 235, 1);
 }
 .evaluate_form_it{
 	color: rgba(56, 55, 53, 1);
@@ -67,6 +67,7 @@
 	color: rgba(56, 55, 53, 1);
 	font-size: 30rpx;
 	text-align: center;
+	border-radius: 6rpx;
 	font-family: PingFangSC-Regular,NotoSansHans-DemiLight;
 }
 

+ 6 - 4
pages/index/index.wxml

@@ -99,7 +99,8 @@
     <view class="recommend">
       <view class="recommend_t">
         <image class="recommend_img" src="../../img/recommend.png"/>
-        <view class="recommend_w">RECOMMENDATIONS</view>
+        <image class="recommend_w" src="../../img/recommend_w.png"/>
+        <!-- <view class="recommend_w">RECOMMENDATIONS</view> -->
       </view>
       <view class="recommend_sw">
         <swiper 
@@ -126,8 +127,9 @@
     </view>
     <view class="recommend">
       <view class="recommend_t">
-        <image class="recommend_img" src="../../img/like.png"/>
-        <view class="recommend_w">GUESS YOU LIKE</view>
+        <image class="like_img" src="../../img/like.png"/>
+        <image class="like_w" src="../../img/like_w.png"/>
+        <!-- <view class="recommend_w">GUESS YOU LIKE</view> -->
       </view>
     </view>
     <view class="like_cart_c">
@@ -138,7 +140,7 @@
     <navigator 
       open-type="reLaunch"
       url="../buy/buy"
-      class="show_more">加载更多></navigator>
+      class="show_more">加载更多 <image src="../../img/right.png"/></navigator>
     <image class="bottom_banner" src="../../img/banner.png"></image>
     <template 
       is="footer" 

+ 29 - 11
pages/index/index.wxss

@@ -101,6 +101,9 @@
   line-height: 49rpx;
   font-size: 24rpx;
   vertical-align: middle;
+  display: flex;
+  align-items: center;
+  font-family: PingFangSC-Light;
 }
 .goodcar_item_label{
   display: inline-block;
@@ -112,7 +115,7 @@
   color: rgba(56, 55, 53, 1);
   font-size: 16rpx;
   text-align: center;
-  font-family: PingFangSC-Light;
+  margin-right: 10rpx;
 }
 .prevent_move{
   position: absolute;
@@ -167,8 +170,10 @@
   width: 500rpx;
   height: 68rpx;
   line-height: 68rpx;
+  font-size: 22rpx;
   text-align: center;
   background-color: rgba(255, 230, 0, 1);
+  font-family: PingFangSC-Medium;
 }
 /**********recommend**********/
 .recommend{
@@ -179,20 +184,23 @@
   padding:64rpx 0rpx 60rpx;
 
 }
-.recommend_img{
+.recommend_img,.like_img{
   height: 32rpx;
   display: block;
   margin:0px auto;
   width:176rpx;
 }
 .recommend_w{
-  height: 16rpx;
-  line-height: 19rpx;
-  color: rgba(56, 55, 53, 1);
-  letter-spacing: 3rpx;
-  font-size: 16rpx;
-  text-align: center;
-  font-family: PerpetuaTitlingMT-Light;
+  height: 14rpx;
+  width:248rpx;
+  margin:10rpx auto 0rpx;
+  display: block;
+}
+.like_w{  
+  height: 14rpx;
+  width:204rpx;
+  margin:10rpx auto 0rpx;
+  display: block;
 }
 .recommend_sw{
   position: relative;
@@ -250,6 +258,7 @@
   color: rgba(56, 55, 53, 1);
   font-size: 26rpx;
   text-align: left;
+  font-family: PingFangSC-Medium,NotoSansHans-Medium;
 }
 .car_time{
   height: 30rpx;
@@ -263,7 +272,7 @@
   line-height: 33rpx;
   color: rgba(33, 36, 37, 1);
   font-size: 28rpx;
-  font-family: PingFangSC-Medium,NotoSansHans-Medium;
+  font-family: PingFangSC-Semibold;
 }
 .car_characteristic{
   height: 50rpx;
@@ -278,14 +287,23 @@
   margin-right: 15rpx;
   background-color: rgba(255, 230, 0, 1);
   color: rgba(56, 55, 53, 1);
+  font-family: PingFangSC-Light;
 }
 .show_more{
+  border-top: 1rpx solid #F2F2F5;
   line-height: 68rpx;
   height: 68rpx;
   color: rgba(135, 135, 135, 1);
   font-size: 24rpx;
-  text-align: center;
   background: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.show_more image{
+ width:22rpx;
+ height: 22rpx;
+ margin-left: 10rpx;
 }
 /*******bottom*********/
 .bottom_banner{

+ 1 - 0
pages/myloan/myloan.js

@@ -19,6 +19,7 @@ Page({
     price:50,
     time:12,
     scale:0,
+    firstpay:0,
     scalename:"零",
     number:["零","一","二","三","四","五","六","七","八","九"]
   },

+ 1 - 1
pages/myloan/myloan.wxml

@@ -77,7 +77,7 @@
 			</view>
 			<view class="myloan_result_i">
 				<view>首付款</view>
-				<view class="myloan_result_iv">{{firstpay}}万</view>
+				<view class="myloan_result_iv">{{firstpay/10000}}万</view>
 			</view>
 			<view class="myloan_result_i">
 				<view>月供</view>

+ 10 - 0
pages/usercenter/usercenter.js

@@ -79,6 +79,16 @@ Page(Object.assign({
   onShareAppMessage: function () {
   
   },
+  checkLogin:function(){
+    try{
+      var number = wx.getStorageSync("mobile");
+    }catch(e){
+
+    }
+    if(!number){      
+      this.openLog();
+    }
+  },
   getPhone:function(number){   
     var numbers = number.split("");
     numbers.splice(3,4,"****");

+ 4 - 1
pages/usercenter/usercenter.wxml

@@ -6,7 +6,10 @@
 >
 	<view class="usercenter_top_b">
 		<view class="usercenter_top_w">用户中心</view>
-		<image class="usercenter_top_img" src="../../img/usercenter.png"/>
+		<image 
+			class="usercenter_top_img" 
+			bindtap="checkLogin"
+			src="../../img/usercenter.png"/>
 		<view class="usercenter_top_p">{{phonenumber}}</view>
 	</view>
 	<view class="usercenter_op_list">