diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index fc2b34d..4157b99 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -20,6 +20,7 @@ Page({
     countDownMinute: 0,
     countDownSecond: 0, 
     memberList:[],
+    activityDetail:{},
   },
 
   /**
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index fb21f50..4900a19 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -1,29 +1,29 @@
 <import src="../../wxParse/wxParse.wxml" />
 <view class="content">
   <scroll-view scroll-x="{{false}}" scroll-y="{{true}}">
-    <image src="{{bannerImage}}" class="slide-image" mode='widthFix' />
+    <image src="{{activityDetail.showUrl}}" class="slide-image" mode='widthFix' />
     <view class='activity_info'>
-      <text class='title'>家政节大作战</text>
+      <text class='title'>{{activityDetail.activityName}}</text>
       <view class="row">
-        <text class="num">20人团</text>
-        <text class="limit_type">新老用户均可参团</text>
+        <text class="num">{{activityDetail.limitNum}}人团</text>
+        <text class="limit_type">{{activityDetail.typeDesc}}</text>
       </view>
       <view class="row" style='padding-top: 10rpx;'>
         <text class="sucess_tip">拼团成功人均获得一张</text>
-        <text class="sucess_card">高端保洁铂金月卡</text>
+        <text class="sucess_card">{{activityDetail.goodsName}}</text>
       </view>
       <view class="price_row">
         <view style='float: left;'>
           <text class="common666">原价：</text>
-          <text class="common666">200元</text>
+          <text class="common666del">{{activityDetail.originalPrice}}元</text>
         </view>
         <view style='float: left;'>
           <text class="common666">团长价：</text>
-          <text class="commonRed">499</text>
+          <text class="commonRed">{{activityDetail.originatorPrice}}</text>
         </view>
         <view style='float: left;'>
           <text class="common666">团员价：</text>
-          <text class="commonRed">499</text>
+          <text class="commonRed">{{activityDetail.participantPrice}}</text>
         </view>
       </view>
     </view>
diff --git a/pages/activity_detail/activity_detail.wxss b/pages/activity_detail/activity_detail.wxss
index dbd5470..0a53ec0 100644
--- a/pages/activity_detail/activity_detail.wxss
+++ b/pages/activity_detail/activity_detail.wxss
@@ -71,7 +71,11 @@ image{
 .common666{
   color: #999;
   font-size: 24rpx; 
-  
+}
+.common666del{
+  color: #999;
+  font-size: 24rpx; 
+  text-decoration: line-through;
 }
 
 .commonRed{
diff --git a/pages/index/index.js b/pages/index/index.js
index 8cd1ec5..d845f64 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -15,7 +15,8 @@ Page({
     menu_list:[
       { name: '拼团', disabled:false, className:'green_button'},
       { name: '秒杀', disabled: true, className: 'gray_button' },
-      { name: '夺宝', disabled: true, className: 'gray_button' }
+      { name: '夺宝', disabled: true, className: 'gray_button' },
+      { name: '砍价', disabled: true, className: 'gray_button' }
     ],
     nowDate: new Date().getTime(),
     cityId: 440100000,
@@ -77,6 +78,7 @@ Page({
       url: app.gw.hostUrl + '/mall/wxa/activity/list',
       method: 'get',
       data: {
+        merchantNo: 2,
         pageNum: that.data.pageNum,
         pageSize: that.data.pageSize
       },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 027f908..28766e1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -14,10 +14,12 @@
       </view>
     </view>
   </view>
-   <view wx:for-items="{{activityList}}">
+  <view wx:for-items="{{activityList}}">
     <view class='activity_list_view' bindtap='loading' data-item='{{item.goodsNo}}'>
-      <image src='{{item.showUrl}}' class='image'></image>
-      <!-- <text class="num">20人团</text> -->
+      <view class='view'>
+        <image src='{{item.showUrl}}' class='image'></image>
+        <text class="num">{{item.limitNum}}人团</text>
+      </view>
       <text class="p1">{{item.activityName}}</text>
       <view class="p3">
         <view class='p2'>¥</view>{{item.participantPrice / 100}}
@@ -25,5 +27,5 @@
       </view>
       <button class='openBtn' form-type="submit">去开团</button>
     </view>
-  </view> 
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7f5699d..beb2bf8 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -49,23 +49,32 @@ image{
   border-radius: 10rpx;
   text-align:center;
 }
-.activity_list_view .image{
+.activity_list_view .view{
+  height: 350rpx;
+  width: 100%;
+  display: inline-block;
+  position: relative;
+}
+
+.activity_list_view .view .image{
   height: 350rpx;
   border-radius: 10rpx 10rpx 0 0;
 }
 
-.activity_list_view .num{
-  padding: 5rpx 20rpx;
-  font-size: 20rpx;
-  width:150px;
-  height:36px;
+.activity_list_view .view .num{
+  display: block;
+  padding: 1rpx 4rpx;
+  font-size: 16rpx;
+  width:36px;
+  line-height: 15px;
   background:rgba(255,160,67,1);
-  border-radius: 0rpx 10rpx 0 10rpx;
+  border-radius: 0 10rpx 0 10rpx ;
+  margin-left: 26rpx;
   text-align: center;
   color: white;
-  position: relative;
-  margin-right: 10px;
-  margin-top: 0px;
+  position: absolute;
+  top: 0px;
+  right: 0px;
 }
 .activity_list_view .p1{
   font-size: 40rpx;