From 1629cb4a35884cdbd52088377fffd37fca2c225e Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Mon, 23 Mar 2020 16:47:09 +0800
Subject: [PATCH] 123

---
 SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml |  113 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
index 35e1838..f10f487 100644
--- a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
+++ b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
@@ -1,69 +1,82 @@
 <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" width="100%" height="32vh" duration="{{duration}}">
-  <block wx:for="{{activity.attList}}" wx:key="{{item.attId}}">
-    <swiper-item>
-      <image src="{{item.imgPath}}" class="slide-image" mode="aspectFit"/>
-    </swiper-item>
-  </block>
+	<block wx:for="{{activity.attList}}" wx:key="{{item.attId}}">
+		<swiper-item>
+			<image src="{{item.imgPath}}" class="slide-image" mode="aspectFit" />
+		</swiper-item>
+	</block>
 </swiper>
 
 <view class="activityDetail-main">
-  <view class="headLineTitle">
-    {{activity.activityTitle}}
-  </view>
-  <view class="headLineInfo">
-    {{activity.startTime}}
-    <text decode="{{true}}" space="{{true}}">&nbsp;&nbsp;</text>
-    <view class="info-viewer">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
-  </view>
-  <view class="headLineInfo">
-    {{activity.activityAddress}}
-  </view>
+	<view class="headLineTitle">
+		{{activity.activityTitle||'暂无'}}
+	</view>
+	<view class="headLineInfo">
+		{{activity.startTime}}
+		<text decode="{{true}}" space="{{true}}">&nbsp;&nbsp;</text>
+		<view class="info-viewer">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
+	</view>
+	<view class="headLineInfo">
+		{{activity.activityAddress}}
+	</view>
 
 </view>
 
 <div class="index-gray tel-area">
-  <view>南沙区人民检察院新媒办</view>
-  <image src="{{tel}}" bindtap='call'></image>
+	<view>南沙区人民检察院新媒办</view>
+	<image src="{{tel}}" bindtap='call'></image>
 </div>
 
 <view class="activityDetail-main">
-  <view class="activityDetail-content">
-    {{activity.activityDesc}}
-  </view>
+	<view class="activityDetail-content">
+		{{activity.activityDesc}}
+	</view>
 </view>
 
-<!-- 我要报名窗口 -->
-<block wx:if="{{canApply == true}}">
-  <view class="activityDetail-apply" hidden="{{!hiddenApply}}">
-      <div class="activityDetail-main-buttton" bindtap="apply">我要报名</div>
-  </view>
-</block>
 
-<!-- 不满足条件不可报名的各种情况 -->
-<block wx:if="{{statusWord}}">
-  <view class="activityDetail-apply">
-      <div class="activityDetail-main-buttton">{{statusWord}}</div>
-  </view>
-</block>
+<view wx:if="{{signStatus}}">
+	<div class="submit" bindtap='submit'>提交报名</div>
+	<view wx:if="{{signStatus == 2}}">
+		<view class="submit" bindtap='sign'>签到</view>
+	</view>
+
+	<view wx:else>
+		<view class="submit bg-grey" bindtap='goBack'>返回</view>
+	</view>
+</view>
+<view wx:else>
+	<!-- 我要报名窗口 -->
+	<block wx:if="{{canApply == true}}">
+		<view class="activityDetail-apply" hidden="{{!hiddenApply}}">
+			<div class="activityDetail-main-buttton" bindtap="apply">我要报名</div>
+		</view>
+	</block>
+
+	<!-- 不满足条件不可报名的各种情况 -->
+	<block wx:if="{{statusWord}}">
+		<view class="activityDetail-apply">
+			<div class="activityDetail-main-buttton">{{statusWord}}</div>
+		</view>
+	</block>
+</view>
 
 <view hidden="{{hiddenApply}}">
-  <div class="apply">
-    <div class="apply-message">
-      <span></span>
-      <span>报名信息</span>
-    </div>
+	<div class="apply">
+		<div class="apply-message">
+			<span></span>
+			<span>报名信息</span>
+		</div>
 
-    <div class="apply-list">
-      <div class="apply-list-left">姓名</div>
-      <input data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}' placeholder='请输入姓名'></input>
-    </div>
-    <div class="apply-list">
-      <div class="apply-list-left">电话号码</div>
-      <input data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}' placeholder='请输入电话号码'></input>
-    </div>
-  </div>
+		<div class="apply-list">
+			<div class="apply-list-left">姓名</div>
+			<input data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}' placeholder='请输入姓名'></input>
+		</div>
+		<div class="apply-list">
+			<div class="apply-list-left">电话号码</div>
+			<input data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}' placeholder='请输入电话号码'></input>
+		</div>
+	</div>
 
-  <div style="display:flex;justify-content:center;margin:4vh 0">
-    <div class="submit" bindtap='submit'>提交报名</div>
-  </div>
+	<div style="display:flex;justify-content:center;margin:4vh 0">
+		<div class="submit" bindtap='submit'>提交报名</div>
+	</div>
 </view>
\ No newline at end of file

--
Gitblit v1.8.0