liguorui 6 vuotta sitten
vanhempi
commit
85b5d35ad9

+ 3 - 1
common/pathmap.js

@@ -33,5 +33,7 @@ export default{
   "carmodel":"/api/car_model",
   "brandlist":"/api/brand_list",
   "estimatedprice":"/api/estimated_price",
-  "orderdetail":"/api/order_detail"
+  "orderdetail":"/api/order_detail",
+  "getbrands":"/api/get_brand",
+  "carseries":"/api/car_series"
 }

+ 9 - 1
components/brandlist/brandlist.js

@@ -20,7 +20,15 @@ Component({
     "hasmodel":{
       value:false,
       type:Boolean
-    }
+    },
+    "getbrand":{
+      value:"",
+      type:String
+    },
+    // "serieslist":{
+    //   value:"",
+    //   type:String
+    // }
   },
 
   /**

+ 1 - 1
pages/cardetail/cardetail.wxml

@@ -145,13 +145,13 @@
 		</view>
 	</view>
 	<view
-		style="{{desopen?'height:auto':''}}"
 		class="cardetail_space cardetail_space_dsc">
 		<view class="cardetail_space_t">车辆描述</view>
 		<image 
 			bindtap="swdesc"
 			class="cardetail_describe_op {{desopen?'cardetail_describe_opactive':''}}" src = "../../img/right.png"/>
 		<view 
+			style="{{desopen?'height:auto':''}}"
 			class="cardetail_describe">
 			{{detail.car_condition}}
 		</view>

+ 10 - 8
pages/cardetail/cardetail.wxss

@@ -179,7 +179,6 @@
 	height:445rpx;
 }
 .cardetail_space_dsc{
-	height:155rpx;
 	overflow: hidden;
 	position: relative;
 }
@@ -203,6 +202,15 @@
 	transform: rotate(90deg);
 }
 
+.cardetail_describe{
+	line-height: 34rpx;
+	height: 68rpx;
+	color: rgba(56, 55, 53, 1);
+	font-size: 24rpx;
+	margin: 48rpx;
+	overflow: hidden;
+	word-break: break-all;
+}
 .cardetail_space_t{
 	height: 32rpx;
 	line-height: 32rpx;
@@ -226,6 +234,7 @@
 	line-height: 48rpx;
 	color: rgba(56, 55, 53, 1);
 	font-size: 26rpx;
+	font-family: NotoSansHans-Medium;
 }
 .cardetail_baseinfo_n{
 	height: 36rpx;
@@ -233,13 +242,6 @@
 	color: rgba(155, 155, 155, 1);
 	font-size: 24rpx;
 }
-.cardetail_describe{
-	line-height: 34rpx;
-	color: rgba(56, 55, 53, 1);
-	font-size: 24rpx;
-	padding: 48rpx;
-	word-break: break-all;
-}
 
 .cardetail_collocate{
 	margin-top:30rpx;

+ 3 - 0
pages/evaluate/evaluate.js

@@ -10,6 +10,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+    
+    getbrand:pathmap.getbrands,
+    serieslist:pathmap.carseries,
     windowh: app.globalData.windowh,
     area:{},
     areaselect:{},

+ 2 - 0
pages/evaluate/evaluate.wxml

@@ -254,6 +254,8 @@
 </page-scroll>
 <brandlist
   show="{{brandlistshow}}"
+  getbrand="{{getbrand}}"
+  serieslist="{{serieslist}}"
   bind:close="closeBrandList"
   bind:select="selectModel"
   hasmodel="true"

+ 11 - 12
pages/hot/hot.wxml

@@ -6,7 +6,7 @@
   data="{{title:'好车热点',headerheight:headerheight,hasback:true}}"
 />
 <page-scroll 
-  className="conent"
+  className="content"
   styleSheet="height:{{windowh-headerheight}}rpx;"
   scroll-y="{{selectbar==''?'true':'false'}}"
   bindscrolltolower="{{hasloadall?'':'getHots'}}"
@@ -14,26 +14,25 @@
 
   <view wx:if="{{list.length>0}}" class="hot_list">
     <block wx:for="{{list}}" wx:key="id">
-      <view class="hot_car_item">
+      <navigator 
+        open-type="navigate"
+        url="../hotdt/hotdt?id={{item.id}}"
+        class="hot_car_item">
       	<view class="hot_car_info">
-      		<navigator 
-            class="hot_car_title" 
-            open-type="navigate"
-            url="../hotdt/hotdt?id={{item.id}}">
+      		<view 
+            class="hot_car_title" >
       			{{item.title}}
-      		</navigator>
+      		</view>
       		<view class="hot_car_detail">      			
       			{{item.time}} 
       			<image src="../../img/eye.png" class="hot_car_img"/>
       			{{item.views}}
       		</view>
       	</view>
-      	<navigator 
-          open-type="navigate"
-          url="../hotdt/hotdt?id={{item.id}}">
+      	<view>
       		<image class="hot_car_image" src="{{item.img}}"/>
-      	</navigator>
-      </view>
+      	</view>
+      </navigator>
     </block>
   </view>
   <view wx:else class="hot_empty"> 

+ 2 - 1
pages/orderdetail/orderdetail.wxml

@@ -11,7 +11,7 @@
 	<view class="order_info">
 		<view class="order_info_t">
 			<view class="order_info_n">
-				订单号:{{id}}
+				订单号:{{order_sn}}
 			</view>
 		</view>
 		<view class="order_de_inof">
@@ -65,6 +65,7 @@
 			</view>
 			<view class="order_de_v">
 				<image 
+					mode="widthFix"
 					bindtap="showPic"
 					data-url="{{contract_img}}" 
 					src="{{contract_img}}"/>

+ 2 - 1
pages/orderdetail/orderdetail.wxss

@@ -38,7 +38,8 @@
 }
 .order_de_v image{
 	width:140rpx;
-	display: inline-block;
+	height: auto;
+	display:inline-block;
 }
 .order_de_remark{
 	margin:20rpx auto;

+ 2 - 0
pages/sell/sell.js

@@ -11,6 +11,8 @@ Page({
    * 页面的初始数据
    */
   data: {  
+    getbrand:pathmap.getbrands,
+    serieslist:pathmap.carseries,
     windowh: app.globalData.windowh,
     area:{},
     areaselect:{},

+ 14 - 6
pages/sell/sell.wxml

@@ -179,12 +179,18 @@
 	  		class="upload_img_list"
 	  	>
 	  		<block wx:for="{{imgs}}" wx:key="{{item}}">
-		  		<image
-		  			data-index="{{index}}"
-		  			bindtap="uploadImg"
-		  			class="upload_img_item"
-		  			src="{{item||'../../img/upload.png'}}"
-		  		/>
+	  			<view class="upload_img_item">
+			  		<image
+			  			data-index="{{index}}"
+			  			bindtap="uploadImg"
+			  			class="upload_img_item_pic"
+			  			src="{{item||'../../img/upload.png'}}"
+			  		/>
+			  		<image 
+			  			class=""
+			  			src="../../img/delete.png"
+			  			/>
+		  		</view>
 	  		</block>
 	  	</view>
   	</view>
@@ -199,6 +205,8 @@
     />  
 </page-scroll>
 <brandlist
+  getbrand="{{getbrand}}"
+  serieslist="{{serieslist}}"
   show="{{brandlistshow}}"
   bind:close="closeBrandList"
   bind:select="selectSeries"

+ 5 - 0
pages/sell/sell.wxss

@@ -89,6 +89,11 @@
 	height: 143rpx;
 	margin-left:34rpx;
 }
+.upload_img_item_pic{	
+	width:143rpx;
+	height: 143rpx;
+	display: block;
+}
 
 .sub_sell{
 	width:620rpx;