修改bug-20220702-1924

pages/center/center.wxml

@@ -9,9 +9,10 @@
   <view class="myactive" bindtap="toorder">
     <view class="title">
       我的活动
-      <view>查看全部<image src="../../images/back.png"></image></view>
+      <!-- 查看全部 -->
+      <view><image src="../../images/back.png"></image></view>
     </view>
-    <view class="activeList">
+    <!-- <view class="activeList">
       <view class="listone">
         <image src="../../images/nopay.png"></image>
         <view>待支付</view>
@@ -28,7 +29,7 @@
         <image src="../../images/say.png"></image>
         <view>待评价</view>
       </view>
-    </view>
+    </view> -->
   </view>
   <view class="wallet">
     <view class="title">

pages/center/order/order.js

@@ -20,6 +20,17 @@ Page({
       url: '../orderdetail/orderdetail?id='+e.currentTarget.dataset.id+''
     })
   },
+  timeFormat(d, format = 'yyyy-MM-dd HH:mm:ss'){
+    let fnumber = v => v > 10 ? `${v}` : ('0' + v);
+    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('HH', fnumber(date.getHours()));
+    result = result.replace('mm', fnumber(date.getMinutes()));
+    result = result.replace('ss', fnumber(date.getSeconds()));
+    return result;
+  },
   currentTab: function (e) {
     var that = this;
     if (that.data.currentTab == e.currentTarget.dataset.idx) {
@@ -109,7 +120,14 @@ Page({
       datas.cost = val.cost;
       datas.createdTime = val.createdTime;
       datas.orderId = val.orderId;
-      orderlist = orderlist.concat(datas);
+      // console.log('datas:', datas)
+      // orderlist.forEach(item => {
+        datas.startTime = that.timeFormat(datas.startTime, 'yyyy-MM-dd HH:mm');
+        datas.endTime = that.timeFormat(datas.endTime, 'yyyy-MM-dd HH:mm');
+      // });
+
+      orderlist = orderlist.concat([datas]);
+      // console.log('orderlist:', orderlist);
       that.setData({
         // array:array,
         orderlist:orderlist

pages/center/order/order.wxml

@@ -1,10 +1,10 @@
 <view class="container">
-  <view class="nav">
+  <!-- <view class="nav">
     <view class="navtop">
       <view wx:for="{{navTab}}" wx:key="index" data-idx="{{index}}" bindtap="currentTab"
         class="{{currentTab==index ? 'cur' : ''}}"><text>{{item}}</text></view>
     </view>
-  </view>
+  </view> -->
   <view class="circle">
     <view wx:if="{{orderlist.length>0}}">
       <block wx:for="{{orderlist}}" wx:key="orderlist">

pages/center/order/order.wxss

@@ -4,7 +4,7 @@
 .navtop> view{text-align:center;width:33%;}
 .navtop> view text{height:70rpx; display:inline-block;line-height: 70rpx;color:#979797;font-size: 28rpx;}
 .navtop .cur text{ border-bottom:4rpx solid #FE4C00; color:#494949;font-size: 30rpx;}
-.circle{width:94%;margin:120rpx auto 0;}
+.circle{width:94%;/*margin:120rpx auto 0;*/}
 .circle .list{width:94%;margin:24rpx auto;background:#fff;padding:0 24rpx;border-radius:16rpx;box-shadow: 0px 4rpx 12rpx 0px rgba(0,0,0,0.06); }
 .circle .list .list-top{display: flex;justify-content: space-between;height:86rpx;line-height:86rpx;font-size:28rpx;border-bottom:2rpx solid #f1f1f1;}
 .circle .list .list-content{display: flex;justify-content: start;padding:24rpx 0;}

pages/center/orderdetail/orderdetail.js

@@ -65,12 +65,28 @@ Page({
       datas.cost = val.cost;
       datas.createdTime = val.createdTime;
       datas.orderId = val.orderId;
+
+      datas.startRegisterTime = that.timeFormat(datas.startRegisterTime, 'yyyy-MM-dd HH:mm');
+      datas.endRegisterTime = that.timeFormat(datas.endRegisterTime, 'yyyy-MM-dd HH:mm');
+      datas.startTime = that.timeFormat(datas.startTime, 'yyyy-MM-dd HH:mm');
+      datas.endTime = that.timeFormat(datas.endTime, 'yyyy-MM-dd HH:mm');
       that.setData({
         val:datas
       })
       that.getClubInfo(datas.clubId);
     })
   },
+  timeFormat(d, format = 'yyyy-MM-dd HH:mm:ss'){
+    let fnumber = v => v > 10 ? `${v}` : ('0' + v);
+    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('HH', fnumber(date.getHours()));
+    result = result.replace('mm', fnumber(date.getMinutes()));
+    result = result.replace('ss', fnumber(date.getSeconds()));
+    return result;
+  },
   getClubInfo:function(id){
     var that = this;
     const imgUrl = wx.getStorageSync('imgUrl');

pages/club/club.js

@@ -3,7 +3,7 @@ var re = require('../../utils/request.js');
 Page({
 
   /**
-   * 页面的初始数据
+   * 页面的初始数据 
    */
   data: {
     scrolls:[],

pages/club/clubDetail/clubDetail.wxml

@@ -61,7 +61,7 @@
       <view>相 册</view>
     </view>
   </view>
-  <view class="coupon">
+  <!-- <view class="coupon">
     <view>
       <block wx:for="{{nouse}}" wx:key="nouse">
         <view class="list">
@@ -88,7 +88,7 @@
         </view>
       </block>
     </view>
-  </view>
+  </view> -->
   <view class="other">
     <view class="other-top">
       <image src="../../../images/left.png"></image>

pages/index/myjoin/myjoin.js

@@ -40,7 +40,7 @@ Page({
     clubId: '',
     isHava: false,
     info: {},
-    checked: true
+    checked: false
   },
   history: function () {
     wx.navigateTo({
@@ -60,6 +60,11 @@ Page({
     })
     that.init();
   },
+  xieyi(e){
+    this.setData({
+      checked: e.detail.value.length > 0
+    });
+  },
   init: function () {
     let that = this;
     this.setData({
@@ -194,8 +199,16 @@ Page({
         title: '请确保表单全部填写完成',
         icon:'none'
       })
-      return
+      return;
     }
+    if(!this.data.checked){
+      wx.showToast({
+        title: '请勾选协议',
+        icon:'none'
+      });
+      return;
+    }
+
     let postData = that.data.info.details;
 
     // 本地存储用于