bug

pages/eventDetail/eventDetail.js

@@ -59,9 +59,12 @@ Page({
       },
       success: function (res) {
         wx.hideNavigationBarLoading();
+        const info = res.data.data
+        if (info.sign_note) { info.sign_note = info.sign_note.replace(/\\n/, '\n')}
         that.setData({
-          info: res.data.data
+          info: info
         })
+        that.init()
       },
       fail: function () {
         wx.hideLoading();
@@ -88,6 +91,16 @@ Page({
       },
     })
   },
+  init: function () {
+    const query = wx.createSelectorQuery()
+    const that = this
+    query.select('#editor').context(function (res) {
+      res.context.setContents({
+        html: that.data.info.content
+      })
+    })
+      .exec()
+  },
   upload:function(){
     wx.chooseImage({
       count:0,

pages/eventDetail/eventDetail.wxml

@@ -25,6 +25,12 @@
     <text bindtap="zk2" class="zksq"  wx:if='{{!zk2}}'>展开</text>
 </view>
 
+<view>
+    <view class="tt">会议内容</view>
+    <editor style="margin:10px 0;padding:0 10px;" read-only="{{true}}" id="editor"  class="ql-container">
+    </editor>
+</view>
+
                               
 <button wx:if='{{info.is_signup}}' bindtap="open" class="post">我要报名</button>
 
@@ -87,7 +93,7 @@
             <text>(!参会人员需先缴纳会议费,才能预订酒店住房)</text>
           </view>
           <view class="form_info">
-                {{info.sign_note}}
+                <text>{{info.sign_note}}</text>
                 <!-- <text>会议费有以下2种方式付款:</text>
                 <text>(1）转账汇款（公对公转账)。备注:姓名+29次年会转账汇款信息:</text>
                 <text>单位名称：中国科学院文献情报中心</text>

pages/eventDetail/eventDetail.wxss

@@ -236,4 +236,9 @@ page{
   color: #666;
   font-size: 30rpx;
   line-height: 50rpx;
+}
+
+.ql-container{
+  height: auto;
+  min-height:0;
 }

pages/index/index.wxml

@@ -1,5 +1,6 @@
 <view class="search" bindtap='search' wx:if="{{act!=3}}">
-    <input bindfocus="search" placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <!-- <input bindfocus="search" placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input> -->
+    输入名称/关键字搜索
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 
@@ -29,7 +30,7 @@
   </view>
 </view>
 
-<swiper circular="{{true}}" style="height:60vh;" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
+<swiper class="myswiper" circular="{{true}}"  bindchange='swchange' current='{{act}}' autoplay="{{false}}">
 <!-- 全刊 -->
   <swiper-item>
     <scroll-view scroll-y="true" scroll-into-view="{{scroll}}" class="content">

pages/index/index.wxss

@@ -1,5 +1,13 @@
 /**index.wxss**/
-
+.search{
+  height: 64rpx;
+  background: #fff;
+  border-radius: 15rpx;
+  width: 100%;
+  padding: 0 24rpx;
+  line-height: 64rpx;
+  color: #C8C8C8;
+}
 .banner{
   margin: 20rpx 0;
   width: 100%;
@@ -259,4 +267,7 @@ scroll-view{
     position: absolute;
     right: 0;
     top: 2rpx;
+}
+.myswiper{
+  height: calc(100vh - 446rpx);
 }

pages/knowledge/knowledge.wxml

@@ -22,7 +22,7 @@
 
 
 
-<swiper circular="{{true}}" style="height:83vh;" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
+<swiper circular="{{true}}" class="myswiper" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
   <swiper-item>
       <scroll-view scroll-y="true" scroll-into-view="{{scroll}}" class="content">
           <navigator url="../actDetail/actDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}">

pages/knowledge/knowledge.wxss

@@ -118,4 +118,7 @@ scroll-view{
   line-height: 60rpx;
   text-align: center;
   color: #999;
+}
+.myswiper{
+  height: calc(100vh - 186rpx);
 }

pages/learning/learning.wxml

@@ -1,8 +1,12 @@
-<view class="search" bindtap='search'>
+<view class="search" bindtap='search' wx:if='{{act!=0}}'>
     <input   placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
-<view class="menu">
+<view class="search" bindtap='search' wx:else style="width:100%;">
+    <input   placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <image  mode="widthFix" src="../images/search.png"></image>
+</view>
+<view class="menu" wx:if='{{act!=0}}'>
     <view class="picker" bindtap="showmenu">
         {{array[index]}} <text class="up"></text>
     </view>
@@ -18,7 +22,7 @@
 </view>
 
 
-<swiper circular="{{true}}" style="height:83vh;" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
+<swiper class="myswiper" circular="{{true}}" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
   <swiper-item>
       <scroll-view scroll-y="true">
           <block wx:if='{{!show_tj}}'>
@@ -34,7 +38,7 @@
               </view>
 
               <view class="part">
-                  <view class="title">热门会议   <text bindtap="more" data-id='2'>查看更多</text></view>
+                  <view class="title">热门活动   <text bindtap="more" data-id='2'>查看更多</text></view>
                   <view class="hd">
                       <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}"  url="../eventDetail/eventDetail?id={{item.id}}">
                           <image src="{{item.img}}"></image>

pages/learning/learning.wxss

@@ -49,13 +49,14 @@ scroll-view{
 .tj view{
   color: #333;
   font-size: 28rpx;
-  margin: 28rpx 0;
+  margin: 20rpx 0;
   overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     white-space: normal;
+    height: 80rpx;   
 }
 .tj text{
   display: block;
@@ -178,4 +179,7 @@ scroll-view{
   line-height: 60rpx;
   text-align: center;
   color: #999;
+}
+.myswiper{
+  height: calc(100vh - 206rpx);
 }

pages/searchList/searchList.wxml

@@ -14,7 +14,7 @@
 </view>
 
 <view wx:if='{{act==0}}' class="part" wx:for='{{data}}'>
-    <view class="title">{{item.name}}   <text bindtap="more" data-index='{{index+1}}' data-id='{{item.value}}'>查看更多</text></view>
+    <view class="title" wx:if='{{item.list.length>0}}'>{{item.name}}   <text bindtap="more" data-index='{{index+1}}' data-id='{{item.value}}'>查看更多</text></view>
     <navigator  url="../journalDetail/journalDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="journal"&& idx<3}}'>
               <image  src="{{i.img}}"></image>
               <view>
@@ -55,7 +55,7 @@
 </view>
 <view wx:if='{{act!=0}}' class="part" wx:for='{{data}}'>
 
-    <navigator  url="../journalDetail/journalDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}'>
+    <navigator  url="../journalDetail/journalDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type && type=="journal"}}'>
               <image  src="{{i.img}}"></image>
               <view>
                   <view class="title">{{i.name}}</view>
@@ -64,28 +64,28 @@
                   <text class="">主办单位：{{i.publishingUnit}}</text>
               </view>
     </navigator>
-    <navigator url="../list/list?organizer_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="organizer" && idx<3}}' >
+    <navigator url="../list/list?organizer_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type && type=="organizer"}}' >
               <image  src="{{i.img}}"></image>
               <view>
                   <view class="title">{{i.name}}</view>
                   <text class="wrap">{{i.desc}}</text>
               </view>
     </navigator>
-    <navigator url="../actDetail/actDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' >
+    <navigator url="../actDetail/actDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type && type=="article"}}' >
               <image  mode="widthFix" src="{{i.img}}"></image>
               <view>
                   <view class="title">{{i.name}}</view>
                   <text class="wrap">{{i.desc}}</text>
               </view>
     </navigator>
-    <navigator url="../conference/conference?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' >
+    <navigator url="../conference/conference?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type && type=="conference"}}' >
               <image src="{{i.img}}"></image>
               <view>
                   <view class="title">{{i.name}}</view>
                   <text class="wrap">{{i.desc}}</text>
               </view>
     </navigator>
-    <navigator url="../list/list?subject_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' style='padding-left:0;'>
+    <navigator url="../list/list?subject_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type && type=="subject"}}' style='padding-left:0;'>
               <!-- <image  mode="widthFix" src="{{i.img}}"></image> -->
               <view>
                   <view class="title">{{i.name}}</view>