update:bug修改

pages/apply/apply.js

@@ -832,7 +832,7 @@ Page({
 
             wx.showToast({ title: '支付成功', icon: 'success' });
             setTimeout(() => {
-              wx.switchTab({ url: '/pages/mine/mine' });
+              wx.switchTab({ url: '/pages/home/home' });
             }, 1500);
             resolve();
           } catch (err) {

pages/apply/apply.wxml

@@ -53,7 +53,7 @@
     </scroll-view>
     <!-- 底部支付按钮 -->
     <view class="bottom-bar">
-      <button class="btn-offline" bindtap="onPayOffline" loading="{{submitting}}">线下支付</button>
+      <!-- <button class="btn-offline" bindtap="onPayOffline" loading="{{submitting}}">线下支付</button> -->
       <button class="btn-online" bindtap="onPayOnline" loading="{{submitting}}">
         <view wx:if="{{discountPrice > 0}}" class="price-display">
           <text class="small-price">¥{{originalPrice}}</text>

pages/detail/detail.js

@@ -14,8 +14,7 @@ var DETAIL_UI_FALLBACK = {
   matchStartText: '2015-10-02 09:21:00',
   matchEndText: '2015-10-10 18:00:00',
   materialRangeText: '2015-10-02 09:21:00 ~ 2015-10-10 18:00:00',
-  uploadMaterialRemark:
+  uploadMaterialRemark:'',
-    '上传素材备注备',
   eventAddress: '上海市杨浦区307号',
   refundRulesText: '开赛前7天扣除金额5%，3-7天扣除金额10%，3天内扣除金额20%',
   participationPointsLabel: '5积分',

pages/detail/detail.wxml

@@ -110,14 +110,14 @@
               <text class="th th-type">类型</text>
               <text class="th th-proj">项目</text>
               <text class="th th-group">组别</text>
-              <text class="th th-fee">费用（元）</text>
+              <text class="th th-fee" wx:if="{{feeModeLabel == '单价（项目）'}}">费用（元）</text>
             </view>
             <view class="table-body">
               <view class="tr" wx:for="{{projectTableRows}}" wx:key="rowKey">
                 <text class="td td-type">{{item.typeName}}</text>
                 <text class="td td-proj">{{item.projectName}}</text>
                 <text class="td td-group">{{item.groupName}}</text>
-                <text class="td td-fee">{{item.fee}}</text>
+                <text class="td td-fee" wx:if="{{feeModeLabel == '单价（项目）'}}">{{item.fee}}</text>
               </view>
             </view>
           </view>

pages/home/home.wxml

@@ -64,7 +64,7 @@
         <view class="empty">暂无数据</view>
       </block>
       <block wx:for="{{rows}}" wx:key="rowKey">
-        <view class="event-card" bindtap="onEventTap" data-id="{{item.id}}">
+        <view class="event-card" wx:if="{{status != 4 || (status == 4 && item.eventStatus == 4)}}" bindtap="onEventTap" data-id="{{item.id}}">
           <view class="event-card-media">
             <image class="event-card-cover" src="{{item.coverImage}}" mode="aspectFill" />
             <view class="addr-pill" wx:if="{{item.address}}">{{item.address}}</view>

subpackages/mine/records/records.wxml

@@ -1,7 +1,7 @@
 <view class="container">
   <view class="header">
     <view class="title">我的参赛记录</view>
-    <button size="mini" type="default" bindtap="goToMine">返回</button>
+    <!-- <button size="mini" type="default" bindtap="goToMine">返回</button> -->
   </view>
 
   <view class="list">

subpackages/mine/team-detail/team-detail.js

@@ -28,7 +28,10 @@ function normalizeTeamDetail(raw) {
   const d = raw && typeof raw === 'object' ? raw : {};
   const leader = d.leader && typeof d.leader === 'object' ? d.leader : null;
   const coach = d.coach && typeof d.coach === 'object' ? d.coach : null;
-  const membersRaw = Array.isArray(d.members) ? d.members : [];
+  const membersRaw = (Array.isArray(d.members) ? d.members : []).filter(m => {
+    const pt = m && (m.personType != null ? m.personType : m.PersonType);
+    return Number(pt) === 1;
+  });
 
   const createdTime = d.createdTime || d.CreatedTime || d.createTime || d.CreateTime || '';