From 73e46c000ec0389e72a2c5afd7b986e82564e147 Mon Sep 17 00:00:00 2001
From: imax <373170631@qq.com>
Date: Thu, 7 Jul 2022 23:50:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/cash/cash.js                 | 17 ++++++++-----
 pages/center/cash/cash.wxml               |  2 +-
 pages/center/cashlist/cashlist.js         | 28 ++++++++++++++++++----
 pages/center/center.js                    |  4 ++--
 pages/center/center.wxml                  |  4 ++--
 pages/center/order/order.js               |  4 ++--
 pages/center/orderdetail/orderdetail.js   | 29 +++++++++++++++++++----
 pages/center/orderdetail/orderdetail.wxml | 11 ++++++++-
 pages/center/orderdetail/orderdetail.wxss | 10 ++++++--
 pages/club/club.js                        | 12 ++++++++--
 pages/club/club.wxml                      |  2 +-
 pages/club/clubDetail/clubDetail.js       |  4 ++--
 pages/club/manage/manage.js               |  1 +
 pages/club/manage/manage.wxml             |  4 ++--
 pages/message/message.wxml                |  2 +-
 utils/common.js                           | 10 +++++++-
 16 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/pages/center/cash/cash.js b/pages/center/cash/cash.js
index a3f8ee1..76f1da3 100644
--- a/pages/center/cash/cash.js
+++ b/pages/center/cash/cash.js
@@ -34,16 +34,21 @@ Page({
     re.request(Api.getcash(), postData, header).then((res) => {
       let datas = res.data.data;
       console.log(datas)
-      wx.showToast({
-        title: '操作成功，等待审核',
-        icon: 'none'
-      })
-    })
+      if(res.code === 0){
+        wx.showToast({
+          title: '操作成功，等待审核',
+          icon: 'none'
+        });
+        setTimeout(() => wx.navigateBack({
+          delta: 1,
+        }), 1000);
+      }
+    });
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function (options) {console.log(options)
     this.setData({
       mon:options.mon
     })
diff --git a/pages/center/cash/cash.wxml b/pages/center/cash/cash.wxml
index 44d0171..1ebc302 100644
--- a/pages/center/cash/cash.wxml
+++ b/pages/center/cash/cash.wxml
@@ -7,7 +7,7 @@
     </view>
     <view class="cashmoney">
       <view class="money">提现金额</view>
-      <view class="inputbox"><input placeholder="可提现金额{{mon}}" bindinput="markInput"/></view>
+      <view class="inputbox"><input type="number" placeholder="可提现金额{{mon}}" bindinput="markInput"/></view>
     </view>
     <view class="text">每天一次，单笔最高3万元。</view>
     <view class="yescash" bindtap="getcash">确认提现</view>
diff --git a/pages/center/cashlist/cashlist.js b/pages/center/cashlist/cashlist.js
index 7c9e322..d05d963 100644
--- a/pages/center/cashlist/cashlist.js
+++ b/pages/center/cashlist/cashlist.js
@@ -1,4 +1,6 @@
 // pages/center/cashlist/cashlist.js
+var Api = require('../../../utils/common.js');
+var re = require('../../../utils/request.js');
 Page({
 
   /**
@@ -6,10 +8,10 @@ Page({
    */
   data: {
     cashlist:[
-      {money:'655',time:'2020-12-10 12:00:00',status:'1'},
-      {money:'655',time:'2020-12-10 12:00:00',status:'2'},
-      {money:'655',time:'2020-12-10 12:00:00',status:'3'},
-      {money:'655',time:'2020-12-10 12:00:00',status:'1'},
+      // {money:'655',time:'2020-12-10 12:00:00',status:'1'},
+      // {money:'655',time:'2020-12-10 12:00:00',status:'2'},
+      // {money:'655',time:'2020-12-10 12:00:00',status:'3'},
+      // {money:'655',time:'2020-12-10 12:00:00',status:'1'},
     ]
   },
 
@@ -17,7 +19,25 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.getCashList();
+  },
 
+  getCashList(){
+    var that = this;
+    var header = {
+      token:wx.getStorageSync('token'),
+      "Content-Type": "application/x-www-form-urlencoded"
+    };
+    var postData = {
+      
+    };
+    re.request(Api.cashList(), postData, header).then((res) => {
+      let datas = res.data.data;
+      console.log(datas)
+     this.setData({
+      cashlist: res.data
+     });
+    })
   },
 
   /**
diff --git a/pages/center/center.js b/pages/center/center.js
index 5e6ac3c..07e15e3 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -14,9 +14,9 @@ Page({
     quan:{nouse:0,userd:0,pass:0}
   },
   tocash:function(){
-    var that = this;
+    var that = this;//console.log('mm:',that.data.mymoney)
     wx.navigateTo({
-      url: './cash/cash?mon='+that.data.mymoney.moneyCash+''
+      url: './cash/cash?mon='+that.data.mymoney.moneyCash
     })
   },
   toorder:function(){
diff --git a/pages/center/center.wxml b/pages/center/center.wxml
index ab5079e..c9ac8d7 100644
--- a/pages/center/center.wxml
+++ b/pages/center/center.wxml
@@ -94,12 +94,12 @@
     </view>
    <image src="../../images/back.png" class="right"></image>
   </view> -->
-  <button open-type="contact" session-from="weapp">
+  <!-- <button open-type="contact" session-from="weapp">
     <view class="call">
       <image src="../../images/myhost.png"></image>
       我的客服
       <image src="../../images/back.png"></image>
     </view>
-  </button>
+  </button> -->
 </view>
 </view>
\ No newline at end of file
diff --git a/pages/center/order/order.js b/pages/center/order/order.js
index f5b1f86..e590665 100644
--- a/pages/center/order/order.js
+++ b/pages/center/order/order.js
@@ -25,7 +25,7 @@ Page({
     let date = new Date(d);
     let result = format.replace('yyyy', date.getFullYear());
     result = result.replace('MM', fnumber(date.getMonth() + 1));
-    result = result.replace('dd', fnumber(date.getDay()));
+    result = result.replace('dd', fnumber(date.getDate()));
     result = result.replace('HH', fnumber(date.getHours()));
     result = result.replace('mm', fnumber(date.getMinutes()));
     result = result.replace('ss', fnumber(date.getSeconds()));
@@ -79,7 +79,7 @@ Page({
   getOrderList: function () {
     var that = this;
     let postData = {
-      orderStatus:that.data.status,
+      orderStatus:2,//that.data.status,
       pageSize: 5,
       pageNum: that.data.page
     };
diff --git a/pages/center/orderdetail/orderdetail.js b/pages/center/orderdetail/orderdetail.js
index 69b1e7e..f366f2a 100644
--- a/pages/center/orderdetail/orderdetail.js
+++ b/pages/center/orderdetail/orderdetail.js
@@ -13,7 +13,8 @@ Page({
     array: ['微信支付','线下支付'],
     index:'',
     payType:'1',
-    company:''
+    company:'',
+    groups:[]
   },
   /**
    * 生命周期函数--监听页面加载
@@ -31,6 +32,23 @@ Page({
     })
     that.getOrderDetail(options.id)
   },
+  getPeople(id){
+    var that = this;
+    var postData = {
+      orderSerial:id,
+    };
+    var header = {
+      token: wx.getStorageSync('token'),
+      "Content-Type": "application/x-www-form-urlencoded"
+    };
+    re.request(Api.getOrderPeople(), postData, header).then((res) => {
+      // console.log('==>',res)
+      that.setData({
+        groups: res.data.data
+      });
+      //this.getOrderDetail(res.data.data[0].orderId);
+    })
+  },
   getOrderDetail:function(id){
     var that = this;
     var postData = {
@@ -42,10 +60,10 @@ Page({
     };
     re.request(Api.getOrderDetailSer(), postData, header).then((res) => {
       console.log(res.data.data)
-      that.getactiveInfo(res.data.data)
+      that.getactiveInfo(res.data.data, id)
     })
   },
-  getactiveInfo:function(val){
+  getactiveInfo:function(val,id){
     var that = this;
     const imgUrl = wx.getStorageSync('imgUrl')
     var header = {
@@ -65,6 +83,8 @@ Page({
       datas.cost = val.cost;
       datas.createdTime = val.createdTime;
       datas.orderId = val.orderId;
+      datas.people = val.totalRegister;
+      datas.payType = val.payType;
 
       datas.startRegisterTime = that.timeFormat(datas.startRegisterTime, 'yyyy-MM-dd HH:mm');
       datas.endRegisterTime = that.timeFormat(datas.endRegisterTime, 'yyyy-MM-dd HH:mm');
@@ -74,6 +94,7 @@ Page({
         val:datas
       })
       that.getClubInfo(datas.clubId);
+      that.getPeople(id);
     })
   },
   timeFormat(d, format = 'yyyy-MM-dd HH:mm:ss'){
@@ -81,7 +102,7 @@ Page({
     let date = new Date(d);
     let result = format.replace('yyyy', date.getFullYear());
     result = result.replace('MM', fnumber(date.getMonth() + 1));
-    result = result.replace('dd', fnumber(date.getDay()));
+    result = result.replace('dd', fnumber(date.getDate()));
     result = result.replace('HH', fnumber(date.getHours()));
     result = result.replace('mm', fnumber(date.getMinutes()));
     result = result.replace('ss', fnumber(date.getSeconds()));
diff --git a/pages/center/orderdetail/orderdetail.wxml b/pages/center/orderdetail/orderdetail.wxml
index 2bff73c..4ffa7fe 100644
--- a/pages/center/orderdetail/orderdetail.wxml
+++ b/pages/center/orderdetail/orderdetail.wxml
@@ -25,6 +25,15 @@
       </view>
     </view>
   </view>
+  <view class="navCircle">
+    <view class="navtitle bigtitle">报名成员</view>
+    <block wx:for="{{groups}}" wx:key="groups">
+      <view class="list">
+        <view class="name">{{item.realname || ''}}-{{item.phone || ''}}</view>
+        <view class="price">费用项目<text>￥{{item.realCost || '0'}}</text></view>
+      </view>
+    </block>
+  </view>
   <view class="navCircle">
     <view class="navtitle bigtitle">时间信息</view>
     <view class="contentCircle">
@@ -51,7 +60,7 @@
       </view>
     </view>
   </view>
-  <view class="footer">
+  <view class="footer" wx:if="{{company.payType == '0'}}">
     <view bindtap="topick">去支付</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/center/orderdetail/orderdetail.wxss b/pages/center/orderdetail/orderdetail.wxss
index 47b934d..3c4b351 100644
--- a/pages/center/orderdetail/orderdetail.wxss
+++ b/pages/center/orderdetail/orderdetail.wxss
@@ -10,7 +10,7 @@ page{background: #EDEDED;}
 .carList .carImg{width:35%;height:100%;float:left;}
 .carList .carImg image{width:100%;height:100%}
 .carList .carInfo{width:63%;float:left;margin-left:2%;}
-.carList .carInfo .carName{line-height:60rpx;width:100%;height:60rpx;font-size:28rpx;}
+.carList .carInfo .carName{width:100%;line-height:60rpx;height:60rpx;font-size:28rpx;overflow: hidden;}
 .carList .carInfo .carIntro{line-height:30rpx;width:100%;height:90rpx;font-size:22rpx;color:#807D7D;}
 .carList .carInfo .carPrice{line-height:60rpx;width:100%;height:60rpx;font-size:24rpx;color:#E60303;}
 .carList .carInfo .carChange{line-height:50rpx;width:100%;height:50rpx;font-size:24rpx;color:#8C8989;display:flex;justify-content: space-between;}
@@ -18,4 +18,10 @@ page{background: #EDEDED;}
 .infomation{line-height:60rpx;font-size:28rpx;}
 /* height:60rpx; display: flex;justify-content: space-between; */
 .infomation .shoptitle{color:#807373}
-.footer{width:94%;height:96rpx;line-height:96rpx;text-align: center;background:#F66A01;color:#fff;margin:34rpx auto;border-radius:16rpx;}
\ No newline at end of file
+.footer{width:94%;height:96rpx;line-height:96rpx;text-align: center;background:#F66A01;color:#fff;margin:34rpx auto;border-radius:16rpx;}
+
+
+ .list{padding:24rpx;}
+ .list .name{font-size:28rpx;padding-bottom:10rpx}
+ .list .price{display: flex;justify-content: space-between;color:#919191;font-size:24rpx;}
+ .list .price text{color:#F66A01;font-size:28rpx;}
\ No newline at end of file
diff --git a/pages/club/club.js b/pages/club/club.js
index b9ac1eb..73c1146 100644
--- a/pages/club/club.js
+++ b/pages/club/club.js
@@ -73,9 +73,17 @@ Page({
     
   },
   clubdetail:function(e){
-    var id = e.currentTarget.id
+    var id = e.currentTarget.id;
+    // console.log(e);
+    if(+e.currentTarget.dataset['status'] != 1){
+      wx.showToast({
+        title: '该俱乐部审核未通过',
+        icon: 'none'
+      });
+      return;
+    }
     wx.navigateTo({
-      url: './clubDetail/clubDetail?id='+id+''
+      url: './clubDetail/clubDetail?id='+id
     })
   },
   toclub:function(){
diff --git a/pages/club/club.wxml b/pages/club/club.wxml
index 70a50a3..3197942 100644
--- a/pages/club/club.wxml
+++ b/pages/club/club.wxml
@@ -58,7 +58,7 @@
       </view>
       <view class="myjoin">
         <block wx:for="{{myjoinList}}" wx:key="myjoinlist">
-          <view class="joinlist" bindtap="clubdetail"  id="{{item.clubId}}">
+          <view class="joinlist" bindtap="clubdetail" data-status="{{item.checkStatus}}"  id="{{item.clubId}}">
             <view class="list-left">
               <image src="{{item.clubLogo}}" mode='aspectFill'></image>
             </view>
diff --git a/pages/club/clubDetail/clubDetail.js b/pages/club/clubDetail/clubDetail.js
index b0dcc48..0e4ef1f 100644
--- a/pages/club/clubDetail/clubDetail.js
+++ b/pages/club/clubDetail/clubDetail.js
@@ -233,11 +233,11 @@ toactiveDetail:function(e){
     };
     re.request(Api.actjoining(), postData, header).then((res) => {
       let datas = res.data.data;
-
+      // console.log('otheractive:', res);
       that.setData({
         otheractive:datas
       })
-      console.log(">>",this.data.otheractive)
+      // console.log(">>",this.data.otheractive)
     })
   },
   getClubCoupon:function(){
diff --git a/pages/club/manage/manage.js b/pages/club/manage/manage.js
index 9046631..a865e6f 100644
--- a/pages/club/manage/manage.js
+++ b/pages/club/manage/manage.js
@@ -84,6 +84,7 @@ Page({
    */
   onLoad: function (options) {
     let queryval = JSON.parse(options.val)
+    console.log('options:', options);
     if(this.uploaderList === undefined) {
       this.uploaderList = []
     }
diff --git a/pages/club/manage/manage.wxml b/pages/club/manage/manage.wxml
index 1cd5c36..1ee4e51 100644
--- a/pages/club/manage/manage.wxml
+++ b/pages/club/manage/manage.wxml
@@ -33,12 +33,12 @@
         </view>
         <image src="../../../images/imgadd.png" bindtap='upload' wx:if="{{showUpload}}"></image>
       </view>
-      <view class="formlist" wx:if="{{jurisdiction==1}}">
+      <!-- <view class="formlist" wx:if="{{jurisdiction==1}}">
         <text>认证状态</text>
         <view wx:if="{{company.verifyType==0}}">未认证</view>
         <view wx:elif="{{company.verifyType==1}}">个人认证</view>
         <view wx:else>企业认证</view>
-      </view>
+      </view> -->
       <view class="formlistarea">
         <text>俱乐部简介</text>
         <textarea name="" placeholder="请输入俱乐部简介" value="{{company.clubIntroduction}}" bindinput="textDetailChange"></textarea>
diff --git a/pages/message/message.wxml b/pages/message/message.wxml
index ffdb4d3..2350a0b 100644
--- a/pages/message/message.wxml
+++ b/pages/message/message.wxml
@@ -62,7 +62,7 @@
     </view>
     <view class="list-right">
       <view class="right-top">
-        官方客服<text>{{host.time}}</text>
+        平台客服<text>{{host.time}}</text>
       </view>
       <view class="right-content">
         {{host.content}}
diff --git a/utils/common.js b/utils/common.js
index 0a024db..7eab45e 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -2,6 +2,7 @@
 //  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 = 'http://ifast3.vipnps.vip:11707';
 
  
  
@@ -89,6 +90,7 @@ var HOST_URI = 'https://api.tuleduo.cn';
  var API_getbanner= '/open/pub/home/banner';//获取首页banner
  var API_getregisterList= '/open/activity/register/list';//获取报名列表
  var API_getcash= '/open/wxpay/pay/toCash';//提现
+ var API_cashList = '/open/club/cash/detail';
  var API_walletpay= '/open/wxpay/pay/walletPay';//钱包支付
  let API_nicknamedetail='/open/club/nickname/detail';
  let API_memberexit='/open/club/member/exit';
@@ -102,6 +104,11 @@ var HOST_URI = 'https://api.tuleduo.cn';
  let API_getClubMessagePage= '/open/massage/club/pages' //俱乐部消息
  let API_getSystemMessagePage= '/open/massage/system/pages' //系统消息
  let API_removeActivity = '/open/club/activity/remove'//删除活动
+
+
+ function cashList(){
+   return HOST_URI + API_cashList;
+ }
   function SetMember(){
    return HOST_URI + API_Setmember;
   }
@@ -460,5 +467,6 @@ function getClubMessagePage(){
    checkUserClubActivity,
    getClubMessagePage,
    getSystemMessagePage,
-   removeActivity
+   removeActivity,
+   cashList
  };

From 93113ea0de2f3bcc09bf2d2bb42d4d8ce099758c Mon Sep 17 00:00:00 2001
From: imax <373170631@qq.com>
Date: Thu, 7 Jul 2022 23:57:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/cashlist/cashlist.js | 7 +++----
 pages/center/center.wxml          | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pages/center/cashlist/cashlist.js b/pages/center/cashlist/cashlist.js
index d05d963..3b5bc5b 100644
--- a/pages/center/cashlist/cashlist.js
+++ b/pages/center/cashlist/cashlist.js
@@ -7,12 +7,11 @@ Page({
    * 页面的初始数据
    */
   data: {
-    cashlist:[
-      // {money:'655',time:'2020-12-10 12:00:00',status:'1'},
+    cashlist:[]
+    // {money:'655',time:'2020-12-10 12:00:00',status:'1'},
       // {money:'655',time:'2020-12-10 12:00:00',status:'2'},
       // {money:'655',time:'2020-12-10 12:00:00',status:'3'},
       // {money:'655',time:'2020-12-10 12:00:00',status:'1'},
-    ]
   },
 
   /**
@@ -35,7 +34,7 @@ Page({
       let datas = res.data.data;
       console.log(datas)
      this.setData({
-      cashlist: res.data
+      cashlist: datas
      });
     })
   },
diff --git a/pages/center/center.wxml b/pages/center/center.wxml
index c9ac8d7..c256cd4 100644
--- a/pages/center/center.wxml
+++ b/pages/center/center.wxml
@@ -55,7 +55,7 @@
     <view class="orange">
       <view class="orangecircle">
       <view class="trash" bindtap="tocash"><image src="../../images/trash.png"></image>提现</view>
-      <view class="trash" bindtap="tocashList"><image src="../../images/trashorder.png"></image>提现记录</view>
+      <!-- <view class="trash" bindtap="tocashList"><image src="../../images/trashorder.png"></image>提现记录</view> -->
     </view>
     </view>
   </view>