tanyanfei 3 years ago
parent
commit
6e27d7aecc
4 changed files with 31 additions and 14 deletions
  1. 7 7
      pages/eventDetail/eventDetail.js
  2. 15 7
      pages/eventDetail/eventDetail.wxml
  3. 0 0
      util.wxs
  4. 9 0
      utils/util.wxs

+ 7 - 7
pages/eventDetail/eventDetail.js

@@ -220,13 +220,13 @@ Page({
       })
       return;
     }
-    if (!form.job) {
-      wx.showToast({
-        title: '请输入职务!',
-        icon: 'none'
-      })
-      return;
-    }
+    // if (!form.job) {
+    //   wx.showToast({
+    //     title: '请输入职务!',
+    //     icon: 'none'
+    //   })
+    //   return;
+    // }
     if (!form.phone) {
       wx.showToast({
         title: '请输入手机号!',

+ 15 - 7
pages/eventDetail/eventDetail.wxml

@@ -1,9 +1,10 @@
+<wxs src="../../utils/util.wxs" module="tools" />
 <image class='banner'  mode="widthFix" src="{{info.img}}"></image>
 <view class="info">
     <view>{{info.name}}</view>
     <text>主办单位:{{info.organizer_info.name}}</text>
     <text>主讲人:{{info.speaker}}</text>
-    <text>时间:{{info.uptime}} </text>
+    <text>时间:{{info.begin_time}}-{{info.end_time}} </text>
     <text>地址:{{info.province}}{{info.area}}</text>
 </view>
  
@@ -20,6 +21,7 @@
     <view class="tt">{{info.organizer_info.name}}</view>
     <view class="p {{zk2==1?'':'sq'}}">
       {{info.organizer_info.desc}}
+      
     </view>
     <text bindtap="sq2" class="zksq" wx:if='{{zk2}}'>收起</text>
     <text bindtap="zk2" class="zksq"  wx:if='{{!zk2}}'>展开</text>
@@ -41,7 +43,7 @@
         <view class="item">
             <label>姓名:</label><input name='name' placeholder-style='color:#999;'  placeholder="请输入姓名"></input>
         </view>
-        <view class="item">
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "sex")}}'>
             <label>性别:</label>
              <picker name='sex' bindchange="bindSexChange" value="{{sex}}" range="{{sex_array}}">
               <view class="picker">
@@ -50,10 +52,16 @@
               </view>
             </picker>
         </view>
-        <view class="item">
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "age")}}'>
+            <label>年龄:</label><input name='age' placeholder-style='color:#999;' placeholder="请输入年龄"></input>
+        </view>
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "job")}}'>
             <label>职务:</label><input name='job' placeholder-style='color:#999;' placeholder="请输入职务"></input>
         </view>
-        <view class="item">
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "title")}}'>
+            <label>职称:</label><input name='title' placeholder-style='color:#999;' placeholder="请输入职称"></input>
+        </view>
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "company")}}'>
             <label>所属单位:</label>
             <picker name='is_caos' bindchange="bindPickerChange" value="{{job}}" range="{{job_array}}">
               <view class="picker">
@@ -62,9 +70,9 @@
             </picker>
         </view>
         
-        <view class="item">
+        <view class="item"  wx:if='{{tools.indexOf(info.signup_fields, "company")}}'>
             <label>单位名称:</label>
-            <input wx:if='{{job==0}}'  placeholder-style='color:#999;' placeholder="请输入姓名"></input>
+            <input wx:if='{{job==0}}' name='company' placeholder-style='color:#999;' placeholder="请输入单位名称"></input>
 
             <picker wx:else   mode="multiSelector" bindchange="bindMultiPickerChange"  range-key='value' 
             bindcolumnchange="bindMultiPickerColumnChange" value="{{index}}" range="{{list}}">
@@ -79,7 +87,7 @@
         <view class="item">
             <label>验证码:</label><input name='code' placeholder-style='color:#999;' placeholder="请输入验证码"></input>
         </view>
-        <view class="item">
+        <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "email")}}'>
             <label>邮箱:</label><input name='email' placeholder-style='color:#999;' placeholder="请输入邮箱"></input>
         </view>
         <text class="ts">温馨提示</text>

+ 0 - 0
util.wxs


+ 9 - 0
utils/util.wxs

@@ -0,0 +1,9 @@
+// .wxs文件
+function indexOf(arr, value) {
+  if (arr.indexOf(value) < 0) {
+    return false;
+  } else {
+    return true;
+  }
+}
+module.exports.indexOf = indexOf;