From a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Wed, 26 Feb 2020 16:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml | 170 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 71 deletions(-)
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
index b4aee34..83b3115 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
@@ -1,83 +1,111 @@
<!--pages/fzpxInfo/fzpxInfo.wxml-->
<view class="fzpxInfo-bg" wx:if="{{!loading}}">
- <view class="flex1">
- <swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
- <swiper-item wx:for="{{activity.attList}}" wx:key>
- <image src="{{item.imgPath}}" mode="aspectFill"></image>
- <!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
- </swiper-item>
- </swiper>
+ <view class="flex1">
+ <swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
+ <swiper-item wx:for="{{topattList}}" wx:key>
+ <image src="{{item.imgPath}}" mode="aspectFill"></image>
+ <!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
+ </swiper-item>
+ </swiper>
- <view class="fzpxInfo-main">
- <view class="fzpxInfo-main-t">{{activity.activityTitle}}</view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训时间</view>
- <view class="fzpxInfo-main-group-around">{{activity.startTime}}</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">报名人数</view>
- <view class="fzpxInfo-main-group-around">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训地点</view>
- <view class="fzpxInfo-main-group-around">{{activity.activityAddress}}</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">组织方</view>
- <view style="display: flex; line-height:48rpx;">
- <view class="fzpxInfo-main-group-around">{{activity.host || '无'}}</view>
- <text class="cuIcon-dianhua lg text-blue margin-left" data-phone="{{activity.activityPhone}}" bindtap="makePhoneCall"></text>
- </view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训对象</view>
- <view class="fzpxInfo-main-group-around">{{activity.requirement}}</view>
- </view>
- <view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
- <view class="fzpxInfo-main-group-title">培训内容</view>
- <view>
- <view class="fzpxInfo-main-group-around">{{activity.activityDesc}}</view>
- </view>
- </view>
- </view>
+ <view class="fzpxInfo-main">
+ <view class="fzpxInfo-main-t">{{activity.activityTitle}}</view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训时间</view>
+ <view class="fzpxInfo-main-group-around">{{activity.startTime}}</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">报名人数</view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训地点</view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityAddress}}</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">组织方</view>
+ <view style="display: flex; line-height:48rpx;">
+ <view class="fzpxInfo-main-group-around">{{activity.host || '无'}}</view>
+ <text class="cuIcon-dianhua lg text-blue margin-left" data-phone="{{activity.activityPhone}}" bindtap="makePhoneCall"></text>
+ </view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">报名要求</view>
+ <view class="fzpxInfo-main-group-around">{{activity.requirement}}</view>
+ </view>
+ <view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
+ <view class="fzpxInfo-main-group-title">培训内容</view>
+ <view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityDesc}}</view>
+ </view>
+ </view>
- <block wx:if="{{activity.activityStatus == 1 && flag == 'true'}}">
- <view class="sub-title">报名信息</view>
- <form>
- <view class="cu-form-group">
- <view class="title">姓名
- <span style="color: red;">*</span>
- </view>
- <input placeholder="请输入姓名" data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}'></input>
- </view>
- <view class="cu-form-group">
- <view class="title">电话号码
- <span style="color: red;">*</span>
- </view>
- <input placeholder="请输入电话号码" data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}'></input>
- </view>
- </form>
- </block>
+ <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训结果</view>
+ <view class="fzpxInfo-main-group-around">{{activity.result}}</view>
+ </view>
- </view>
+ <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训材料</view>
+ <view class="fzpxInfo-main-group-around" style="display:flex;flex-wrap: wrap">
+ <view class="educt_hasupload_pic" wx:for="{{bottomattList}}" wx:key="index">
+ <image src="{{item.imgPath}}" class="upload"></image>
+ </view>
+ </view>
+ </view>
+ </view>
- <view class="fzpxInfo-foot margin-top">
- <!-- <view class="fzpxInfo-foot-title">报名须知</view>
+ <block wx:if="{{activity.activityStatus == 1 && flag == 'true'}}">
+ <view class="sub-title">报名信息</view>
+ <form>
+ <view class="cu-form-group">
+ <view class="title">姓名
+ <span style="color: red;">*</span>
+ </view>
+ <input placeholder="请输入姓名" data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}'></input>
+ </view>
+ <view class="cu-form-group">
+ <view class="title">电话号码
+ <span style="color: red;">*</span>
+ </view>
+ <input placeholder="请输入电话号码" data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}'></input>
+ </view>
+ </form>
+ </block>
+
+ </view>
+
+ <view class="fzpxInfo-foot margin-top">
+ <view wx:if="{{signStatus}}">
+ <view wx:if="{{signStatus == 2}}">
+ <view class="fzpxInfo-foot-button bg-grey" bindtap='sign'>签到</view>
+ </view>
+
+ <view wx:else>
+ <view class="fzpxInfo-foot-button bg-grey" bindtap='goBack'>返回</view>
+ </view>
+ </view>
+
+ <view wx:else>
+ <!-- <view class="fzpxInfo-foot-title">报名须知</view>
<view class="fzpxInfo-foot-txt">请确认所有参赛人员的排列顺序。相关信息会在参赛证件、参赛证明、获取证书等重要比赛文件中提现。</view>
<view class="fzpxInfo-foot-txt">由于参赛队信息填报原因产生的任何错误，在相关文件完成制作后一律不予修改；</view> -->
- <view wx:if="{{flag == 'false'}}">
- <view class="fzpxInfo-foot-button bg-grey">您已报名</view>
- </view>
- <view wx:if="{{flag == 'true'}}">
+ <view wx:if="{{flag == 'false'}}">
+ <view class="fzpxInfo-foot-button bg-grey">您已报名</view>
+ </view>
+ <view wx:if="{{flag == 'true'}}">
- <view class="fzpxInfo-foot-button bg-blue" wx:if="{{activity.activityStatus == 1}}" bindtap='submit'>我要报名</view>
- <view class="fzpxInfo-foot-button bg-blue" wx:elif="{{activity.activityStatus == 2}}">活动正在进行</view>
- <view class="fzpxInfo-foot-button bg-grey" wx:elif="{{activity.activityStatus == 3}}">活动已结束</view>
- <view class="fzpxInfo-foot-button bg-grey" wx:else>报名人数已满</view>
+ <view class="fzpxInfo-foot-button bg-blue" wx:if="{{activity.activityStatus == 1}}" bindtap='submit'>我要报名</view>
+ <view class="fzpxInfo-foot-button bg-blue" wx:elif="{{activity.activityStatus == 2}}">活动正在进行</view>
+ <view class="fzpxInfo-foot-button bg-grey" wx:elif="{{activity.activityStatus == 3}}">活动已结束</view>
+ <view class="fzpxInfo-foot-button bg-grey" wx:else>报名人数已满</view>
- </view>
- <view>
+ </view>
+ </view>
- </view>
- </view>
+
+ <view>
+
+ </view>
+ </view>
</view>
\ No newline at end of file
--
Gitblit v1.8.0