修复bug

app.json

@@ -1,7 +1,7 @@
-          {
+{
   "pages":[
-    "pages/mybuy/mybuy",
     "pages/index/index",
+    "pages/mybuy/mybuy",
     "pages/hot/hot",
     "pages/hotdt/hotdt",
     "pages/myloan/myloan",

common/request.js

@@ -37,7 +37,9 @@ export const get=(url,data,callback,failback)=>{
           return;
         }
       } 
-      callback && callback(res);
+      setTimeout(function(){
+        callback && callback(res);
+      },0);
     },
     fail: function (error){
       failback && failback(error);
@@ -62,14 +64,18 @@ export const postwithoutahth=(url,data,callback,failback)=>{
     success: function (res){
       if(res.statusCode!=200){
         if(res.data.message){
-          wx.showToast({
-            title:res.data.message,
-            icon:"none"
-          })
+          setTimeout(function(){
+            wx.showToast({
+              title:res.data.message,
+              icon:"none"
+            })
+          },0);
           return;
         }
-      } 
-      callback && callback(res);
+      }       
+      setTimeout(function(){
+        callback && callback(res);
+      },0);
     },
     fail: function (error){
       failback && failback(error);
@@ -107,8 +113,10 @@ export const post=(url,data,header,callback,failback,noauth)=>{
             })
             return;
           }
-        } 
-        callback && callback(res);
+        }         
+        setTimeout(function(){
+          callback && callback(res);
+        },0);
       },
       fail: function (error){
         failback && failback(error);

components/brandlist/brandlist.js

@@ -57,7 +57,7 @@ Component({
             initiallist[item.initial].push(item);
           }
         })
