Merge branch 'master' of ssh://192.168.1.202:8088/lx/shares

pages/attention/attention.js

@@ -93,8 +93,7 @@ Page({
     var that = this;
     // 获取系统信息 
     wx.getSystemInfo({
-      success: function(res) {
-        
+      success: function(res) {    
         that.setData({
           winWidth: res.windowWidth,
           winHeight: res.windowHeight

pages/drop/drop.js

@@ -196,12 +196,12 @@ Page({
   //获取上周实际
   getdeclast:function(){
     var that = this;
-    var getinclast = wxRequest.postRequest(Api.getdeclast());
+    var getinclast = wxRequest.getRequest(Api.getdeclast());
     getinclast.then((res)=>{
       // console.log(res)
       if(res.statusCode==200){
        that.setData({
-        realData:res.data.value
+        realData:res.data.data
        })
       }
     })
@@ -209,12 +209,12 @@ Page({
     //获取上周预测
     getdeclpred:function(){
       var that = this;
-      var getinclast = wxRequest.postRequest(Api.getdeclpred());
+      var getinclast = wxRequest.getRequest(Api.getdeclpred());
       getinclast.then((res)=>{
         // console.log(res)
         if(res.statusCode==200){
          that.setData({
-          onperData:res.data.value
+          onperData:res.data.data
          })
         }
       })
@@ -222,12 +222,12 @@ Page({
       //获取下周预测
       getdecnpred:function(){
         var that = this;
-    var getinclast = wxRequest.postRequest(Api.getdecnpred());
+    var getinclast = wxRequest.getRequest(Api.getdecnpred());
     getinclast.then((res)=>{
       // console.log(res)
       if(res.statusCode==200){
        that.setData({
-        uperData:res.data.value
+        uperData:res.data.data
        })
       }
     })

pages/drop/drop.wxml

@@ -12,7 +12,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{uperData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -21,7 +21,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button  class="mini-btn" type="warn" size="mini" >+{{commom.Intercept(item.Value)}}%</button>
+              <button  class="mini-btn" type="warn" size="mini" >+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>
@@ -33,7 +33,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{realData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -42,7 +42,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.Value)}}%</button>
+              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>
@@ -54,7 +54,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{onperData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -63,7 +63,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.Value)}}%</button>
+              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>

pages/item/item.js

@@ -334,6 +334,7 @@ Page({
   },
   // 点击tab切换 
   swichNav: function(e) {
+    console.log(e)
     var that = this;
     if (this.data.currentTab === e.target.dataset.current) {
       return false;
@@ -347,49 +348,64 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // console.log(options)
+    console.log(options)
     var Name = "object.Name"
     var value = "object.value"
     var color='object.color'
     let  realcolor="realchartData.color",nextcolor="nextchartData.color", Values,colors
-    if(JSON.parse(options.row).Tag){
-       Values="+"+JSON.parse(options.row).Value.toFixed(2)+"%";
+    if(JSON.parse(options.row).industryTag){
+       Values="+"+JSON.parse(options.row).industryValue.toFixed(2)+"%";
        colors="#D81E06";
     }else{
-      Values="-"+JSON.parse(options.row).Value.toFixed(2)+"%"
+      Values="-"+JSON.parse(options.row).industryValue.toFixed(2)+"%"
       colors="#07c160"
 
     }
     this.setData({
-   [Name]:JSON.parse(options.row).Name,
+   [Name]:JSON.parse(options.row).industryName,
    [value]:Values,
    [color]:colors,
    [realcolor]:colors,
    [nextcolor]:colors,
     })
   var that = this;
-  that.postbyiid(JSON.parse(options.row).IID,)
-  that.postnewsbyiid(JSON.parse(options.row).IID)
+  that.posthisfind(JSON.parse(options.row).industryId,)
+  that.postpredfind(JSON.parse(options.row).industryId,)
   },
     //获取数据
-    postbyiid:function(){
+    posthisfind:function(){
       var that = this;
-      var postbyiid = wxRequest.postRequest(Api.postbyiid(),{'iid':'12'});
+      var postbyiid = wxRequest.postRequest(Api.posthisfind(),['880493']);
       postbyiid.then((res)=>{
-        // console.log(res)
+        console.log(res)
         // console.log(that.recursion(res.data))
         if(res.statusCode==200){
          that.setData({
-          realchartData:that.recursion(res.data)
+          realchartData:that.recursion(res.data.data),
+          newsData:res.data.data.news
          })
         }
       })
     },
+      //获取下周预测数据
+      postpredfind:function(){
+        var that = this;
+        var postbyiid = wxRequest.postRequest(Api.postpredfind(),['880493']);
+        postbyiid.then((res)=>{
+          console.log(res)
+          // console.log(that.recursion(res.data))
+          if(res.statusCode==200){
+            that.setData({
+              nextchartData:that.recursion(res.data.data),
+            })
+          }
+        })
+      },
     recursion:function(row,a=[],b=[],c=[],d){
-        for(let i in row.data){
-        a.push(row.data[i].Date)
-        b.push(row.data[i].Close)
-        c.push(row.data[i].Pred)
+        for(let i in row.actuals){
+        a.unshift(row.actuals[i].industryDate)
+        b.unshift(row.actuals[i].close)
+        c.unshift(row.actuals[i].pred)
         }
         if(row.tag){
           d="#D81E06"
@@ -399,27 +415,7 @@ Page({
 
       return {"timeData":a,"actual":b,"prediction":c,"color":d}
       },
-     //获取新闻
-     postnewsbyiid:function(){
-      var that = this;
-      var postbyiid = wxRequest.postRequest(Api.postnewsbyiid(),{'iid':'12'});
-      postbyiid.then((res)=>{
-        // console.log(res)
-        // NID: "新闻id"
-        // Title: "标题"
-        // From: "来源"
-        // MiniContent: "内容"
-        // EID: ""
-        // Date: "时间"
-        // Tag: "情绪"
-        // console.log(that.recursion(res.data))
-        if(res.statusCode==200){
-         that.setData({
-          newsData:res.data.data
-         })
-        }
-      })
-    },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/item/item.wxml

@@ -31,7 +31,7 @@
     </swiper-item>
 
     <swiper-item catchtouchmove='catchTouchMove'>
- <ec-canvas  id="mychart-dom-line" canvas-id="mychart-line" tuData="{{ nextchartData }}" ec="{{ ec }}"></ec-canvas>
+    <ec-canvas  id="mychart-dom-line" canvas-id="mychart-line" tuData="{{ nextchartData }}" ec="{{ ec }}"></ec-canvas>
     </swiper-item>
   </swiper>
 </view>
@@ -40,10 +40,10 @@
   </view>
 
   <block wx:for-index="idx" wx:for='{{newsData}}' wx:key="key" >
-    <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 class='content-item' bindtap="onFold" data-id="{{item.newsId}}" >
+      <text class='from' >{{item.newsFrom}}</text>
+      <text class='name'>{{item.newsTitle}}</text>
+      <text class='wawa'>{{item.newsMiniContent}}</text>
+      <text class='time'>{{item.newsDate}}</text>
     </view>
 </block> 

pages/rise/rise.js

@@ -196,12 +196,12 @@ Page({
   //获取上周实际
   getinclast:function(){
     var that = this;
-    var getinclast = wxRequest.postRequest(Api.getinclast());
+    var getinclast = wxRequest.getRequest(Api.getinclast());
     getinclast.then((res)=>{
-      // console.log(res)
+      console.log(res)
       if(res.statusCode==200){
        that.setData({
-        realData:res.data.value
+        realData:res.data.data
        })
       }
     })
@@ -209,12 +209,12 @@ Page({
     //获取上周预测
     getinclpred:function(){
       var that = this;
-      var getinclast = wxRequest.postRequest(Api.getinclpred());
+      var getinclast = wxRequest.getRequest(Api.getinclpred());
       getinclast.then((res)=>{
         // console.log(res)
         if(res.statusCode==200){
          that.setData({
-          onperData:res.data.value
+          onperData:res.data.data
          })
         }
       })
@@ -222,12 +222,12 @@ Page({
       //获取下周预测
       getincnpred:function(){
         var that = this;
-    var getinclast = wxRequest.postRequest(Api.getincnpred());
+    var getinclast = wxRequest.getRequest(Api.getincnpred());
     getinclast.then((res)=>{
       // console.log(res)
       if(res.statusCode==200){
        that.setData({
-        uperData:res.data.value
+        uperData:res.data.data
        })
       }
     })

pages/rise/rise.wxml

@@ -12,7 +12,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{uperData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -21,7 +21,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button  class="mini-btn" type="warn" size="mini" >+{{commom.Intercept(item.Value)}}%</button>
+              <button  class="mini-btn" type="warn" size="mini" >+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>
@@ -33,7 +33,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{realData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -42,7 +42,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.Value)}}%</button>
+              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>
@@ -54,7 +54,7 @@
       <view class="swiper-box-list">
         <view wx:for="{{onperData}}"class="swiper-box-view" wx:key="index" bindtap="open" data-row='{{item}}'>
           <view class="swiper-box-left">
-            <view>{{item.Name}}</view>
+            <view>{{item.industryName}}</view>
             <!-- <view class="swiper-box-subtitle">{{item.subtitle}}</view> -->
           </view>
           <view class="swiper-box-right">
@@ -63,7 +63,7 @@
             </view> -->
             <view class="swiper-box-button">
               <!-- <view>{{item.digital}}</view> -->
-              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.Value)}}%</button>
+              <button class="mini-btn" type="warn" size="mini">+{{commom.Intercept(item.industryValue)}}%</button>
             </view>
           </view>
         </view>

utils/api.js

@@ -1,44 +1,44 @@
 
-var HOST_URI = 'http://192.168.1.60:6900';
+var HOST_URI = 'http://192.168.1.73:28002';
 module.exports = {  
   // 获取涨幅上周实际
   getinclast: function (obj) {
-    var url =HOST_URI + '/inc/last';
+    var url =HOST_URI + '/api/inc/last';
     return url;
   },
     // 获取涨幅上周预测
     getinclpred: function (obj) {
-      var url =HOST_URI + '/inc/lpred';
+      var url =HOST_URI + '/api/inc/lpred';
       return url;
     },
       // 获取涨幅下周预测
   getincnpred: function (obj) {
-    var url =HOST_URI + '/inc/npred';
+    var url =HOST_URI + '/api/inc/npred';
     return url;
   },
-    // 获取跌幅上周实际
-    getdeclast: function (obj) {
-      var url =HOST_URI + '/dec/last';
-      return url;
-    },
-      // 获取跌幅上周预测
-      getdeclpred: function (obj) {
-        var url =HOST_URI + '/dec/lpred';
-        return url;
-      },
-        // 获取跌幅下周预测
-    getdecnpred: function (obj) {
-      var url =HOST_URI + '/dec/npred';
+  // 获取跌幅上周实际
+  getdeclast: function (obj) {
+    var url =HOST_URI + '/api/dec/last';
+    return url;
+  },
+    // 获取跌幅上周预测
+    getdeclpred: function (obj) {
+      var url =HOST_URI + '/api/dec/lpred';
       return url;
     },
+      // 获取跌幅下周预测
+  getdecnpred: function (obj) {
+    var url =HOST_URI + '/api/dec/npred';
+    return url;
+  },
   // 获取详情
-  postbyiid: function (obj) {
-    var url =HOST_URI + '/his/byiid';
+  posthisfind: function (obj) {
+    var url =HOST_URI + '/api/his/find';
+    return url;
+  },
+  // 获取详情下周预测
+  postpredfind: function (obj) {
+    var url =HOST_URI + '/api/pred/find';
     return url;
   },
-    // 获取iid获取
-    postnewsbyiid: function (obj) {
-      var url =HOST_URI + '/news/byiid';
-      return url;
-    },
 }