search

api/request.js

@@ -38,7 +38,6 @@ const service = {
     })
   }
 }
-
 module.exports = {
   // 获取新闻列表
   getNewsList: (data) => {
@@ -58,5 +57,11 @@ module.exports = {
       resolve(service.post(urls.search,data))
     })
   },
+  //热门搜索
+  hotSearch: (data) =>{
+    return new Promise((resolve,reject) =>{
+      resolve(service.post(urls.hotSearch,data))
+    })
+  }
 
 }

api/urls.js

@@ -1,8 +1,8 @@
 const host = 'http://192.168.1.60:6900';
 
 const urls ={
-    newsList:host + '/news/mainpage',
-    search: host + '/search'
+    newsList:host + '/news/list',
+    search: host + '/search',
+    hotSearch: host + '/search/hot'
 }
-
 module.exports = urls;

pages/index/index.js

@@ -300,6 +300,16 @@ Page({
       },
     ],
   },
+      //获取新闻列表
+      getNewsList:function(){
+        apiServer.getNewsList().then((res)=>{
+          if(res.statusCode == 200){
+            this.setData({
+              aa:res.data.data
+            })    
+          }
+        })
+      },
   //事件处理函数
   bindViewTap: function() {
     wx.navigateTo({
@@ -312,9 +322,9 @@ Page({
     // query.select('#test').boundingClientRect(function (res) {
     //    console.log(res.top);
     // }).exec();
-},
+ },
   onLoad: function () {
-    // this.getNewsList();
+    this.getNewsList();
     let sysinfo = wx.getSystemInfoSync(),
     windowHeight = sysinfo.windowHeight,
     statusHeight = sysinfo.statusBarHeight, 
@@ -423,11 +433,8 @@ Page({
     catchTouchMove:function(res){
       return false
     },
-    getNewsList:function(){
-      apiServer.getNewsList().then((res)=>{
-        console.log(res);
-      })
-    },
+
+
   //初始化图表
   init_echarts: function () {
     this.echartsComponnet.init((canvas, width, height) => {

pages/index/index.wxml

@@ -72,11 +72,11 @@
     <!-- <scroll-view scroll-y style='height:500rpx' class="tab"> -->
     <scroll-view scroll-y="true"  style='height: {{scrollHeight}}rpx' class="tab">
             <block wx:for-index="idx" wx:for='{{aa}}' wx:key="key" >
-            <view class='content-item' bindtap="onFold" data-id="{{item.id}}" >
-              <text class='from' >{{item.from}}</text>
-              <text class='name'>{{item.nickName}}</text>
-              <text class='wawa'>{{item.reward}}</text>
-              <text class='time'>{{item.time}}</text>
+            <view class='content-item' bindtap="onFold" data-id="{{item.NID}}" >
+              <text class='from' >{{item.From}}</text>
+              <text class='name'>{{item.Title}}</text>
+              <text class='wawa'>{{item.MiniContent}}</text>
+              <text class='time'>{{item.Date}}</text>
             </view>
           </block> 
     </scroll-view>

pages/search/search.js

@@ -30,7 +30,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.get
+    this.hotSearch();
     var _this = this;
     wx.getStorage({
       key: 'historySearch',
@@ -53,7 +53,10 @@ Page({
     };
     apiServer.getSearch(data).then((res) =>{
       if(res.statusCode == 200){
-        console.log(res.data);
+        this.setData({
+          resultList:res.data.value
+         }
+        )
       }else{
         wx.showToast({
           title: '搜索失败',
@@ -63,6 +66,15 @@ Page({
       
     }) 
   },
+  hotSearch: function(){
+    apiServer.hotSearch().then((res)=>{
+      if(res.statusCode == 200){
+        this.setData({
+          hotList:res.data.data
+        })
+      }
+    })
+  },
   save: function () {
     var list = this.data.list;
     if (list.indexOf(this.data.inputValue) == -1 & this.data.inputValue != '') {
@@ -112,13 +124,12 @@ Page({
    },100)
  },
  detail:function(e){
+  console.log(e);
   this.save();
   wx.navigateTo({
-    url: '../item/item'
+    url: '../item/item?row='+JSON.stringify(e.currentTarget.dataset.row)
   });
-
  },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/search/search.wxml

@@ -1,4 +1,5 @@
 <!--pages/search/search.wxml-->
+<wxs module="commom" src="../../components/commom.wxs"></wxs>
 <view class='container2'>
   <view  class='search_input'>
     <icon type="search" size="15" class='search_icon' />
@@ -13,7 +14,6 @@
      <!-- <image src='../images/delete.png' wx:if="{{list.length!=0}}"  catchtap='remove'></image> -->
      <image src='./images/delete.png'  catchtap='remove'></image>
   </view>
-
   <view class='list'>
      <view class="key" wx:if="{{list.length==0}}">暂无搜索记录</view>
      <view class="key" wx:for="{{list}}" wx:key="key" bindtap='searchName' data-value='{{item}}'>{{item}}</view>
@@ -21,14 +21,14 @@
   <view style="clear:both"></view>
    <!-- <view  class='search_result' wx:if="{{inputValue}}"> -->
    <view  class='search_result' wx:if="{{inputValue}}">
-       <view wx:for="{{resultList}}"class="swiper-box-view" wx:key="key" bindtap='detail' data-index="{{index}}">
+       <view wx:for="{{resultList}}" class="swiper-box-view" wx:key="key" bindtap='detail' data-row='{{item}}'>
           <view class="swiper-box-left">
-          <view>{{item.title}}</view>
-          <view class="swiper-box-subtitle">{{item.subtitle}}</view>
+          <view>{{item.Name}}</view>
+          <!-- <view class="swiper-box-subtitle">{{item.Name}}</view> -->
         </view>
         <view class="swiper-box-right">
           <view class="swiper-box-button">
-            <button  class="mini-btn" type="warn" size="mini" >+{{item.Increase}}</button>
+            <button  class="mini-btn" type="warn" size="mini" >+{{commom.Intercept(item.Value)}}%</button>
           </view>
         </view>
        </view>
@@ -39,12 +39,9 @@
         热门搜索
      </view>
   </view>
-  <view class='list'>
-      <view class="key">中国移动</view>
-      <view class="key">中国联通</view>
-      <view class="key">中国电信</view>
+  <view class='list' wx:for="{{hotList}}" wx:key="key" bindtap='searchName' data-index="{{index}}">  
+      <view class="key">{{item.Name}}</view>
   </view>
-
 </view>
   
 

pages/search/search.wxss

@@ -43,7 +43,7 @@
   width: 690rpx;
   border-bottom:1rpx solid rgba(239,239,239,1);
   margin: auto;
-  padding:30rpx 0;
+  padding:15rpx 0;
   /* color: #070707; */
   color: #ffffff;
   font-weight:400;