no message

mini/pages/data-center/index.js

@@ -307,7 +307,7 @@ Page({
         series: [{
           type: type,
           data: data.data,
-          left:"center",
+          left: "center",
         }],
         width: "70%",
         xAxis: {},
@@ -372,48 +372,48 @@ Page({
       }
     } else if (type == 'bar') {
       option = {
-        xAxis: {
-          data: data.legends,
-          axisLabel: {
-            color: "#000",
-            interval: 0,
-            formatter: function (value) {
-              if (value.length > 4) {
-                return value.substring(0, 4) + "...";
-              } else {
-                return value;
+          xAxis: {
+            data: data.legends,
+            axisLabel: {
+              color: "#000",
+              interval: 0,
+              formatter: function (value) {
+                if (value.length > 4) {
+                  return value.substring(0, 4) + "...";
+                } else {
+                  return value;
+                }
               }
-            }
+            },
           },
-        },
-        yAxis: {},
-        series: [{
-          type: type,
-          data: data.values.flat()
-        }],
-        tooltip: {
-          show: true,
-          trigger: 'axis',
-          triggerOn: 'click',
-          axisPointer: {
-            type: 'cross',
-            axis: "x",
+          yAxis: {},
+          series: [{
+            type: type,
+            data: data.values.flat()
+          }],
+          tooltip: {
+            show: true,
+            trigger: 'axis',
+            triggerOn: 'click',
+            axisPointer: {
+              type: 'cross',
+              axis: "x",
+            },
+            showContent: false
+          },
+          grid: {
+            left: '15%'
           },
-          showContent: false
-        },
-        grid: {
-          left: '15%'
-        },
-      },
-      option.title = {
-        text: data.info.flat().join('-'),
-        left: 'center',
-        bottom: 10,
-        textStyle: {
-          fontSize: 14,
-          color: "#5992fd"
         },
-      }
+        option.title = {
+          text: data.info.flat().join('-'),
+          left: 'center',
+          bottom: 10,
+          textStyle: {
+            fontSize: 14,
+            color: "#5992fd"
+          },
+        }
     } else {
       option.xAxis.show = true
       var values = data.values
@@ -483,7 +483,7 @@ Page({
   },
   detailInfo: function () {
     wx.navigateTo({
-      url: '../detailInfo/detailinfo',
+      url: '../detailInfo/detailinfo?id=' + this.data.project_ids[0],
     })
   },
   /**

mini/pages/detailInfo/detailData.js

@@ -1,10 +1,14 @@
 // pages/detailInfo/detailData.js
+import http from '../../utils/http'
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    date: "",
+    project_id: "",
+    datainfo: {},
     th: ["租赁设备", "提交人", "金额"],
     td: [
       [
@@ -34,7 +38,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      date: options.date,
+      project_id: options.id - 0
+    })
+    this.getOrderDetails()
   },
 
   /**
@@ -43,7 +51,21 @@ Page({
   onReady: function () {
 
   },
-
+  getOrderDetails() {
+    http({
+      url: 'orders/getOrderDetails',
+      data: {
+        date: this.data.date,
+        project_id: this.data.project_id
+      },
+      success: (res) => {
+        console.log(res)
+        if (res.code == 0) {
+
+        }
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

mini/pages/detailInfo/detailData.wxml

@@ -52,7 +52,7 @@
         </view>
         <view class="sg-item sg-margin-tb-sm sg-flex">
           <view class="sg-right-item sg-width-50">状态：</view>
-          <view class="sg-right-item sg-width-50" style="text-align: right;">待确认</view>
+          <view class="sg-right-item sg-width-50" style="text-align: right;color:#5693FC;">待确认</view>
         </view>
       </view>
     </view>

mini/pages/detailInfo/detailinfo.js

@@ -10,7 +10,7 @@ Page({
   data: {
     min_date: "",
     max_date: "",
-    date: "",
+    date: 0,
     all: 0,
     selectIndex: 2,
     list: [{
@@ -25,14 +25,20 @@ Page({
         name: "未解决",
         value: 0
       }
-    ]
+    ],
+    years: [],
+    project_id: "",
+    project_list: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getDateInfo()
+    // this.getDateInfo()
+    this.setData({
+      project_id: options.id - 0
+    })
     this.getYears()
   },
 
@@ -42,39 +48,66 @@ Page({
   onReady: function () {
 
   },
-  getDateInfo() {
-    var that = this
-    http({
-      url: 'data/getDateInfo',
-      data: {},
-      success: function (res) {
-        if (res.code == 0) {
-          that.setData(res.data)
-        }
-      }
-    })
-  },
-  detailDatainfo() {
+  // getDateInfo() {
+  //   var that = this
+  //   http({
+  //     url: 'data/getDateInfo',
+  //     data: {},
+  //     success: function (res) {
+  //       if (res.code == 0) {
+  //         that.setData(res.data)
+  //       }
+  //     }
+  //   })
+  // },
+  detailDatainfo(e) {
+    let date = this.data.project_list[e.currentTarget.dataset.index].date
     wx.navigateTo({
-      url: '../detailInfo/detailData',
+      url: '../detailInfo/detailData?id=' + this.data.project_id + '&date=' + date,
     })
   },
   onstatusChange(e) {
     this.setData({
       all: e.detail.value,
-      selectIndex: this.data.list[e.detail.value].value
+      selectIndex: this.data.list[e.detail.value].value,
+      project_list: []
     })
+    this.getMonthData()
+  },
+  onChange(e) {
+    this.setData({
+      date: e.detail.value,
+      project_list: []
+    })
+    this.getMonthData()
   },
   getMonthData() {
-
+    http({
+      url: 'orders/getOrderview',
+      data: {
+        year: this.data.years[this.data.date],
+        status: this.data.selectIndex,
+        project_id: this.data.project_id
+      },
+      success: (res) => {
+        if (res.code == 0) {
+          this.setData({
+            project_list: res.data
+          })
+        }
+      }
+    })
   },
   getYears() {
     http({
-      url: 'Order/getYears',
+      url: 'orders/getYears',
       data: {},
-      success: function (res) {
+      success: (res) => {
         if (res.code == 0) {
-          console.log(res)
+          this.setData({
+            years: res.data
+          })
+          this.getMonthData()
         }
       }
     })

mini/pages/detailInfo/detailinfo.wxml

@@ -8,16 +8,15 @@
   </view>
   <view class="sg-chart-box" style="background:#fff">
     <view class="sg-flex sg-pad sg-align-center sg-space-between">
-      <picker mode="date" value="{{date}}" start="{{min_date}}" end="{{max_date}}" bindchange="onChange"
-        data-name="date" fields="month">
+      <picker value="{{date}}" range="{{years}}" bindchange="onChange">
         <view class="picker">
           <view class="sg-font-small sg-pad-tb-sm sg-flex sg-align-center" style="color:#5693FC">
-            <text style="margin-right:8rpx">{{date}}</text>
+            <text style="margin-right:8rpx">{{years[date]}}</text>
             <van-icon name="arrow-down" class="sg-icon"></van-icon>
           </view>
         </view>
       </picker>
-      <picker value="{{all}}" range="{{list}}" range-key="name"  bindchange="onstatusChange">
+      <picker value="{{all}}" range="{{list}}" range-key="name" bindchange="onstatusChange">
         <view class="picker">
           <view class="sg-font-small sg-pad-tb-sm sg-flex sg-align-center" style="color:#5693FC">
             <text style="margin-right:8rpx">订单状态：{{list[all].name}}</text>
@@ -27,17 +26,20 @@
       </picker>
     </view>
 
-    <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" wx:for="{{6}}" wx:key="index" bindtap="detailDatainfo" data-index="{{index}}">
+    <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" wx:for="{{project_list}}" wx:key="index"
+      bindtap="detailDatainfo" data-index="{{index}}">
       <view class="sg-top sg-flex sg-space-between sg-pad-bottom-sm sg-font-small sg-bold">
         <view class="sg-name sg-flex sg-align-center">
-          账单单号：xxxxxx
+          账单单号：{{item.order_sn}}
         </view>
-        <view class="sg-flex sg-align-center" wx:if="{{false}}" style="padding:10rpx;background-color: #5693FC;border-radius: 50rpx;">
+        <view class="sg-flex sg-align-center" wx:if="{{item.status=='未确认'}}"
+          style="padding:10rpx;background-color: #5693FC;border-radius: 50rpx;">
           <view class="sg-status sg-flex sg-align-center">
             <view class="sg-status-name" style="color:#fff;font-size:26rpx">未确认</view>
           </view>
         </view>
-        <view class="sg-flex sg-align-center" wx:else style="padding:10rpx;background-color: #19be6b;border-radius: 50rpx;">
+        <view class="sg-flex sg-align-center" wx:else
+          style="padding:10rpx;background-color: #19be6b;border-radius: 50rpx;">
           <view class="sg-status sg-flex sg-align-center">
             <view class="sg-status-name" style="color:#fff;font-size:26rpx">已确认</view>
           </view>
@@ -45,15 +47,15 @@
       </view>
       <view class="sg-body sg-font-xs sg-bottom-border  sg-pad-bottom-sm">
         <view class="sg-item sg-margin-tb-sm sg-flex">
-          <view class="sg-left-item">年月：2020年9月</view>
+          <view class="sg-left-item">年月：{{item.date}}</view>
         </view>
         <view class="sg-item sg-margin-tb-sm sg-flex">
-          <view class="sg-left-item sg-width-50">金额：10200元</view>
-          <view class="sg-right-item sg-width-50">对应项目：xx项目</view>
+          <view class="sg-left-item sg-width-50">金额：{{item.total_price}}</view>
+          <view class="sg-right-item sg-width-50">对应项目：{{item.project_id}}</view>
         </view>
         <view class="sg-item sg-margin-tb-sm sg-flex">
-          <view class="sg-right-item sg-width-50">确认人：项目经理</view>
-          <view class="sg-right-item sg-width-50">对账时间：2020-09-28</view>
+          <view class="sg-right-item sg-width-50">确认人：{{item.confirmation_user_id}}</view>
+          <view class="sg-right-item sg-width-50">对账时间：{{item.confirmation_time}}</view>
         </view>
       </view>
     </view>