bug

app.wxss

@@ -83,4 +83,13 @@ image{
   overflow: hidden !important;
   white-space: nowrap !important;
   padding-right: 20rpx !important;
+}
+.fixed{
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100vh;
+  overflow: hidden;
+  width: 100%;
+  padding: 30rpx;
 }

pages/collect/collect.wxml

@@ -6,7 +6,7 @@
                               <view>
                                   <text>2018.5.28</text>
                               </view>
-                              <text>作者：{{item.author}}</text>
+                              <text class="nowrap">作者：{{item.author}}</text>
                               <text>{{}}</text> 
                   </view>
                   <text class="">{{item.desc}}</text>

pages/collect/collect.wxss

@@ -1,13 +1,17 @@
 /* pages/collect/collect.wxss */
+
 .list{
   /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
-  /* border-radius: 20rpx; */
+  /* border-radius: 20rpx;
   display: flex;
   /* padding: 20rpx; */
   /* box-shadow: 0 0 15rpx 0px rgba(0, 0, 0, 0.2); */
   /* margin: 0 20rpx 40rpx; */
-  border-bottom: 1px solid #F0F0F0;
-  padding: 28rpx 0;
+  /* border-bottom: 1px solid #F0F0F0; */
+  padding: 28rpx;
+  background: #fff;
+  margin-bottom: 20rpx;
+  display: flex;
   
 }
 .list image{
@@ -57,7 +61,7 @@
 .ly text{
   display: block;
   color: #666;
-  font-size: 22rpx;
+  font-size: 24rpx;
 }
 .ly view{
   float: right;
@@ -65,4 +69,10 @@
 }
 .ly view text{
   font-size: 18rpx;
+}
+.list .title{
+  margin-bottom: 20rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }

pages/conference/conference.wxml

@@ -1,3 +1,4 @@
+<view class="{{show?'fixed':''}}">
 <image class='banner'  mode="widthFix" src="{{info.img}}"></image>
 <view class='name'>{{info.name}}</view>
 <view class="info">
@@ -26,6 +27,7 @@
 <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>
 <view class="bg" wx:if='{{show}}'> 
   <form  class="form" bindsubmit='submit'>
         <image bindtap='close' class='close'  mode="widthFix" src="../images/close.png"></image>

pages/conference/conference.wxss

@@ -1,6 +1,7 @@
 /* pages/conference/conference.wxss */
 page{
   background: #fff;
+  padding-bottom: 30rpx;
 }
 .banner{
   width: 100%;
@@ -37,7 +38,7 @@ page{
   line-height: 90rpx;
   padding: 0;
   border-radius: 18rpx;
-  margin-top: 30rpx;
+  margin: 30rpx 0;
 }
 .bg{
   position: fixed;

pages/eventDetail/eventDetail.wxml

@@ -1,4 +1,5 @@
 <wxs src="../../utils/util.wxs" module="tools" />
+<view class="{{show?'fixed':''}}">
 <image class='banner'  mode="widthFix" src="{{info.img}}"></image>
 <view class="info">
     <view>{{info.name}}</view>
@@ -59,7 +60,7 @@
 <button  wx:if='{{info.is_signup && !info.is_user_signuped && !info.is_over}}' bindtap="open" class="post">我要报名</button>
 <button  wx:if='{{info.is_signup && info.is_user_signuped && !info.is_over}}' disabled="true" class="post">已报名</button>
 <button  wx:if='{{info.is_over}}' disabled="true" class="post">已结束</button>
-
+</view>
 
 <view class="bg" wx:if='{{show}}'>
     <form wx:if='{{page==1}}' class="form" bindsubmit='submit'>
@@ -78,7 +79,7 @@
             </picker>
         </view>
         <view class="item" wx:if='{{tools.indexOf(info.signup_fields, "age")}}'>
-            <label>年龄：</label><input name='age' placeholder-style='color:#999;' placeholder="请输入年龄"></input>
+            <label>年龄：</label><input name='age' type="number" 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>
@@ -107,7 +108,7 @@
             </picker>
         </view>
         <view class="item">
-            <label>手机号：</label><input bindinput="phoneChange" name='phone' placeholder-style='color:#999;' placeholder="请输入手机号"></input>
+            <label>手机号：</label><input type="number" bindinput="phoneChange" name='phone' placeholder-style='color:#999;' placeholder="请输入手机号"></input>
             <text wx:if='{{text=="发送验证码"}}' bindtap="sendcode" class="code">{{text}}</text>
              <text wx:else  style="color:#999;" class="code">{{text}}</text>
         </view>
@@ -125,7 +126,8 @@
     <view class="form form1" wx:if='{{page==2}}'>
           <view class="form_tt">提示</view>
           <view class="tips">您的报名信息已提交成功，请尽快缴纳会议费。
-            <text>(!参会人员需先缴纳会议费,才能预订酒店住房)</text>
+          <text wx:if='{{info.contype == "offline"}}'>(!参会人员需先缴纳会议费,才能预订酒店住房)</text>
+            <text wx:if='{{info.contype == "online"}}'>(!参会人员需先缴纳会议费,才能参加会议)</text>
           </view>
           <view class="form_info">
                 <text>{{info.sign_note}}</text>
@@ -142,7 +144,8 @@
     </view>
 
     <form class="form form2" wx:if='{{page==3}}'  bindsubmit='submit1'>
-      <view class="form_tt">上传入住凭证</view>
+      <view class="form_tt" wx:if='{{info.contype == "offline"}}'>上传入住凭证</view>
+      <view class="form_tt" wx:if='{{info.contype == "online"}}'>上传参会凭证</view>
       <view class="upload" bindtap="upload">
           <block wx:if='{{!proof_img}}'>
             <image  mode="widthFix" src="../images/up.png"></image>
@@ -193,7 +196,8 @@
         <view class="suc">凭证上传成功</view>
         <view class="form_info">
             <text>待文献情报中心财务部门确认收到会议费后，系统将发送授权码至报名手机。</text>
-            <text>请您凭授权码登录报名系统预订酒店住房。</text>
+            <text wx:if='{{info.contype == "offline"}}'>请您凭授权码登录报名系统预订酒店住房。</text>
+            <text wx:if='{{info.contype == "online"}}'>请您凭授权码登录报名系统获取参会信息。</text>
         </view>
         <!-- <button bindtap="sure"  class="post">关闭</button> -->
         <button bindtap="home" class="post">确认</button>

pages/eventDetail/eventDetail.wxss

@@ -12,18 +12,19 @@ page{
   padding-bottom: 28rpx;
 }
 .info view{
-  color: #666;
-  font-size: 32rpx;
+  color: #333;
+  font-size: 36rpx;
   margin: 34rpx 0 28rpx;
 }
 .info text{
   display: block;
   color: #999;
   font-size: 26rpx;
+  padding: 5rpx 0;
 }
 .tt{
-  font-size: 28rpx;
-  color: #666;
+  font-size: 36rpx;
+  color: #333;
   margin: 34rpx 0;
 }
 .p{
@@ -59,6 +60,7 @@ page{
   line-height: 90rpx;
   padding: 0;
   border-radius: 18rpx;
+  margin-bottom: 30rpx;
 }
 
 .bg{
@@ -162,6 +164,7 @@ page{
   bottom: 0;
   margin: auto;
   position: absolute;
+  overflow: auto;
 }
 .upload{
   border: 1px solid #3BA0FF;
@@ -270,4 +273,4 @@ page{
 .map{
   float: right;
   color: green;
-}
+}

pages/index/index.wxml

@@ -59,7 +59,7 @@
               <view class="dw_list">
                     <navigator wx:for='{{item.journals}}' url="../journalDetail/journalDetail?id={{jour.id}}"  wx:key="*this" wx:for-item='jour'>
                         <view>{{jour.name}}</view>
-                        <text>{{jour.desc}}</text>
+                        <text class="jdesc">{{jour.desc}}</text>
                     </navigator>
                     <view wx:if='{{item.istop}}' bindtap="cancel_top" data-type='organizer' data-id='{{item.id}}' class="top cancel">取消置顶</view>
                     <view wx:else bindtap="top" data-type='organizer' data-id='{{item.id}}' class="top">置顶</view>
@@ -82,7 +82,7 @@
               <view class="dw_list">
                     <navigator wx:for='{{item.journals}}' url="../journalDetail/journalDetail?id={{jour.id}}"  wx:key="*this" wx:for-item='jour'>
                         <view>{{jour.name}}</view>
-                        <text>{{jour.desc}}</text>
+                        <text class="jdesc">{{jour.desc}}</text>
                     </navigator>
                     <view wx:if='{{item.istop}}' bindtap="cancel_top" data-type='subject' data-id='{{item.subject_id}}' class="top cancel">取消置顶</view>
                     <view wx:else bindtap="top" data-id='{{item.id}}' data-type='subject' class="top">置顶</view>

pages/index/index.wxss

@@ -444,4 +444,8 @@ scroll-view{
   margin-left: 5rpx;
   position: relative;
   top: 3rpx;
+}
+.jdesc{
+  line-height: 48rpx;
+  letter-spacing: 4rpx;
 }

pages/jInfo/jInfo.wxss

@@ -36,9 +36,9 @@
   height: 48rpx;
   background: #298EF9;
   border-radius: 8rpx;
-  font-size:24rpx;
+  font-size:20rpx;
   color:#ffffff;
-  right: 20rpx;
+  right: 0;
   padding:0px;
   line-height: 48rpx;
 }
@@ -50,9 +50,10 @@
 }
 .intro .desc{
   margin-top:30rpx;
-  color: #666666;
-  line-height: 52rpx;
+  color: #777;
+  line-height: 60rpx;
   font-size: 32rpx;
+  letter-spacing: 4rpx;
 }
 .content{
   margin-top:48rpx;

pages/journalDetail/journalDetail.wxss

@@ -36,9 +36,9 @@
   height: 48rpx;
   background: #298EF9;
   border-radius: 8rpx;
-  font-size:24rpx;
+  font-size:20rpx;
   color:#ffffff;
-  right: 20rpx;
+  right: 0;
   padding:0px;
   line-height: 48rpx;
 }
@@ -50,9 +50,10 @@
 }
 .intro .desc{
   margin-top:30rpx;
-  color: #666666;
-  line-height: 52rpx;
+  color: #777;
+  line-height: 60rpx;
   font-size: 32rpx;
+  letter-spacing: 4rpx;
 }
 .content{
   margin-top:48rpx;

pages/knowledge/knowledge.wxml

@@ -44,7 +44,4 @@
           </block>
       </scroll-view>
   </swiper-item>
-
-  <swiper-item>
-  </swiper-item>
 </swiper>

pages/knowledge/knowledge.wxss

@@ -86,7 +86,7 @@
 .ly text{
   display: block;
   color: #666;
-  font-size: 22rpx;
+  font-size: 24rpx;
   padding: 5rpx 0;
 }
 .ly view{

pages/learning/learning.wxml

@@ -86,10 +86,10 @@
                           <view>
                               <view class="tt">{{item.name}}  </view>
                               <view class="ly"> 
+                                  <text>主讲人:{{item.speaker}}</text>
                                   <view>
                                       <text>{{item.begin_time}}</text>
                                   </view>
-                                  <text>主讲人:{{item.speaker}}</text>
                                   <text>{{item.publish_unit}}</text> 
                               </view>
                               <text>{{item.desc}}</text>
@@ -175,12 +175,12 @@
                       <view>
                           <view class="tt">{{item.name}}  </view>
                           <view class="ly"> 
-                              <view>
+                             
+                              <text>主讲人:{{item.speaker}}</text>
+                               <view>
                                   <text>{{item.begin_time}}</text>
-                                  <!-- <text>地址：中国科学院</text> -->
                               </view>
-                              <text>主讲人:{{item.speaker}}</text>
-                              <text>{{item.publish_unit}}</text> 
+                              <text style="min-height:36rpx;">{{item.publish_unit}} </text> 
                           </view>
                           <text>{{item.desc}}</text>
                       </view>

pages/learning/learning.wxss

@@ -26,7 +26,7 @@ scroll-view{
   padding: 24rpx;
 }
 .title{
-  font-size: 32rpx;
+  font-size: 34rpx;
   color: #333;
   margin-bottom: 28rpx;
 }
@@ -56,7 +56,8 @@ scroll-view{
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     white-space: normal;
-    height: 73rpx;   
+    height: 79rpx;   
+    line-height: 44rpx;
 }
 .tj text{
   display: block;
@@ -68,6 +69,7 @@ scroll-view{
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     white-space: normal;
+    
 }
 .list .hy_ly{
   width: 65%;
@@ -96,14 +98,14 @@ scroll-view{
   padding-left: 20rpx;  
 }
 .list .tt{
-  margin-bottom: 20rpx;
+  margin-bottom: 5rpx;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
-  font-size: 28rpx;
+  font-size: 32rpx;
 }
 .list text{
-  color: #999;
+  color: #888;
   display: block;
   overflow: hidden;
     text-overflow: ellipsis;
@@ -133,15 +135,13 @@ scroll-view{
 .ly text{
   display: block;
   color: #666;
-  font-size: 22rpx;
+  font-size: 24rpx;
 }
 .ly view{
   float: right;
   text-align: right;
 }
-.ly view text{
-  /* font-size: 18rpx; */
-}
+
 .menu{
   width: 28%;
   background: #fff;

pages/list/list.js

@@ -41,8 +41,10 @@ Page({
           data:data,
           success: function (res) {
             wx.hideNavigationBarLoading()
+            var nowx = res.data.data.list.filter(item => !item.wxcode)
             that.setData({
-              list: res.data.data.list
+              list: res.data.data.list,
+              nowx: nowx
             })
           }
         })

pages/list/list.wxml

@@ -3,7 +3,8 @@
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 
-<navigator url="../journalDetail/journalDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}">
+<block  wx:for='{{list}}' >
+<navigator wx:if='{{item.wxcode}}' url="../journalDetail/journalDetail?id={{item.id}}" class="list" wx:key="journals{{index}}">
               <image  mode="widthFix" src="{{item.img}}"></image>
               <view>
                   <view class="title">{{item.name}}</view>
@@ -11,4 +12,17 @@
                   <text>主编：{{item.editor}}</text>
                   <text class="">主办单位：{{item.organizers}}</text>
               </view>
-</navigator>
+</navigator>
+</block>
+<view wx:if='{{nowx.length>0}}' style="color:#999;padding:20rpx 0 0;">以下期刊未开通公众号</view>
+<block  wx:for='{{list}}'>
+<navigator wx:if='{{!item.wxcode}}' url="../journalDetail/journalDetail?id={{item.id}}" class="list" wx:key="journals{{index}}">
+              <image  mode="widthFix" src="{{item.img}}"></image>
+              <view>
+                  <view class="title">{{item.name}}</view>
+                  <text>微信号：{{item.wxcode}}</text>
+                  <text>主编：{{item.editor}}</text>
+                  <text class="">主办单位：{{item.organizers}}</text>
+              </view>
+</navigator>
+</block>

pages/order/order.wxml

@@ -43,6 +43,6 @@
     <view  class="bg" bindtap="close"></view>
     <view class="ww">
         <text style="font-size:34rpx;font-weight:bold;text-align:center;display:block;margin:10rpx;">线上会议地址</text>
-        <text>{{online_address}}</text>
+        <text user-select="true" class="addr">{{online_address}}</text>
     </view>
 </view>

pages/order/order.wxss

@@ -65,7 +65,7 @@ page{
   font-size: 22rpx;
 }
 .btn{
-  width: 132rpx;
+  /* width: 132rpx; */
   height: 56rpx;
   background: #09A65E;
   border-radius: 6px;
@@ -76,6 +76,7 @@ page{
   position: absolute;
   bottom: 28rpx;
   right: 28rpx;
+  padding: 0 6rpx;
 }
 .ewm{
   position: fixed;
@@ -106,8 +107,9 @@ page{
   left: 0;
   right: 0;
   margin: auto;
-  height: 50vh;
+  height: 60vh;
   z-index: 99;
+  overflow: auto;
 }
 .form{
   background: #fff;
@@ -139,4 +141,7 @@ page{
 .form text{
   color: #999;
   font-size: 26rpx;
+}
+.addr{
+  word-break: break-all;
 }