-        var inith = 562;
+        var inith = 392;
         var scale = app.globalData.scale;
         for(var name in initiallist){
           var l = initiallist[name].length;

components/brandlist/brandlist.wxml

@@ -1,11 +1,8 @@
 <!--筛选品牌模块-->
   <!-- style="{{selectbar=='brand'?'left:0rpx;':''}}" -->
-<scroll-view
+<view
   class="brandw_c"
-  scroll-into-view ="{{scrolltoinit}}"
   style="{{show?'left:0rpx;':''}}"
-  bindscroll="brandScroll"
-  scroll-y=true
 >
   <view      
     style="height:{{headerheight}}rpx;"
@@ -21,47 +18,53 @@
     />
     <view class="brandw_title_w">品牌</view>
   </view>
-  <view class="brandw_list">
-    <view class="brandw_t_line">热门品牌</view>
-    <view class="brandw_hotlist">
-      <block wx:for="{{brandrecommend}}" wx:key="brand_id">
-        <view 
-          class="brandw_hotlist_item"          
-          bindtap="getBrandDetail"
-          data-id="{{item.brand_id}}"
-          data-img="{{item.brand_img}}"
-          data-name="{{item.brand_name}}"
-        >
-          <view class="brandw_hotitem_img" style="background-image:url({{item.brand_img}})"></view>
-          <view class="brandw_hotitem_name">{{item.brand_name}}</view>
-        </view>
-      </block>
-    </view>
-
-    <view class="brandw_t_line">不限品牌</view>
-    <block wx:for="{{brandlist}}" wx:key="initial">
-      <view class="brandw_binitial" id="{{item.initial}}">
-        {{item.initial}}
+  <scroll-view
+    bindscroll="brandScroll"
+    scroll-y=true
+    style="height: {{windowh-headerheight}}rpx"
+    scroll-into-view ="{{scrolltoinit}}"
+  >
+    <view class="brandw_list">
+      <view class="brandw_t_line">热门品牌</view>
+      <view class="brandw_hotlist">
+        <block wx:for="{{brandrecommend}}" wx:key="brand_id">
+          <view 
+            class="brandw_hotlist_item"          
+            bindtap="getBrandDetail"
+            data-id="{{item.brand_id}}"
+            data-img="{{item.brand_img}}"
+            data-name="{{item.brand_name}}"
+          >
+            <view class="brandw_hotitem_img" style="background-image:url({{item.brand_img}})"></view>
+            <view class="brandw_hotitem_name">{{item.brand_name}}</view>
+          </view>
+        </block>
       </view>
-      <block wx:for="{{item.list}}" wx:for-item="branditem" wx:key="brand_id">
-        <view 
-          class="brandw_bitem"
-          bindtap="getBrandDetail"
-          data-id="{{branditem.brand_id}}"
-          data-img="{{branditem.img}}"
-          data-name="{{branditem.brand_name}}"
-        >
-          <view
-            class="brandw_bimg"
-            style="background-image:url({{branditem.img}})"
-          />
-          <view class="brandw_bname">{{branditem.brand_name}}</view>
+
+      <view class="brandw_t_line">不限品牌</view>
+      <block wx:for="{{brandlist}}" wx:key="initial">
+        <view class="brandw_binitial" id="{{item.initial}}">
+          {{item.initial}}
         </view>
+        <block wx:for="{{item.list}}" wx:for-item="branditem" wx:key="brand_id">
+          <view 
+            class="brandw_bitem"
+            bindtap="getBrandDetail"
+            data-id="{{branditem.brand_id}}"
+            data-img="{{branditem.img}}"
+            data-name="{{branditem.brand_name}}"
+          >
+            <view
+              class="brandw_bimg"
+              style="background-image:url({{branditem.img}})"
+            />
+            <view class="brandw_bname">{{branditem.brand_name}}</view>
+          </view>
+        </block>
       </block>
-    </block>
-  </view>
-
-</scroll-view>
+    </view>
+  </scroll-view>
+</view>
 
 <scroll-view
   class="brand_serieslist"

module/caritem/caritem.wxml

@@ -1,34 +1,46 @@
 <template name="caritem">
-  <navigator 
-    open-type="navigateTo"
-    url="../cardetail/cardetail?id={{car.id}}"
+  <view 
     class="caritem_b">
-    <view 
+    <navigator 
+      open-type="navigateTo"
+      url="../cardetail/cardetail?id={{car.id}}"
       class="caritem_img" 
       style="background-image:url({{car.img}})"
     />
     <view class="caritem_info">
-      <view 
+      <navigator 
+        open-type="navigateTo"
+        url="../cardetail/cardetail?id={{car.id}}"
         class="caritem_t"
-      >{{car.title?car.title:'--'}}</view>
+      >{{car.title?car.title:'--'}}</navigator>
       <view class="caritem_time">
-        <view class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</view>
+        <navigator 
+          open-type="navigateTo"
+          url="../cardetail/cardetail?id={{car.id}}" 
+          class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</navigator>
         <navigator 
           wx:if='{{car.store_id}}'
           open-type="navigateTo"
+          catchtap=""
           url="../shop/shop?id={{car.store_id}}"
           class="caritem_store"
         >
           {{car.store_name}}
         </navigator>
       </view>
-      <view class="caritem_p">
+      <navigator 
+        open-type="navigateTo"
+        url="../cardetail/cardetail?id={{car.id}}" 
+        class="caritem_p">
         {{car.sale_price}}万 
         <image class="caritem_p_img" src="../../img/placard.png"/>
-      </view>
-      <view class="caritem_guide_p">
+      </navigator>
+      <navigator 
+        open-type="navigateTo"
+        url="../cardetail/cardetail?id={{car.id}}" 
+        class="caritem_guide_p">
         新手指导价：<view class="caritem_guidep">{{car.guide_price}}万</view>
-      </view>
+      </navigator>
     </view>
-  </navigator>
+  </view>
 </template>

module/caritem/collectcaritem.wxml

@@ -1,20 +1,23 @@
 <template name="collectcaritem">
-  <navigator 
-    open-type="navigateTo"
-    url="../cardetail/cardetail?id={{car.id}}"
+  <view
     class="caritem_b">
-    <view
+    <navigator 
+      open-type="navigateTo"
+      url="../cardetail/cardetail?id={{car.id}}"
       class="caritem_img" 
       style="background-image:url({{car.img}})"
     />
     <view class="caritem_info">
-      <view 
+      <navigator 
+        open-type="navigateTo"
+        url="../cardetail/cardetail?id={{car.id}}"
         class="caritem_t"
-      >{{car.title?car.title:'--'}}</view>
+      >{{car.title?car.title:'--'}}</navigator>
       <view class="caritem_time">
         {{car.licensetime}}年上牌|{{car.mileage}}万公里
         <navigator 
           open-type="navigateTo"
+          catchtap=""
           url="../shop/shop?id={{car.store_id}}"
           class="caritem_store"
         >
@@ -30,5 +33,5 @@
         <image class="delete_collect" bindtap="deleteCollect" data-id="{{car.id}}" data-ind="{{index}}" src="../../img/delete.png"/>
       </view>
     </view>
-  </navigator>
+  </view>
 </template>

module/caritem/mybuycaritem.wxml

@@ -1,20 +1,25 @@
 <template name="mybuycaritem">
   <view>
-    <navigator 
-      open-type="navigateTo" 
+    <veiw
       class="caritem_b"
-      url="../orderdetail/orderdetail?id={{car.id}}"
       >
-      <view 
+      <navigator 
+        url="../orderdetail/orderdetail?id={{car.id}}"
+        open-type="navigateTo"  
         class="caritem_img" 
         style="background-image:url({{car.img}})"
       />
       <view class="caritem_info">
-        <view 
+        <navigator 
+          url="../orderdetail/orderdetail?id={{car.id}}"
+          open-type="navigateTo"  
           class="caritem_t"
-        >{{car.title?car.title:'--'}}</view>
+        >{{car.title?car.title:'--'}}</navigator>
         <view class="caritem_time">
-          <view class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</view>
+          <navigator 
+            url="../orderdetail/orderdetail?id={{car.id}}"
+            open-type="navigateTo"  
+            class="caritem_time_i">{{car.licensetime}}年上牌|{{car.mileage}}万公里</navigator>
           <navigator 
             wx:if='{{car.store_id}}'
             open-type="navigateTo"
@@ -24,15 +29,21 @@
             {{car.store_name}}
           </navigator>
         </view>
-        <view class="caritem_p">
+        <navigator 
+          url="../orderdetail/orderdetail?id={{car.id}}"
+          open-type="navigateTo"  
+          class="caritem_p">
           {{car.sale_price}}万 
           <image class="caritem_p_img" src="../../img/placard.png"/>
-        </view>
-        <view class="caritem_guide_p">
+        </navigator>
+        <navigator 
+          url="../orderdetail/orderdetail?id={{car.id}}"
+          open-type="navigateTo"  
+          class="caritem_guide_p">
           新手指导价：<view class="caritem_guidep">{{car.guide_price}}万</view>
-        </view>
+        </navigator>
       </view>
-    </navigator>
+    </veiw>
     <view class="order_inof_b">
       <view class="order_price">订单总额:{{car.orderprice}}万</view>
       <view class="order_earnest">定金:{{car.bookingprice}}万</view>

pages/buy/buy.js

@@ -103,13 +103,21 @@ Page({
   //获取筛选信息
   getWheres:function(){
     var _self = this;
-    get(pathmap.wheres, {
-      no_brand_series:1
-    }, function (json) {
+    var wheres = wx.getStorageSync("wheres");
+    if(wheres){
       _self.setData({
-        wheres: json.data
+        wheres: wheres
       })
-    })
+    }else{
+      get(pathmap.wheres, {
+        no_brand_series:1
+      }, function (json) {
+        _self.setData({
+          wheres: json.data
+        })
+        wx.setStorageSync("wheres",json.data);
+      })
+    }
   },
   loadBrandRecommend:function(){
     var _self = this;
@@ -255,6 +263,9 @@ Page({
   closeBrandList:function(){
     this.setData({selectbar:""});
   },
+  filterBack:function(){
+    this.setData({selectbar:""});
+  },
   selectSeries:function(e){
     var series = e.detail.series;
     this.setData({

pages/buy/buy.wxss

@@ -116,6 +116,28 @@
 	z-index:101;
 	transition: all 0.5s;
 }
+.brandw_title{
+	background-color:#fede18;
+	height:128rpx;
+	position: fixed;
+	z-index:100;
+	top:0rpx;
+	width: 100%;
+}
+.brandw_back{
+	width:30rpx;
+	height: 30rpx;
+	position: absolute;
+	top:100rpx;
+	left:40rpx;
+}
+.brandw_title_w{
+	padding-top: 105rpx;
+	font-size: 36rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	text-align: center;
+}
 .wheres_more_i{
 	margin-top:20rpx;
 }

pages/cardetail/cardetail.js

@@ -206,7 +206,7 @@ Page(Object.assign({
       },function(json){
         if(json.statusCode==200){
           wx.showToast({
-            title:json.data.msg
+            title:json.data.message
           });
           _self.setData({detail:Object.assign(_self.data.detail,{is_collect:'0'})});        
         }else{

pages/collect/collect.js

@@ -110,7 +110,7 @@ Page({
       if(json.statusCode==200){
         var list = _self.data.list.slice();
         wx.showToast({
-          title:json.data.msg
+          title:json.data.message
         });
         list.splice(index,1);
         _self.setData({

pages/evaluate/evaluate.wxss

@@ -1,3 +1,6 @@
+.conent{
+	background-color:#F9F9F9;
+}
 .evaluate_form{
 	background-color: white;
 }

pages/myloan/myloan.js

@@ -29,6 +29,7 @@ Page({
   onLoad: function (options) {
     this.setData(stylemap);
     this.getRate();
+    this.getWheres();
   },
 
   /**
@@ -79,6 +80,24 @@ Page({
   onShareAppMessage: function () {
   
   },
+  getWheres:function(){
+    var _self = this;
+    var wheres = wx.getStorageSync("wheres");
+    if(wheres){
+      _self.setData({
+        wheres: wheres
+      })
+    }else{
+      get(pathmap.wheres, {
+        no_brand_series:1
+      }, function (json) {
+        _self.setData({
+          wheres: json.data
+        })
+        wx.setStorageSync("wheres",json.data);
+      })
+    }
+  },
   getRate:function(){
     var _self=this;
     var mobile = wx.getStorageSync("mobile");
@@ -121,5 +140,29 @@ Page({
       premonthpay:Math.round(premonthpay),
       scalename:scalename
     })
+  },
+  toBuy:function(){
+    var list = this.data.wheres.price.map(function(item){
+      var price = item.price_name.split("-");
+      var pricelist = price.map(function(item2){
+        return parseInt(item2);
+      })
+      return {
+        price_id:item.price_id,
+        pricelist:pricelist
+      }
+    })
+    var price = this.data.price;
+    var price_id = 0;
+    list.forEach(function(item){
+      if(item.pricelist[0]<price&&price<item.pricelist[1]){
+        price_id=item.price_id;
+      }
+    })
+    if(price_id){
+      wx.redirectTo({url:"../buy/buy?price="+price_id});
+    }else{
+      wx.redirectTo({url:"../buy/buy"});
+    }
   }
 })

pages/myloan/myloan.wxml

@@ -87,9 +87,9 @@
 				<view class="myloan_result_iv">{{time}}期</view>
 			</view>
 
-			<navigator url="../buy/buy" class="myloan_result_bt">
+			<view bindtap="toBuy" class="myloan_result_bt">
 				去买车
-			</navigator>
+			</view>
 		</view>
 	</view>
 	<view class="myloan_condition">

pages/usercenter/usercenter.js

@@ -24,11 +24,8 @@ Page(Object.assign({
     }
     if(!number){      
       this.openLog();
-    }else{      
-      var numbers = number.split("");
-      numbers.splice(3,4,"****");
-      number = numbers.join("");
-      this.setData({phonenumber:number});
+    }else{ 
+      this.getPhone(number);  
     }
   },
 
@@ -80,7 +77,17 @@ Page(Object.assign({
   onShareAppMessage: function () {
   
   },
+  getPhone:function(number){   
+    var numbers = number.split("");
+    numbers.splice(3,4,"****");
+    number = numbers.join("");
+    this.setData({phonenumber:number});
+  },
   closeLogBack:function(){
     wx.navigateBack();
+  },
+  loginback:function(){
+    var number = wx.getStorageSync("mobile");
+    this.getPhone(number);
   }
 },logs))

pages/usercenter/usercenter.wxss

@@ -49,6 +49,7 @@
 	height: 34rpx;
 	margin-left: 30rpx;
 	display: inline-block;
+	vertical-align:text-bottom;
 }
 .usercenter_op_w{
 	margin-left: 5rpx;