From c2b96475d4f10f7d7d9d343bf05e55b2ed8e841c Mon Sep 17 00:00:00 2001
From: eternity <chenyoungcheng@163.com>
Date: Mon, 27 Jun 2022 23:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E6=8B=A8=E6=89=93=E4=BF=B1=E4=B9=90=E9=83=A8=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=85=A5=E4=BF=B1=E4=B9=90=E9=83=A8=E3=80=81?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E6=97=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/club/club.wxml                       |  8 +++----
 pages/club/clubgroups/clubgroups.js        |  8 +------
 pages/index/activeDetail/activeDetail.js   |  8 +++++++
 pages/index/activeDetail/activeDetail.wxml |  8 +++----
 pages/index/index.wxml                     | 28 +++++++++++-----------
 pages/index/index.wxss                     |  9 +++----
 pages/release/addactive/addactive.js       | 10 ++++----
 pages/release/addactive/addactive.wxml     |  6 ++---
 8 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/pages/club/club.wxml b/pages/club/club.wxml
index 38a6649..1d08856 100644
--- a/pages/club/club.wxml
+++ b/pages/club/club.wxml
@@ -10,7 +10,7 @@
         </view>
       </view>
     </view>
-    <view class="club">
+    <!-- <view class="club">
       <view class="club-title">推荐俱乐部</view>
       <view class="scrollArea">
         <scroll-view class="scroll-view" scroll-x="true">
@@ -43,12 +43,12 @@
         </block>
         </scroll-view>
       </view>
-    </view>
-    <view class="more" bindtap="toclub">
+    </view> -->
+    <!-- <view class="more" bindtap="toclub">
       <view class='more-left'></view>
       <view class="more-word">更多俱乐部</view>
       <view class="more-right"></view>
-    </view>
+    </view> -->
     <view class="ciecle">
       <view class="titlebig">
         <view class="navtop">
