update

pages/conference/conference.wxml

@@ -23,8 +23,9 @@
                               <text>{{item.intruduce}}</text>
                           </view>
 </view> 
-<button  wx:if='{{info.is_signup && !info.is_over}}' bindtap="open" class="post">我要报名</button>
+<button  wx:if='{{info.is_signup && !info.is_over && !info.is_user_signuped}}' bindtap="open" class="post">我要报名</button>
 <button  wx:if='{{info.is_signup && info.is_over}}' disabled="true" class="post">已结束</button>
+<button  wx:if='{{info.is_signup && info.is_user_signuped && !info.is_over}}' disabled="true" class="post">已报名</button>
 <view class="bg" wx:if='{{show}}'> 
   <form  class="form" bindsubmit='submit'>
         <image bindtap='close' class='close'  mode="widthFix" src="../images/close.png"></image>

pages/eventDetail/eventDetail.js

@@ -259,7 +259,7 @@ Page({
     var form = e.detail.value;
     var list = this.data.list, index=this.data.index;
     if (this.data.info.signup_fields.indexOf('company')>=0){
-      form.organizer_unit = list[0][index[0]].value + list[1][index[1]].value + list[2][index[2]].value
+      form.organizer_unit = list[0][index[0]].value +","+ list[1][index[1]].value +","+ list[2][index[2]].value
     }
     form.sex=this.data.sex
     form.uid=this.data.user_id;

pages/jInfo/jInfo.wxss

@@ -20,14 +20,14 @@
 }
 
 .baseinfo .tweo view{
-  margin-bottom:24rpx;
-  font-size: 24rpx;
+  margin-bottom:16rpx;
+  font-size: 28rpx;
   color: #999999;
 }
 .baseinfo .tweo .title{
-  font-size: 32rpx;
+  font-size: 36rpx;
   color:#333333;
-  margin-bottom:40rpx;
+  margin-bottom:36rpx;
   padding-right: 136rpx;
 }
 .baseinfo .gzgzh{
@@ -36,7 +36,7 @@
   height: 48rpx;
   background: #298EF9;
   border-radius: 8rpx;
-  font-size:20rpx;
+  font-size:24rpx;
   color:#ffffff;
   right: 20rpx;
   padding:0px;
@@ -44,7 +44,7 @@
 }
 
 .intro text{
-  font-size: 28rpx;
+  font-size: 32rpx;
   color: #333333;
   font-weight: 500;
 }
@@ -52,6 +52,7 @@
   margin-top:30rpx;
   color: #666666;
   line-height: 45rpx;
+  font-size: 34rpx;
 }
 .content{
   margin-top:48rpx;

pages/journalDetail/journalDetail.wxss

@@ -20,12 +20,12 @@
 }
 
 .baseinfo .tweo view{
-  margin-bottom:24rpx;
-  font-size: 24rpx;
+  margin-bottom:16rpx;
+  font-size: 28rpx;
   color: #999999;
 }
 .baseinfo .tweo .title{
-  font-size: 32rpx;
+  font-size: 36rpx;
   color:#333333;
   margin-bottom:40rpx;
   padding-right: 136rpx;
@@ -36,7 +36,7 @@
   height: 48rpx;
   background: #298EF9;
   border-radius: 8rpx;
-  font-size:20rpx;
+  font-size:24rpx;
   color:#ffffff;
   right: 20rpx;
   padding:0px;
@@ -44,7 +44,7 @@
 }
 
 .intro text{
-  font-size: 28rpx;
+  font-size: 32rpx;
   color: #333333;
   font-weight: 500;
 }