C端调整

@@ -5,7 +5,10 @@ Component({
    * 组件的属性列表
    * 组件的属性列表
    */
    */
   properties: {
   properties: {
-
+    map:{
+      type:Object,
+      value:{},
+    }
   },
   },
 
 
   /**
   /**
@@ -47,7 +50,7 @@ Component({
     },
     },
     gotoDiscount(){
     gotoDiscount(){
       wx.navigateTo({
       wx.navigateTo({
-        url:'./discount',
+        url:util.http_build_query(this.data.map,'./discount'),
       })
       })
     },
     },
   }
   }

@@ -313,7 +313,7 @@
 .discount .discount-text{
 .discount .discount-text{
   background-image: url("http://qn.colorcun.com/reserve/images/%E4%B8%AD%E9%97%B4.jpg");
   background-image: url("http://qn.colorcun.com/reserve/images/%E4%B8%AD%E9%97%B4.jpg");
   height: 40rpx;
   height: 40rpx;
-  min-width: 100rpx;
+  min-width: 60rpx;
   background-size: 100% 100%;
   background-size: 100% 100%;
   line-height: 40rpx;
   line-height: 40rpx;
   color:#F8E6C4;
   color:#F8E6C4;

@@ -17,7 +17,10 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
+  options:null,
   onLoad: function (options) {
   onLoad: function (options) {
+    //latitude=34.215637&longitude=108.891264&scale=16&height=397
+    this.options=options
     PubSub.on(
     PubSub.on(
       'follow',
       'follow',
       data=>{
       data=>{
@@ -101,12 +104,14 @@ Page({
   size:10,
   size:10,
   hasMore:true,
   hasMore:true,
   GetCollectionSellerList(){
   GetCollectionSellerList(){
-    App.Customer.GetCollectionSellerList({
-      openid:getApp().openid,
-      lat:this.location.latitude,
-      lng:this.location.longitude,
+    App.Customer.GetActivitySellerList({
+      lat:this.options.latitude,
+      lng:this.options.longitude,
       offset:this.offset,
       offset:this.offset,
       size:this.size,
       size:this.size,
+      distance:50,
+      lat_extend:this.location.latitude,
+      lng_extend:this.location.longitude,
     }).then(res=>{
     }).then(res=>{
       let sellers=res.data;
       let sellers=res.data;
       let sellersLength=sellers.length;
       let sellersLength=sellers.length;

@@ -38,6 +38,7 @@ Page({
     hasSuggestion:false,
     hasSuggestion:false,
     current:0,
     current:0,
     hasSellers:false,
     hasSellers:false,
+    hasSetActivity:false,
   },
   },
   hasSellerConcat:hasSellerConcat,
   hasSellerConcat:hasSellerConcat,
   transverseViewHeight:transverseViewHeight,//横向滚动高度,苹果要比安卓多20
   transverseViewHeight:transverseViewHeight,//横向滚动高度,苹果要比安卓多20
@@ -467,6 +468,7 @@ Page({
           }, true)
           }, true)
         }, 100)
         }, 100)
       }
       }
+      this.IsSetActivity();
     })
     })
 
 
   },
   },
@@ -557,10 +559,12 @@ Page({
       url:'/pages/reserve/detail?id='+util.attr(e,'sid')
       url:'/pages/reserve/detail?id='+util.attr(e,'sid')
     })
     })
   },
   },
-  a2lshow(){
-    //wx.hideTabBar();
-  },
-  a2lhide(){
-    //wx.showTabBar();
+  IsSetActivity(){
+    let cmap=this.data.map;
+    App.Customer.IsSetActivity({lat:cmap.latitude,lng:cmap.longitude,distance:50}).then(res=>{
+      this.setData({
+        hasSetActivity:res.data==1,
+      })
+    })
   },
   },
 })
 })

@@ -68,4 +68,4 @@
 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
 <cover-view class="tab-patch"></cover-view>
 <cover-view class="tab-patch"></cover-view>
 <a2l bindshow="a2lshow" bindhide="a2lhide"></a2l>
 <a2l bindshow="a2lshow" bindhide="a2lhide"></a2l>
-<ds></ds>
+<ds wx:if="{{hasSetActivity}}" map="{{map}}"></ds>

@@ -232,6 +232,11 @@ export default {
   'App.Invitation.InvitationList':{
   'App.Invitation.InvitationList':{
     openid:'openid',
     openid:'openid',
   },
   },
+  //该区域是否有商家活动  0/1   无/有
+  'App.Customer.IsSetActivity':null,
+
+  //商家活动列表
+  'App.Customer.GetActivitySellerList':null,
 
 
   //上传图片,只能上传单个图片文件
   //上传图片,只能上传单个图片文件
   'App.Examples_Upload.UploadQn':null,
   'App.Examples_Upload.UploadQn':null,