diff --git a/pages/club/clubgroups/clubgroups.js b/pages/club/clubgroups/clubgroups.js
index ed57b5f..ea71939 100644
--- a/pages/club/clubgroups/clubgroups.js
+++ b/pages/club/clubgroups/clubgroups.js
@@ -180,18 +180,12 @@ Page({
     re.request(Api.clubMember(), postData, header).then((res) => {
       let datas = res.data.data;
       console.log(datas);
-
-
-
-
-
-
       let obj = {}
       let newdatas = datas.reduce((x, item) => {
         obj[item.userId] ? "" : obj[item.userId] = true && x.push(item)
         return x
       }, [])
-
+console.log(newdatas)
       that.setData({
         personList: newdatas
       })
diff --git a/pages/index/activeDetail/activeDetail.js b/pages/index/activeDetail/activeDetail.js
index 38163d5..9bff1b0 100644
--- a/pages/index/activeDetail/activeDetail.js
+++ b/pages/index/activeDetail/activeDetail.js
@@ -152,6 +152,14 @@ tojion:function(){
       console.log(datas);
     })
   },
+  //打电话
+  phone: function(e){
+    wx.makePhoneCall({
+      phoneNumber: e.target.dataset.phonenumber,
+      success(){},
+      fail(){}
+    })
+  },
   getOtherActive:function(){
     var that = this;
     const imgUrl = wx.getStorageSync('imgUrl');
diff --git a/pages/index/activeDetail/activeDetail.wxml b/pages/index/activeDetail/activeDetail.wxml
index bbd7fd7..9dc2b41 100644
--- a/pages/index/activeDetail/activeDetail.wxml
+++ b/pages/index/activeDetail/activeDetail.wxml
@@ -66,10 +66,10 @@
       {{company.clubIntroduction}}
     </view>
     <view class="company-call">
-      <view>
+      <view bindtap="phone" data-phoneNumber="{{company.clubPhone}}">
         <image src="../../../images/call.png"></image>联系俱乐部
       </view>
-      <view wx:if="{{detail.isVerify==0}}" bindtap="toJoin">
+      <view wx:if="{{detail.isJoinClub==0}}" bindtap="toJoin">
         <image src="../../../images/add.png"></image>加入
       </view>
       <view wx:else>已加入</view>
@@ -133,10 +133,10 @@
         <image src="../../../images/share.png"></image>
         <view>分享</view>
       </button>
-      <button id="online" open-type="contact"  bindcontact="handleContact">
+      <!-- <button id="online" open-type="contact"  bindcontact="handleContact">
         <image src="../../../images/online.png"></image>
         <view>在线咨询</view>
-      </button>
+      </button> -->
     </view>
     <view class="bottom-right" bindtap="tojion" wx:if="{{detail.isJoin == 0}}">我要报名</view>
 	<view class="bottom-right" wx:if="{{detail.isJoin == 1}}">已报名</view>
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 54c5fea..48290aa 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -12,7 +12,7 @@
         </view>
       </view>
     </view>
-    <view class="banner">
+    <!-- <view class="banner">
       <view class="banner-box">
         <swiper display-multiple-items='1' autoplay="true" indicator-dots="true">
           <block wx:for="{{imgUrls}}" wx:key='lunbo'>
@@ -24,9 +24,9 @@
           </block>
         </swiper>
       </view>
-    </view>
+    </view> -->
   </view>
-  <view class="index-five">
+  <!-- <view class="index-five">
     <view class="five-list" data-id=""  bindtap="toTypeList">
         <image src='../../images/index_all.png' mode='aspectFill'></image>
         <view>全部</view>
@@ -37,8 +37,8 @@
         <view>{{item.typeName}}</view>
       </view>
     </block>
-  </view>
-  <view class="active" wx:if="{{twoImages.length>0}}">
+  </view> -->
+  <!-- <view class="active" wx:if="{{twoImages.length>0}}">
     <view class="active-title">
       <view class="name">精品活动推荐</view>
       <image src="/images/activeBac.png"></image>
@@ -49,11 +49,11 @@
     </view>
     </block>
 
-    <!-- <view class="ac-img">
+    <view class="ac-img">
       <image src="/images/logo.jpg" mode='aspectFill'></image>
-    </view> -->
-  </view>
-  <view class="active">
+    </view>
+  </view> -->
+  <!-- <view class="active">
     <view class="active-title">
       <view class="name">正在进行的活动</view>
       <image src="/images/activeBac.png"></image>
@@ -96,10 +96,10 @@
       <image src="/images/more.png"></image>
       查看更多
     </view>
-  </view>
+  </view> -->
   <view class="popularity">
-    <image src="/images/popBac.png" class="popimg"></image>
-    <view class="popview">
+    <!-- <image src="/images/popBac.png" class="popimg"></image> -->
+    <view class="popview" style="background:url('/images/popBac.png') no-repeat;background-size: cover;">
       <view class="poptitle">
         <view class="title-left">
         <image src="/images/popone.png" ></image>
@@ -141,7 +141,7 @@
       </view>
     </view>
   </view>
-  <view class="wonderful">
+  <!-- <view class="wonderful">
     <view class="wonder-name">
       <view class="wonderful-title">
         <view class="name">TA们在办精彩活动</view>
@@ -204,5 +204,5 @@
           </view>
         </block>
       </view>
-  </view>
+  </view> -->
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e8b67d8..0866712 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -4,7 +4,8 @@
   flex-direction: column;
   align-items: center;
 } */
-.nav{height:420rpx;width:100%;background: linear-gradient(to bottom,#FFCB12 0%,#ffffff 100%);}
+/* .nav{height:420rpx;width:100%;background: linear-gradient(to bottom,#FFCB12 0%,#ffffff 100%);} */
+.nav{width:100%;background: linear-gradient(to bottom,#FFCB12 0%,#ffffff 100%);}
 .search{height:64rpx;width:100%;padding:16rpx 0;}
 .search .search-box{width:94%;border-radius: 180rpx;background-color:#fff;height:100%;margin:0 auto;display:flex;justify-content: start;}
 .search .search-box .search-icon{width:70rpx;height:100%;}
@@ -44,11 +45,11 @@
 .four-word  .four-bottom{display: flex;justify-content: space-between;font-size:20rpx;color:#C9C9C9;height:40rpx;line-height:40rpx;}
 .four-word  .four-bottom text{font-size:24rpx;color:#F66A01;font-weight:bold;}
 .four-word  .four-bottom text text{font-size:18rpx;}
-.active .active-more{height:40rpx;line-height:40rpx;text-align: center;color:#FF7F0A;font-size:28rpx;}
+.active .active-more{height:40rpx;line-height:40rpx;text-align: center;color:#FF7F0A;font-size:28rpx}
 .active .active-more image{height:40rpx;width:40rpx;vertical-align: sub;}
 .popularity{width:94%;margin:30rpx auto;height:900rpx;border-radius:16rpx;position: relative;}
 .popularity .popimg{width:100%;height:100%;}
-.popularity .popview{position: absolute;top:0;left:0;width:100%;}
+.popularity .popview{position: absolute;top:0;left:0;width:100%;border-radius: 20rpx; }
 .popularity .popview .poptitle{height:60rpx;margin:20rpx auto; width:90%;display: flex;justify-content: space-between;}
 .popularity .popview .poptitle .title-left{height:60rpx;width:275rpx;position: relative;}
 .popularity .popview .poptitle .title-left image{height:100%;width:100%;}
@@ -87,6 +88,6 @@
 
   .wonderful .youlike-view{display: flex;justify-content: space-between;flex-wrap: wrap;margin:20rpx auto;width:90%}
   .index-three{
-    height:800rpx;
+    /* height:800rpx; */
     overflow-y: scroll;
   }
\ No newline at end of file
diff --git a/pages/release/addactive/addactive.js b/pages/release/addactive/addactive.js
index 08c91e4..ded01d0 100644
--- a/pages/release/addactive/addactive.js
+++ b/pages/release/addactive/addactive.js
@@ -13,7 +13,7 @@ Page({
     dateTime:'',
     dateTimeArray:'',
     startT:'',
-
+    isFree:1,
     dateTimeTwo:'',
     dateTimeArrayTwo:'',
     startTTwo:'',
@@ -611,8 +611,8 @@ uploadfront: function (e) {
       addrLat: that.data.addrLat,
       addrLon: that.data.addrLon,
       clubId: that.data.clubId,
-      isLimitSelect:that.data.isLimitSelect,
-      isHelpRegister:that.data.isHelpRegister,
+      isLimitSelect:that.data.isLimitSelect?that.data.isLimitSelect:-1,
+      isHelpRegister:that.data.isHelpRegister?that.data.isHelpRegister:-1,
       costReq: [],//费用信息列表
       coverFirstImage: that.data.showList[0] ? that.data.showList[0] : '',
       activityLogo: that.data.showListfront[0] ? that.data.showListfront[0] : '',
@@ -623,7 +623,7 @@ uploadfront: function (e) {
       createdTel:that.data.createdTel,
       isAppletNotify: '1',
       isCheck: that.data.isCheck,
-      isFree: that.data.isFree,
+      isFree: that.data.isFree?that.data.isFree:1,
       isLimit: that.data.isLimit,
       isJoin: that.data.isJoin,
       isShowRegister: that.data.isShowRegister,
@@ -654,7 +654,7 @@ uploadfront: function (e) {
       re.request(Api.createActive(), postData, header).then((res) => {
         console.log(res)
         wx.showToast({
-          title: '提交成功,等待审核',
+          title: '提交成功',
           icon: 'none',
           duration: 1500
         })
diff --git a/pages/release/addactive/addactive.wxml b/pages/release/addactive/addactive.wxml
index 4b9e5ee..6a9ad8a 100644
--- a/pages/release/addactive/addactive.wxml
+++ b/pages/release/addactive/addactive.wxml
@@ -144,12 +144,12 @@
       </view>
       <view class="formlist">
         <text>活动人数限制</text>
-        <input type="text" placeholder="请输入人数"  bindinput="peoplelimitInput"/>
+        <input type="text" placeholder="无限制"  bindinput="peoplelimitInput"/>
       </view>
-      <view class="formlist">
+      <!-- <view class="formlist">
         <text>报名可选择费用项数</text>
         <input type="text" placeholder="无限制"  bindinput="feeInput"/>
-      </view>
+      </view> -->
       <view class="formlist">
         <text>允许帮助他人报名次数</text>
         <input type="text" placeholder="无限制"  bindinput="helpInput"/>