From e1c537a35a81a62314f8bb39f65167768a298e83 Mon Sep 17 00:00:00 2001
From: "1913812@qq.com" <1913812q>
Date: Wed, 29 Jun 2022 14:17:40 +0800
Subject: [PATCH] =?UTF-8?q?2022-6-22=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

胡春雨
---
 pages/club/manage/manage.wxml              |  4 ++--
 pages/index/activeDetail/activeDetail.js   |  8 ++++++--
 pages/index/activeDetail/activeDetail.wxml | 10 +++++-----
 pages/index/join/join.wxml                 |  3 ++-
 pages/login.js                             |  4 +++-
 utils/common.js                            |  4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pages/club/manage/manage.wxml b/pages/club/manage/manage.wxml
index de90fb1..191d993 100644
--- a/pages/club/manage/manage.wxml
+++ b/pages/club/manage/manage.wxml
@@ -5,10 +5,10 @@
         <text>俱乐部名称</text>
         <input type="text" placeholder="请输入俱乐部名称" value="{{company.clubName}}" />
       </view>
-      <view class="formlist">
+      <!--<view class="formlist">
         <text>俱乐部ID</text>
         <view>{{company.clubId}}</view>
-      </view>
+      </view>-->
       <view class="formlistimg">
         <text>俱乐部logo</text>
         <view class="old" wx:if="{{old}}">
diff --git a/pages/index/activeDetail/activeDetail.js b/pages/index/activeDetail/activeDetail.js
index 9bff1b0..2e24bd7 100644
--- a/pages/index/activeDetail/activeDetail.js
+++ b/pages/index/activeDetail/activeDetail.js
@@ -49,7 +49,6 @@ tojion:function(){
       activeId:options.id,
     });
     that.getActiveDetail();
-    that.getOtherActive();
     that.addviews(options.id);
   },
   getActiveDetail:function(){
@@ -80,6 +79,7 @@ tojion:function(){
         content
       })
       this.getclubInfo(datas.clubId);
+      this.getOtherActive();
     })
   },
   Tomap:function(e){
@@ -119,6 +119,11 @@ tojion:function(){
       url: '../../club/clubDetail/clubDetail?id='+this.data.company.clubId,
     })
   },
+  otherJump: function(e){
+    wx.navigateTo({
+      url: 'activeDetail?id='+e.currentTarget.dataset.id
+    })
+  },
   getclubInfo:function(id){
     var that = this;
     const imgUrl = wx.getStorageSync('imgUrl');
@@ -173,7 +178,6 @@ tojion:function(){
     };
     re.request(Api.getOtherActive(), postData, header).then((res) => {
       let datas = res.data.data;
-      console.log(datas);
       for(let i=0;i<datas.length;i++){
         if(datas[i].activityLogo){
           datas[i].activityLogo = imgUrl + datas[i].activityLogo
diff --git a/pages/index/activeDetail/activeDetail.wxml b/pages/index/activeDetail/activeDetail.wxml
index 9dc2b41..70a49b0 100644
--- a/pages/index/activeDetail/activeDetail.wxml
+++ b/pages/index/activeDetail/activeDetail.wxml
@@ -113,14 +113,14 @@
     </view>
     <view class="other-circle" wx:if="{{otheractive.length>0}}">
       <block wx:for="{{otheractive}}" wx:key="otheractive">
-        <view class="other-list">
+        <view class="other-list" bindtap="otherJump" data-id="{{item.activityId}}">
           <view class="other-left">
-            <image src="{{item.img}}" mode='aspectFill'></image>
+            <image src="{{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"><text>报名：{{item.people}}人</text></view>
+            <view class="other-name">{{item.activityName}}</view>
+            <view class="other-time">{{item.startRegisterTime+'至'+item.endRegisterTime}}</view>
+            <view class="other-people"><text>报名：{{item.totalRegister}}人</text></view>
           </view>
         </view>
       </block>
diff --git a/pages/index/join/join.wxml b/pages/index/join/join.wxml
index 159f8de..5397d57 100644
--- a/pages/index/join/join.wxml
+++ b/pages/index/join/join.wxml
@@ -19,7 +19,8 @@
               <view class="name">{{item.nickname}}<text wx:if="{{item.help==1}}">{{item.helpname}}帮报名</text></view>
               <view class="time">{{item.createdTime}}</view>
             </view>
-            <view class="right-bottom">选择费用项</view>
+            <!--<view class="right-bottom">选择费用项</view>-->
+			<view class="right-bottom">{{item.registerTime}}</view>
           </view>
         </view>
       </block>
diff --git a/pages/login.js b/pages/login.js
index 75b3030..7e92efb 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -22,7 +22,9 @@ Page({
           //     console.log(res.userInfo)
           //   }
           // })
-        }
+        }else{
+			
+		}
       }
     })
   },
diff --git a/utils/common.js b/utils/common.js
index 8f5eeee..b2ba6f6 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1,7 +1,7 @@
 //  var HOST_URI = 'http://192.168.0.109:8088';
 //  var HOST_URI = 'http://192.168.0.104:8088'; 
- var HOST_URI = 'https://api.tuleduo.cn';
-// var HOST_URI = 'http://127.0.0.1:8088';
+ //var HOST_URI = 'https://api.tuleduo.cn';
+var HOST_URI = 'http://127.0.0.1:8088';