blue ui other

 <!--components/2.0/taocan/lists.wxml-->
 <!--components/2.0/taocan/lists.wxml-->
-<block wx:if="{{lists.length>0}}">
+<view wx:if="{{lists.length>0}}" class="margin-top-sm">
     <view class="view padding-lg bg-white padding-bottom-sm text-black">
     <view class="view padding-lg bg-white padding-bottom-sm text-black">
         <view class="view text-bold text-xxl margin-bottom">超值套餐</view>
         <view class="view text-bold text-xxl margin-bottom">超值套餐</view>
         <block wx:for="{{lists}}" wx:key="lists">
         <block wx:for="{{lists}}" wx:key="lists">
@@ -10,4 +10,4 @@
         <view class="view txt-28-h margin-right-sm">{{rowLimit==9999?'收起':'展开更多'}}</view>
         <view class="view txt-28-h margin-right-sm">{{rowLimit==9999?'收起':'展开更多'}}</view>
         <view class="view icon"></view>
         <view class="view icon"></view>
     </view>
     </view>
-</block>
+</view>

@@ -3,22 +3,8 @@
   "navigationBarTextStyle": "white",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText":"周到安排",
   "navigationBarTitleText":"周到安排",
   "usingComponents": {
   "usingComponents": {
-    "formids":"/components/formids/formids",
-    "userinfo":"/components/userinfo/userinfo",
-    "userinfo-share":"/components/userinfo/share",
-    "stat":"/components/stat/stat",
-    "as-phone":"/components/actionSheet/phone",
     "nav":"/components/nav/nav",
     "nav":"/components/nav/nav",
-
     "share":"/components/reserve/share/share",
     "share":"/components/reserve/share/share",
-    "people":"/components/reserve/people/people",
-    "dur":"/components/reserve/dur/dur",
-    "calendar":"/components/reserve/week-calendar/week-calendar",
-    "activity-tips":"/components/activity/tips",
-    "section":"/components/reserve/section/section",
-    "select-room":"/components/reserve/select-room/select-room",
-
-
     "taocan":"/components/2.0/taocan/lists",
     "taocan":"/components/2.0/taocan/lists",
     "plcard":"/components/2.0/pinglun/card",
     "plcard":"/components/2.0/pinglun/card",
     "getpos":"/components/2.0/userinfo/getpos",
     "getpos":"/components/2.0/userinfo/getpos",

@@ -72,7 +72,7 @@
             </view>
             </view>
         </view>
         </view>
     </view>
     </view>
-    <view class="padding-lg bg-white text-black margin-top-sm">
+    <view class="padding-lg bg-white text-black margin-top-sm" wx:if="{{activityStr || seller.card_info.length>0}}">
         <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
         <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
             <view class="activity-view-easy flex-lr">
             <view class="activity-view-easy flex-lr">
                 <view class="activity-left flex-ll">
                 <view class="activity-left flex-ll">
@@ -121,7 +121,7 @@
             </block>
             </block>
         </scroll-view>
         </scroll-view>
     </view>
     </view>
-
+    <taocan sid="{{seller.id}}" wx:if="{{seller.id}}"></taocan>
     <view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.dishes.length>0}}">
     <view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.dishes.length>0}}">
         <view class="view padding-left-lg text-bold txt-40-h margin-bottom">推荐菜品</view>
         <view class="view padding-left-lg text-bold txt-40-h margin-bottom">推荐菜品</view>
         <scroll-view class="text-cut margin-bottom-sm"
         <scroll-view class="text-cut margin-bottom-sm"

@@ -601,7 +601,7 @@
         {
         {
           "name": "pages/reserve/detail",
           "name": "pages/reserve/detail",
           "pathName": "pages/reserve/detail",
           "pathName": "pages/reserve/detail",
-          "query": "id=1001&_activeTab=reserve&_date=2020-02-16&_pnum=6",
+          "query": "id=1&_activeTab=reserve&_date=2020-02-16&_pnum=6",
           "scene": null
           "scene": null
         },
         },
         {
         {