Browse Source

详情页面的检查添加,banner图片更新

liguorui 6 years ago
parent
commit
521eacff33

+ 0 - 2
common/topsource.js

@@ -26,8 +26,6 @@ const scrollevents =  {
         })
       })
     }
-
-    console.log("sourceScroll",e,scrolltop)
   },
   sourceMove:function(e){
     var source = this.data.scrollsource

BIN
img/banner.png


BIN
img/loans.png


BIN
img/sell.png


BIN
img/sellbanner.png


+ 15 - 1
pages/cardetail/cardetail.js

@@ -129,7 +129,21 @@ Page({
         detail.imgslength = detail.imgs.length;
         detail.first_plate_at = time[0]+"/"+time[1];
         detail.check_info.forEach(function(item){
-
+          item.passn = 0;
+          item.unpassn = 0;
+          item._child.forEach(function(item2){
+            item2.passn = 0;
+            item2.unpassn = 0;
+            item2._child.forEach(function(item3){
+              if(item3.state){
+                item2.passn++;
+                item.passn++;
+              }else{
+                item2.unpassn++;
+                item.unpassn++;                
+              }
+            })
+          })
         })
         _self.setData({
           detail:detail

+ 12 - 5
pages/cardetail/cardetail.wxml

@@ -178,20 +178,27 @@
 	</view>
 	<view class="cardetail_space">
 		<view class="cardetail_space_t">检查报告</view>
-		<!-- <view class="cardetail_check_report">
+		<view class="cardetail_check_report">
 			<block wx:for="{{detail.check_info}}" wx:key="item">
 				<view class="cardetail_check_i">
 					<view class="cardetail_check_n">
 						<image src = "../../img/{{imagemap[item.name]}}.png"/>
-						<view>{{item.name}}</view>
+						<view class="cardetail_check_name">{{item.name}}</view>
 					</view>
 					<view class="cardetail_check_i">
-						<view>{{item.name}}</view>
-						<image src = "../../img/uncollect.png"/>
+						<view class="cardetail_check_unp" wx:if="{{item.unpassn>0}}">
+							{{item.unpassn}}
+							<image class="unpass_number" src="../../img/checknopass.png"/>
+						</view>
+						<view  class="cardetail_check_p">
+							{{item.passn}}
+							<image class="pass_number" src="../../img/checkpass.png"/>
+						</view>
+						<image class="cardetail_check_op" src = "../../img/right.png"/>
 					</view>
 				</view>
 			</block>  
-		</view> -->
+		</view>
 	</view>
 	<view class="cardetail_op_list">
 		<view 

+ 32 - 1
pages/cardetail/cardetail.wxss

@@ -261,7 +261,38 @@
 	text-align: 48rpx;
 }
 .cardetail_check_n image{
-	
+	width:26rpx;
+	height: 26rpx;
+	margin-left: 50rpx;
+}
+.cardetail_check_name{
+	display: inline-block;
+	color: rgba(56, 55, 53, 1);
+	font-size: 26rpx;
+	text-align: left;
+	margin-left: 20rpx;
+}
+.cardetail_check_i{
+	flex: 1;
+	display: flex;
+	color: rgba(104, 104, 104, 1);
+	font-size: 24rpx;
+	justify-content:flex-end;
+}
+.cardetail_check_unp,.cardetail_check_p{
+	margin-left: 20rpx;
+}
+.unpass_number,.pass_number{
+	width:22rpx;
+	height: 22rpx;
+	margin-left: 10rpx;
+}
+.cardetail_check_op{
+	width:22rpx;
+	height: 22rpx;
+	margin:38rpx 48rpx 0rpx 10rpx;
+	margin-right: 48rpx;
+	margin-left: 10rpx;
 }
 
 /*******底部操作样式*******/

+ 1 - 1
pages/index/index.js

@@ -69,7 +69,7 @@ Page({
           item.labels=["热议"];          
         }
       })
-      console.log(JSON.stringify(list));
+      //console.log(JSON.stringify(list));
       if(list.length==1){
         list = list.concat(list,list);
       }

+ 1 - 1
pages/loans/loans.wxss

@@ -1,7 +1,7 @@
 /* pages/loans/loans.wxss */
 .page-content image{
 	width:100%;
-	height: 834rpx;
+	height: 905rpx;
 }
 .to_loan{
 	position: fixed;

+ 1 - 3
pages/sell/sell.wxml

@@ -10,9 +10,7 @@
   scroll-y="{{selectbar==''?'true':'false'}}"
   bindscrolltolower="{{hasloadall?'':'getMyBuy'}}"
 >
-  	<view class="sell_banner">
-  		
-  	</view>
+  	<image class="sell_banner" src="../../img/sellbanner.png"/>
   	<view
   		class="sell_form"
   	>

+ 3 - 2
pages/sell/sell.wxss

@@ -4,7 +4,8 @@
   background-color:#F9F9F9;
 }
 .sell_banner{
-	height: 235rpx;
+	height: 240rpx;
+	width: 750rpx;
 	background-color: #fede18;
 }
 .sell_form{
@@ -97,6 +98,6 @@
 .sell_bottom_banner{
 	display: block;
 	width: 750rpx;
-	height: 520rpx;
+	height: 262rpx;
 	margin-top:60rpx;
 }