diff --git a/images/popBac.png b/images/popBac.png
index 9b6ef66..bbf6714 100644
Binary files a/images/popBac.png and b/images/popBac.png differ
diff --git a/pages/center/orderdetail/orderdetail.wxml b/pages/center/orderdetail/orderdetail.wxml
index 4f88864..2bff73c 100644
--- a/pages/center/orderdetail/orderdetail.wxml
+++ b/pages/center/orderdetail/orderdetail.wxml
@@ -47,7 +47,7 @@
       </view>
       <view class="infomation">
         <view class="shoptitle">俱乐部电话</view>
-        <view>{{company.clubTel}}</view>
+        <view>{{company.clubPhone}}</view>
       </view>
     </view>
   </view>
diff --git a/pages/club/clubDetail/clubDetail.js b/pages/club/clubDetail/clubDetail.js
index e4c75e2..e7508f5 100644
--- a/pages/club/clubDetail/clubDetail.js
+++ b/pages/club/clubDetail/clubDetail.js
@@ -232,9 +232,11 @@ toactiveDetail:function(e){
     };
     re.request(Api.actjoining(), postData, header).then((res) => {
       let datas = res.data.data;
+
       that.setData({
         otheractive:datas
       })
+      console.log(">>",this.data.otheractive)
     })
   },
   getClubCoupon:function(){
diff --git a/pages/club/clubDetail/clubDetail.wxml b/pages/club/clubDetail/clubDetail.wxml
index 9113c94..4f5bc6e 100644
--- a/pages/club/clubDetail/clubDetail.wxml
+++ b/pages/club/clubDetail/clubDetail.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <view class="banner">
-    <image src="../../../images/logo.jpg"></image>
+    <image src="{{company.clubBgimg}}"></image>
   </view>
   <view class="circle">
     <view class="com-nav">
@@ -95,16 +95,16 @@
       报名中
     </view>
     <view class="other-circle" wx:if="{{otheractive.length>0}}">
-      <block wx:for="{{otheractive}}" wx:key="otheractive">
+      <block wx:for="{{otheractive}}" i wx:key="item">
         <view class="other-list"  bindtap="toactiveDetail" data-id="{{item.activityId}}">
           <view class="list-top">
             <view class="other-left">
-              <image src="{{item.img}}" mode='aspectFill'></image>
+              <image src="http://47.108.88.80:9000/files/{{item.activityLogo}}" mode='aspectFill'></image>
             </view>
             <view class="other-right">
-              <view class="other-name">{{item.intro}}</view>
-              <view class="other-time">{{item.time}}</view>
-              <view class="other-people">{{item.name}}</view>
+              <view class="other-name">{{item.activityName}}</view>
+              <view class="other-time">{{item.startRegisterTime}}至{{item.endRegisterTime}}</view>
+              <!-- <view class="other-people">{{item.activityName}}</view> -->
             </view>
           </view>
           <view class="numlist">
diff --git a/pages/index/order/order.js b/pages/index/order/order.js
index 67b5bf4..3cb2207 100644
--- a/pages/index/order/order.js
+++ b/pages/index/order/order.js
@@ -77,7 +77,14 @@ Page({
       "Content-Type": "application/x-www-form-urlencoded"
     };
     re.request(Api.getOrderDetail(), postData, header).then((res) => {
-      console.log(res)
+      
+      console.log(">>>",res)
+
+      // this.setData({
+      //   allTotal:res.data.
+      // })
+
+
     })
   },
   topay:function(){
diff --git a/pages/index/order/order.wxml b/pages/index/order/order.wxml
index 2b2cbf4..1f19a1a 100644
--- a/pages/index/order/order.wxml
+++ b/pages/index/order/order.wxml
@@ -1,8 +1,8 @@
 <view class="container">
-  <view class="nav">
+  <!-- <view class="nav">
     <view class="activetitle">【侗族侗年摄影】乐里侗年盛大活动-岜沙枪手部落-肇兴烟花夜景（全年仅此一批）</view>
     <view class="activetime">开始时间：2020-10-10 08:00 至 2020-10-10 17:00</view>
-  </view>
+  </view> -->
   <view class="top">
     <view class="other-top">
       <image src="../../../images/left.png"></image>
@@ -21,13 +21,13 @@
     <view class="total">
       总费用<text>￥{{allTotal}}</text>
     </view>
-    <view class="total">
+    <!-- <view class="total">
       现金优惠券<view>无可用<image src='../../../images/back.png'></image>
       </view>
     </view>
     <view class="total">
       实际应付<text>￥{{trueTotal}}</text>
-    </view>
+    </view> -->
   </view>
   <view class="top">
     <view class="other-top">
@@ -56,7 +56,7 @@
           </view>
         </view>
       </label> -->
-      <label class="radio-box">
+      <!-- <label class="radio-box">
         <view class="radiocircle">
           <view class="name">
             <image src="../../../images/cashpay.png"></image>钱包支付
@@ -65,7 +65,7 @@
             <radio value="3" />
           </view>
         </view>
-      </label>
+      </label> -->
     </radio-group>
   </view>
   <view class="agree">