C端调整

@@ -25,11 +25,13 @@ Component({
       this.setData({
       this.setData({
         display:false,
         display:false,
       })
       })
+      this.triggerEvent('hide')
     },
     },
     show(){
     show(){
       this.setData({
       this.setData({
         display:true,
         display:true,
       })
       })
+      this.triggerEvent('show')
     },
     },
   }
   }
 })
 })

@@ -64,9 +64,10 @@
   font-size: 24rpx;
   font-size: 24rpx;
   height: 34rpx;
   height: 34rpx;
   line-height: 34rpx;
   line-height: 34rpx;
+  margin-top: 12rpx;
 }
 }
 .item .block{
 .item .block{
-  height: 74rpx;
+  height: 52rpx;
   align-items: flex-end;
   align-items: flex-end;
 }
 }
 .item .min-font{
 .item .min-font{

@@ -11,6 +11,7 @@ Page({
   data: {
   data: {
     seller:{},
     seller:{},
     IsCollectionSeller:false,
     IsCollectionSeller:false,
+    pagesHeight:'auto'
   },
   },
 
 
   /**
   /**
@@ -193,4 +194,14 @@ Page({
   showDiscount(){
   showDiscount(){
     this.selectComponent('#discount').show()
     this.selectComponent('#discount').show()
   },
   },
+  discountHide(){
+    this.setData({
+      pagesHeight:'auto'
+    })
+  },
+  discountShow(){
+    this.setData({
+      pagesHeight:'600rpx'
+    })
+  }
 })
 })

@@ -14,7 +14,7 @@
         </block>
         </block>
     </swiper>
     </swiper>
 </view>
 </view>
-<view class="pages">
+<view class="pages" style="height: {{pagesHeight}};">
     <view class="seller">
     <view class="seller">
         <view class="base flex-vc">
         <view class="base flex-vc">
             <view class="name">{{seller.sellername}}</view>
             <view class="name">{{seller.sellername}}</view>
@@ -48,7 +48,9 @@
                         <view class="activity-left">
                         <view class="activity-left">
                             <view class="activity-first flex-ll" style="align-items: flex-start">
                             <view class="activity-first flex-ll" style="align-items: flex-start">
                                 <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
                                 <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
-                                <view class="flex-cc discount" wx:for="{{seller.activity}}" wx:if="{{index<2}}">
+                                <view class="flex-cc discount" wx:for="{{seller.activity}}"
+                                      wx:key="seller.activity.key"
+                                      wx:if="{{index<2}}">
                                     <view class="discount-left"></view>
                                     <view class="discount-left"></view>
                                     <view class="discount-text">{{item.title}}</view>
                                     <view class="discount-text">{{item.title}}</view>
                                     <view class="discount-right"></view>
                                     <view class="discount-right"></view>
@@ -146,4 +148,4 @@
 </view>
 </view>
 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预定</as>
 <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预定</as>
 <getpos bindpos="onpos" id="getpos"></getpos>
 <getpos bindpos="onpos" id="getpos"></getpos>
-<discount id="discount" seller="{{seller}}"></discount>
+<discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>

@@ -5,6 +5,7 @@
   font-size: 30rpx;
   font-size: 30rpx;
   color:#353535;
   color:#353535;
   padding-bottom: 200rpx;
   padding-bottom: 200rpx;
+  overflow: hidden;
 }
 }
 .seller-banner{
 .seller-banner{
   width: 100%;
   width: 100%;

@@ -2,8 +2,6 @@
 import util from '../../utils/util';
 import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
-import PubSub from '../../utils/PubSub'
-import reddot from '../../utils/reddot';
 Page({
 Page({
 
 
   /**
   /**
@@ -21,14 +19,6 @@ Page({
   onLoad: function (options) {
   onLoad: function (options) {
     //latitude=34.215637&longitude=108.891264&scale=16&height=397
     //latitude=34.215637&longitude=108.891264&scale=16&height=397
     this.options=options
     this.options=options
-    PubSub.on(
-      'follow',
-      data=>{
-        console.log('follow.msg',data)
-        this.formatSellers(data);
-      }
-    )
-    reddot.init()
   },
   },
   formatSellers(data){
   formatSellers(data){
     let sellers=[];
     let sellers=[];

@@ -5,7 +5,7 @@ import App from '../../utils/api';
 import DA from './data';
 import DA from './data';
 import reddot from '../../utils/reddot';
 import reddot from '../../utils/reddot';
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
-const mapScale=16//18;
+const mapScale=14//18;
 const transverseViewHeight=202;
 const transverseViewHeight=202;
 const renNum=function(){
 const renNum=function(){
   let arr=[]
   let arr=[]
@@ -38,6 +38,7 @@ Page({
     hasSuggestion:false,
     hasSuggestion:false,
     current:0,
     current:0,
     hasSellers:false,
     hasSellers:false,
+    hasGetSellersEnd:false,
     hasSetActivity:false,
     hasSetActivity:false,
   },
   },
   hasSellerConcat:hasSellerConcat,
   hasSellerConcat:hasSellerConcat,
@@ -447,7 +448,8 @@ Page({
       }
       }
       this.sellersNow=now_sid;
       this.sellersNow=now_sid;
       let obj={
       let obj={
-        hasSellers:now_sid.length>0
+        hasSellers:now_sid.length>0,
+        hasGetSellersEnd:true
       }
       }
       if(this.hasSellerConcat){
       if(this.hasSellerConcat){
         obj.markers=this.data.markers.concat(markers);
         obj.markers=this.data.markers.concat(markers);

@@ -58,6 +58,7 @@
                     </swiper-item>
                     </swiper-item>
                 </block>
                 </block>
             </swiper>
             </swiper>
+            <view class="empty-txt flex-vc">{{hasGetSellersEnd?'附近无可订餐厅，建议切换其他区域查看':''}}</view>
         </view>
         </view>
     </view>
     </view>
 </view>
 </view>

@@ -106,4 +106,9 @@
   line-height: 60rpx;
   line-height: 60rpx;
   height: 60rpx;
   height: 60rpx;
   overflow: hidden;
   overflow: hidden;
+}
+.empty-txt{
+  height: 300rpx;
+  line-height: 300rpx;
+  font-size: 34rpx;
 }
 }