列表样式调整

@@ -4,7 +4,14 @@ Component({
    * 组件的属性列表
    * 组件的属性列表
    */
    */
   properties: {
   properties: {
-
+    bgColor:{
+      type:String,
+      value:'#fff'
+    },
+    lineColor:{
+      type:String,
+      value:'#E0E0E0'
+    },
   },
   },
 
 
   /**
   /**

 <!--components/hr.wxml-->
 <!--components/hr.wxml-->
 <view class="hr flex-vc">
 <view class="hr flex-vc">
-    <view class="hr-one flex-vc">
-        <view class="text">
+    <view class="hr-one flex-vc" style="background-color: {{lineColor}};">
+        <view class="text" style="background-color: {{bgColor}};">
             <slot></slot>
             <slot></slot>
         </view>
         </view>
     </view>
     </view>

@@ -9,10 +9,9 @@
 }
 }
 .hr-one{
 .hr-one{
   width: 100%;
   width: 100%;
-  background-color: #F5F5F5;
+  background-color: #E0E0E0;
   height: 2rpx;
   height: 2rpx;
 }
 }
 .text{
 .text{
-  background-color: #fff;
   padding: 0 24rpx;
   padding: 0 24rpx;
 }
 }

@@ -15,6 +15,9 @@
 .seller.noshadow{
 .seller.noshadow{
   box-shadow: none;
   box-shadow: none;
 }
 }
+.seller.noborder.noshadow{
+  width: 100%;
+}
 .seller image{
 .seller image{
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;

@@ -192,12 +192,12 @@ Page({
   },
   },
   sellerFormat(sellers){
   sellerFormat(sellers){
     sellers.forEach((seller) => {
     sellers.forEach((seller) => {
-      if(seller.distance) {
+      if(seller.distance || seller.distance===0) {
         seller.distance = parseInt(seller.distance);
         seller.distance = parseInt(seller.distance);
         if (seller.distance > 1000) {
         if (seller.distance > 1000) {
-          seller.distance = (seller.distance / 1000).toFixed(2) + '公里'
+          seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
         } else {
         } else {
-          seller.distance += '米';
+          seller.distance += 'm';
         }
         }
       }
       }
     })
     })

@@ -27,9 +27,13 @@
         <view class="seller" wx:for="{{markers}}" wx:key="sellers.key"
         <view class="seller" wx:for="{{markers}}" wx:key="sellers.key"
               bindtap="gotoDetail" data-sid="{{item.id}}">
               bindtap="gotoDetail" data-sid="{{item.id}}">
             <sb-tr seller="{{item}}"
             <sb-tr seller="{{item}}"
-                   hasActivityTags="{{true}}" sellerStyle="noborder"></sb-tr>
+                   hasActivityTags="{{false}}"
+                   hasActivityShort="{{true}}"
+                   hasBrand="true" hasActivityTese="true"
+                   hasSlogan="{{false}}"
+                   sellerStyle="noborder noshadow"></sb-tr>
         </view>
         </view>
-        <hr class="flex-vc nomore" wx:if="{{!hasMore}}">我是有底线的</hr>
+        <hr class="flex-vc nomore" wx:if="{{!hasMore}}" bgColor="#f5f5f5">我是有底线的</hr>
     </view>
     </view>
 </view>
 </view>
 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"

@@ -50,9 +50,11 @@
   background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
   background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
 }
 }
 
 
-
+page{
+  background-color: #F5F5F5;
+}
 .pages{
 .pages{
-  width: 90%;
+  width: 100%;
   margin: 81rpx auto 0;
   margin: 81rpx auto 0;
   color:#fff;
   color:#fff;
   font-size: 28rpx;
   font-size: 28rpx;
@@ -65,8 +67,7 @@
   background-color: #ffffff;
   background-color: #ffffff;
   border-radius: 6rpx;
   border-radius: 6rpx;
   overflow: hidden;
   overflow: hidden;
-  padding-bottom: 10rpx;
-  padding-top: 10rpx;
+  margin: 10rpx 0 20rpx;
 }
 }
 .nomore{
 .nomore{
   color: #999;
   color: #999;

@@ -45,7 +45,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 39,
+			"current": 52,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -436,10 +436,10 @@
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{
-					"id": -1,
+					"id": 52,
 					"name": "pages/reserve/indexList",
 					"name": "pages/reserve/indexList",
 					"pathName": "pages/reserve/indexList",
 					"pathName": "pages/reserve/indexList",
-					"query": "lat=34.21719&lng=108.89155&map={\"errMsg\":\"getMapRegion:ok\",\"southwest\":{\"longitude\":108.87545674591064,\"latitude\":34.204520114013846},\"northeast\":{\"longitude\":108.90764325408935,\"latitude\":34.229857981005225},\"scale\":15}&multiIndex=1&tags=1,2",
+					"query": "lat=34.21719&lng=108.89155&map={\"errMsg\":\"getMapRegion:ok\",\"southwest\":{\"longitude\":108.87545674591064,\"latitude\":34.204520114013846},\"northeast\":{\"longitude\":108.90764325408935,\"latitude\":34.229857981005225},\"scale\":15}&multiIndex=1&tags=",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{