tanyanfei 3 年之前
父节点
当前提交
54990dbcc6

+ 2 - 2
app.json

@@ -1,8 +1,8 @@
 {
   "pages": [
-    
-    "pages/index/index",
     "pages/learning/learning",
+    "pages/index/index",
+    
     "pages/number/number",
     "pages/mine/mine",
     "pages/knowledge/knowledge",

+ 5 - 0
app.wxss

@@ -77,4 +77,9 @@ image{
 }
 .xx{
   margin: 30rpx 0 40rpx;
+}
+.nowrap{
+  text-overflow: ellipsis !important;
+  overflow: hidden !important;
+  white-space: nowrap !important;
 }

+ 14 - 1
pages/index/index.js

@@ -37,7 +37,8 @@ Page({
     page_csi:1,
     total_csi: 0,
     yestoday:'',
-    top_csi:0
+    top_csi:0,
+    keyword:''
   },
 
 
@@ -48,6 +49,7 @@ Page({
     this.setData({
       day:y+'-'+m+'-'+d,
       month: y + '-' + m,
+      yestoday1: y + '-' + m + '-' + (d - 1),
       yestoday: y + '-' + m + '-' + (d-1)
     })
     this.getTimer()
@@ -319,6 +321,7 @@ Page({
         date: date,
         signup_id: subject_id,
         page:this.data.page_csi,
+        keyword: this.data.keyword
         // page_size:20
       },
       success: res => {
@@ -396,6 +399,16 @@ Page({
       url: '../searchList/searchList',
     })
   },
+  search1:function(e){
+    this.setData({
+      keyword: e.detail.value,
+      casci_list: [],
+      page_csi: 1,
+      total_csi: 0,
+      top_csi: 0
+    })
+    this.getcasci();
+  },
   //置顶
   top: function(e){
     var type = e.target.dataset.type;

+ 3 - 3
pages/index/index.wxml

@@ -13,7 +13,7 @@
         </block>
 </swiper>
 <view class="search"  wx:if="{{act==3}}"  style="margin-bottom:20rpx;">
-    <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <input bindinput="search1" value="{{keyword}}" placeholder-style='color:#C8C8C8;' placeholder="输入期刊名称进行搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 <view class="tab">
@@ -37,7 +37,7 @@
         <view wx:for='{{journals}}'>
           <view id="{{item.name}}" class="tt">{{item.name}}</view>
           <navigator url="../journalDetail/journalDetail?id={{item.id}}" class="list" wx:for='{{item.journals}}' wx:key="journals{{index}}">
-              <image  mode="widthFix" src="{{item.img}}"></image>
+              <image  src="{{item.img}}"></image>
               <view>
                   <view class="title">{{item.name}}</view>
                   <text>微信号:{{item.wxcode}}</text>
@@ -110,7 +110,7 @@
         </view>
         <view class="date">
             <view class="day" wx:if='{{select==0}}'>
-              <picker bindchange="bindDateChange" mode='date'  end='{{yestoday}}'
+              <picker bindchange="bindDateChange" mode='date'  end='{{yestoday1}}'
               value="{{yestoday}}">{{yestoday}}<image class="zk" mode="widthFix"  src="../images/zk.png"></image></picker>
             </view>
             <view class="day" bindtap="open" wx:if='{{select==1}}'>{{week}}<image class="zk" mode="widthFix"  src="../images/zk.png"></image></view>

+ 8 - 4
pages/index/index.wxss

@@ -8,6 +8,9 @@
   line-height: 64rpx;
   color: #C8C8C8;
 }
+.search input{
+  padding: 0;
+}
 .banner{
   margin: 20rpx 0;
   width: 100%;
@@ -94,12 +97,12 @@ scroll-view{
   
 }
 .list image{
-  width: 20%;
-  max-height: 100px;
+  width: 25%;
+  height: 200rpx;
 }
 .list>view{
-  width: 80%;
-  padding-left: 20rpx;
+  width: 75%;
+  padding-left: 30rpx;
   vertical-align: middle;
 }
 .list .title{
@@ -115,6 +118,7 @@ scroll-view{
   overflow: hidden;
   white-space: nowrap;
   font-size: 26rpx;
+  line-height: 50rpx;
 }
 .list .company{
   overflow: visible;

+ 4 - 6
pages/knowledge/knowledge.wxml

@@ -28,15 +28,13 @@
           <navigator url="../actDetail/actDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}">
               <image   src="{{item.img}}"></image>
               <view>
-                  <view class="title"> <rich-text nodes="{{item.name}}"></rich-text></view>
+                  <view class="title"> <rich-text nodes="<div style='overflow:hidden;white-space:nowrap;text-overflow:ellipsis;'>{{item.name}}</div>"></rich-text></view>
                   <view class="ly"> 
-                              <view>
-                                  <text>{{item.publish_time}}</text>
-                              </view>
+                              <text style="float:right;">{{item.publish_time}}</text>
                               <text>作者:{{item.author}}</text>
-                              <text></text> 
+                              <text class="">发布单位:{{item.journal_name}}</text>
                   </view>
-                  <text class="">发布单位:{{item.journal_name}}</text>
+                  
                   <text class="">{{item.desc}}</text>
               </view>
           </navigator>

+ 4 - 2
pages/knowledge/knowledge.wxss

@@ -57,6 +57,7 @@
 }
 .list .title{
   margin-bottom: 20rpx;
+  width: 90%;
   /* text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap; */
@@ -80,19 +81,20 @@
   font-size: 26rpx;
 }
 .ly{
-  margin-bottom: 20rpx;
+  margin-bottom: 10rpx;
 }
 .ly text{
   display: block;
   color: #666;
   font-size: 22rpx;
+  padding: 5rpx 0;
 }
 .ly view{
   float: right;
   text-align: right;
 }
 .ly view text{
-  font-size: 18rpx;
+  font-size: 22rpx;
 }
 scroll-view{
   background: #fff;

+ 17 - 2
pages/learning/learning.wxml

@@ -44,7 +44,13 @@
                           <image src="{{item.img}}"></image>
                           <view>
                               <view class="tt">{{item.name}}  </view>
-                              <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>
+                              
+                              <view class="ly"> 
+                              <view>
+                                  <text>{{item.begin_time}}</text>
+                              </view>
+                              <text class="nowrap">来源:{{item.organizer_name}}</text>
+                          </view>
                               <text>{{item.desc}}</text>
                           </view>
                       </navigator> 
@@ -61,6 +67,7 @@
                               <view class="ly"> 
                                   <view>
                                       <text>{{item.begin_time}}</text>
+                                      <text>{{item.address}}</text>
                                   </view>
                                   <text>主讲人:{{item.speaker}}</text>
                                   <text>{{item.publish_unit}}</text> 
@@ -119,8 +126,15 @@
                       <image  src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
-                          <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>
+                          <view class="ly"> 
+                              <view>
+                                  <text>{{item.begin_time}}</text>
+                              </view>
+                              <text class="nowrap">来源:{{item.organizer_name}}</text>
+                          </view>
                           <text>{{item.desc}}</text>
+
+                        
                       </view>
                   </navigator> 
                   <block wx:if='{{total_0 >= 20}}'>
@@ -139,6 +153,7 @@
                           <view class="ly"> 
                               <view>
                                   <text>{{item.begin_time}}</text>
+                                  <text>{{item.address}}</text>
                               </view>
                               <text>主讲人:{{item.speaker}}</text>
                               <text>{{item.publish_unit}}</text> 

+ 7 - 2
pages/learning/learning.wxss

@@ -69,7 +69,12 @@ scroll-view{
     -webkit-box-orient: vertical;
     white-space: normal;
 }
-
+.list .hy_ly{
+  width: 65%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .list{
   /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
   /* border-radius: 20rpx; */
@@ -135,7 +140,7 @@ scroll-view{
   text-align: right;
 }
 .ly view text{
-  font-size: 18rpx;
+  /* font-size: 18rpx; */
 }
 .menu{
   width: 28%;

+ 1 - 1
pages/search/search.js

@@ -56,7 +56,7 @@ Page({
           }
           for (let i = 0; i < data.length; i++) {
             data[i].name = data[i].name.replace(this.data.keyword, '<span style="color:#3780CD;">' + this.data.keyword + '</span>')
-
+            data[i].name = "<div style='overflow:hidden;white-space:nowrap;text-overflow:ellipsis;'>" + data[i].name + "</div>"
             list.push(data[i])
           }
           this.setData({

+ 2 - 0
pages/searchList/searchList.js

@@ -68,6 +68,7 @@ Page({
           }
           for (let i = 0; i <data.length;i++) {
             data[i]._name = data[i].name.replace(this.data.keyword, '<span style="color:#3780CD;">' + this.data.keyword+'</span>')
+            data[i]._name = "<div style='overflow:hidden;white-space:nowrap;text-overflow:ellipsis;'>" + data[i]._name + "</div>"
             list.push(data[i])
           }
           this.setData({
@@ -80,6 +81,7 @@ Page({
           for(let i=0;i<data.length;i++){
             for (let j = 0; j < data[i].list.length; j++) {
               data[i].list[j]._name = data[i].list[j].name.replace(this.data.keyword, '<span style="color:#3780CD;">' + this.data.keyword + '</span>')
+              data[i].list[j]._name = "<div style='overflow:hidden;white-space:nowrap;text-overflow:ellipsis;'>" + data[i].list[j]._name+"</div>"
             }
           }
           this.setData({

+ 1 - 0
pages/searchList/searchList.wxml

@@ -22,6 +22,7 @@
     <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>
+              
                   <view class="title"> <rich-text nodes="{{i._name}}"></rich-text></view>
                   <text>微信号:{{i.wxcode}}</text>
                   <text>主编:{{i.editor}}</text>