订单按接口数据加载显示UI

pages/orderList/orderDetail/orderDetail.js

@@ -1,47 +1,16 @@
 // pages/orderList/orderBaseInfo/orderBaseInfo.js
-var network = require("../../../utils/net.js");
-const app = getApp();
 
-function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
-  let getArr = [];
-  let method = outStoreMethod;
-  let params = [true, CheckedPageIndex, CheckedPageSize];
-  network.newRequestLoading(method, params, function(res) {
-    var array = res.result;
-    if (array.length <= 0) {
-      wx.showToast({
-        title: '无数据更新',
-      })
-      if (CheckedPageIndex > 0) {
-        CheckedPageIndex = CheckedPageIndex - 1;
-      }
-      return;
-    }
-    for (var i = 0; i < array.length; i++) {
-      var dmo = {
-        //是否显示审批按钮所在bottom
-        billState: false,
-        billType: array[i].BillType_Name,
-        billID: array[i].Bill_ID,
-        remark: array[i].Remark,
-        time: timechage.formatTimeTwo(array[i].CreateTime.substring(6, 19), 'Y/M/D h:m')
-      }
-      getArr.push(dmo);
-    }
-    let arrLast = that.data.checkedDataArr.concat(getArr);
-    that.setData({
-      checkedDataArr: arrLast,
-    })
-  })
-}
+const app = getApp();
+var network = require("../../../utils/net.js");
+var timechage = require("../../../utils/dateTimeUtil.js");
+var LoadOrder = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/CarRecordRpc/LoadOrder'
 
 Page({
 
   data: {
     currentTab: 0,
     winHeight: 0,
-    winWidth: 0,
-    detaileList:[1,1,3,4,5,6,7,7,4,7,7,7,7,7,7,7,7,7,7,7,7,4,7,7,7],
+    orderInfo:{},
   },
 
   onLoad: function(options) {
@@ -55,6 +24,15 @@ Page({
         });
       }
     });
+    var method = LoadOrder;
+    var params = [ID];
+    network.transfer_request(method, params, function (res) {
+      res.result.LoadTime = timechage.formatTimeTwo(res.result.LoadTime.substring(6, 19), 'Y-M-D h:m');
+      res.result.OrderDate = timechage.formatTimeTwo(res.result.OrderDate.substring(6, 19), 'Y-M-D h:m');
+      that.setData({
+        orderInfo: res.result,
+      })
+    })
   },
 
   /**
@@ -81,18 +59,4 @@ Page({
     }
   },
 
-
-  //未审核订单滑动到底部加载
-  unCheckedScrollLower: function(event) {
-    var that = this;
-    UnCheckPageIndex = UnCheckPageIndex + 1;
-    getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function(res) {});
-  },
-
-  //已审核订单滑动到底部加载
-  CheckedScrollLower: function(event) {
-    var that = this;
-    CheckedPageIndex = CheckedPageIndex + 1;
-    getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
-  },
 })

pages/orderList/orderDetail/orderDetail.wxml

@@ -12,7 +12,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>订货时间</text>
         <view class='baseitem_value'>
-          {{customerName}}基本信息
+          {{orderInfo.LoadTime}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -20,7 +20,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>提货时间</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.OrderDate}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -28,7 +28,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>会计单位</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.AccountingUnit_Name}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -36,7 +36,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>购货客户</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Customer_Name}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -44,7 +44,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>销售部门</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Department_Name}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -52,7 +52,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>送货地址</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Address}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -60,7 +60,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>运输车辆</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Car_Name}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -68,7 +68,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>司机</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Driver_Name}}
         </view>
       </view>
       <view class='horizontallineView'></view>
@@ -76,20 +76,20 @@
       <view class='baseitem'>
         <text class='baseitem_key'>联系方式</text>
         <view class='baseitem_value'>
-          {{customerName}}
+          {{orderInfo.Driver_Telephone}}
         </view>
       </view>
       <view class='horizontallineView'></view>
 
     </view>
 
-    <view class='imageView' catchtap='saveCarsChange'>
+    <!-- <view class='imageView' catchtap='saveCarsChange'>
       <image class='currentImage' src="/imgs/blueBtn.png">
         <view class='btnTextView'>
           <text class='btnText'>保存</text>
         </view>
       </image>
-    </view>
+    </view> -->
 
   </swiper-item>
 
@@ -104,16 +104,16 @@
         </view>
         <view class='totalBottomView'>
           <view class='bottomTextView'>
-            <text class='lightGray'>主数量：</text>111{{mainNumber}}</view>
+            <text class='lightGray'>主数量：</text>{{orderInfo.UnitNumber}}</view>
           <view class='verticallineView'></view>
           <view class='bottomTextView'>
-            <text class='lightGray'>辅数量：</text>222{{secondNumber}}
+            <text class='lightGray'>辅数量：</text>222{{orderInfo.SecondNumber}}
           </view>
         </view>
       </view>
 
       <view class='detaileListContainer'>
-        <block wx:for="{{detaileList}}" wx:key="item" wx:for-index="idx">
+        <block wx:for="{{orderInfo.Details}}" wx:key="item" wx:for-index="idx">
           <template is="detailInfoTemplate" data="{{item}}" data="{{idx}}" />
         </block>
       </view>
@@ -129,7 +129,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>存货名称</text>
     <view class='baseitem_value'>
-      单据明细{{customerName}}
+      {{item.Goods_Name}}
     </view>
   </view>
   <view class='horizontallineView'></view>
@@ -137,7 +137,7 @@
     <view class='baseitem'>
     <text class='baseitem_key'>报价数量</text>
     <view class='baseitem_value'>
-      单据明细{{customerName}}
+      {{item}}
     </view>
   </view>
   <view class='horizontallineView'></view>

pages/orderList/orderList.js

@@ -2,112 +2,23 @@
 const app = getApp();
 var network = require("../../utils/net.js");
 var timechage = require("../../utils/dateTimeUtil.js");
-var UnCheckPageIndex = 0
-var UnCheckPageSize = 10
-var CheckedPageIndex = 0
-var CheckedPageSize = 10
-var outStoreMethod = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/WorkFlowApproveRecordRpc/GetList'
-// 未审核订单列表
-function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) {
-  let getArr = [];
-  let method = outStoreMethod;
-  let params = [false, UnCheckPageIndex, UnCheckPageSize];
-  network.newRequestLoading(method, params, function (res) {
-    var array = res.result;
-    successaction();
-    if (array.length <= 0) {
-      wx.showToast({
-        title: '无数据更新',
-      })
-      if (UnCheckPageIndex > 0) {
-        UnCheckPageIndex = UnCheckPageIndex - 1;
-      }
-      return;
-    }
-    for (var i = 0; i < array.length; i++) {
-      var dmo = {
-        //是否显示审批按钮所在bottom
-        billState: true,
-        billType: array[i].BillType_Name,
-        billID: array[i].Bill_ID,
-        remark: array[i].EndStateName,
-        time: timechage.formatTimeTwo(array[i].CreateTime.substring(6, 19), 'Y/M/D h:m')
-      }
-      getArr.push(dmo);
-    }
-    let arrLast = that.data.unCheckDataArr.concat(getArr);
-    that.setData({
-      unCheckDataArr: arrLast,
-    })
-  })
-}
-
-// 已审核订单列表
-function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
-  let getArr = [];
-  let method = outStoreMethod;
-  let params = [true, CheckedPageIndex, CheckedPageSize];
-  network.newRequestLoading(method, params, function (res) {
-    var array = res.result;
-    if (array.length <= 0) {
-      wx.showToast({
-        title: '无数据更新',
-      })
-      if (CheckedPageIndex > 0) {
-        CheckedPageIndex = CheckedPageIndex - 1;
-      }
-      return;
-    }
-    for (var i = 0; i < array.length; i++) {
-      var dmo = {
-        //是否显示审批按钮所在bottom
-        billState: false,
-        billType: array[i].BillType_Name,
-        billID: array[i].Bill_ID,
-        remark: array[i].Remark,
-        time: timechage.formatTimeTwo(array[i].CreateTime.substring(6, 19), 'Y/M/D h:m')
-      }
-      getArr.push(dmo);
-    }
-    let arrLast = that.data.checkedDataArr.concat(getArr);
-    that.setData({
-      checkedDataArr: arrLast,
-    })
-  })
-}
+var getOrderList = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/CarRecordRpc/GetList'
 
 Page({
   data: {
-    checkedDataArr: [1,2,3],
-    unCheckDataArr: [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3],
-    currentTab: 0,
-    winHeight: 0,
-    winWidth: 0,
+   orderList:[],
   },
 
-  /**
-   * 滑动切换tab
-   */
-  bindChange: function (e) {
-    var that = this;
-    that.setData({
-      currentTab: e.detail.current
-    });
-
-  },
-  /**
-   * 点击tab切换
-   */
-  swichNav: function (e) {
+  onShow: function (options) {
     var that = this;
-    if (this.data.currentTab === e.target.dataset.current) {
-      return false;
-    } else {
+    var method = getOrderList;
+    network.transfer_request(method, [], function (res) {
       that.setData({
-        currentTab: e.target.dataset.current
+        orderList: res.result,
       })
-    }
+    })
   },
+
   //点击进入详情页面
   transToOrderDetail: function (event) {
     var itemID = event.currentTarget.dataset.detailitemid;
@@ -116,51 +27,5 @@ Page({
     })
   },
 
-  onShow: function (options) {
-    // this.setData({
-    //   checkedDataArr: [],
-    //   unCheckDataArr: [],
-    // })
-    var that = this;
-    wx.getSystemInfo({
-      success: function (res) {
-        that.setData({
-          winWidth: res.windowWidth,
-          winHeight: res.windowHeight
-        });
-      }
-    });
-    // UnCheckPageIndex = 0;
-    // CheckedPageIndex = 0;
-    // getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res) {
-    //   getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
-    // });
-  },
-
-  //未审核订单滑动到底部加载
-  unCheckedScrollLower: function (event) {
-    var that = this;
-    UnCheckPageIndex = UnCheckPageIndex + 1;
-    getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res) { });
-  },
-
-  //已审核订单滑动到底部加载
-  CheckedScrollLower: function (event) {
-    var that = this;
-    CheckedPageIndex = CheckedPageIndex + 1;
-    getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  // onReachBottom: function () {
-  //   var that = this;
-  //   if (this.data.currentTab === 0) {
-  //     UnCheckPageIndex = UnCheckPageIndex + 1;
-  //     getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res) { });
-  //   } else {
-  //     CheckedPageIndex = CheckedPageIndex + 1;
-  //     getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize);
-  //   }
-  // },
+ 
 })

pages/orderList/orderList.wxml

@@ -1,47 +1,28 @@
 <!--pages/orderList/orderList.wxml-->
 
-<view class="swiper-tab">
-  <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">未确认</view>
-  <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已确认</view>
+<view class='container'>
+  <block wx:for="{{orderList}}" wx:key="item">
+    <template is="outStoreOrderTemplate" data="{{item}}" />
+  </block>
 </view>
 
-<swiper current="{{currentTab}}" class="swiper-box" style='height:{{winHeight-55}}px' duration="300" bindchange="bindChange">
-  <!-- 未审核 -->
-  <swiper-item class="swiper-items1">
-    <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="unCheckedScrollUpper" bindscrolltolower="unCheckedScrollLower">
-      <block wx:for="{{unCheckDataArr}}" wx:key="item">
-        <template is="outStoreOrderTemplate" data="{{item}}" />
-      </block>
-    </scroll-view>
-  </swiper-item>
-
-  <!-- 已审核 -->
-  <swiper-item class="swiper-items2">
-    <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="checkedScrollUpper" bindscrolltolower="CheckedScrollLower">
-      <block wx:for="{{checkedDataArr}}" wx:key="item">
-        <template is="outStoreOrderTemplate" data="{{item}}" />
-      </block>
-    </scroll-view>
-  </swiper-item>
-</swiper>
-
 <template name="outStoreOrderTemplate">
   <view class='listContainer'>
-    <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
+    <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.ID}}'>
       <view class='topView'>
         <view class='goodsNum'>
-          <text class='goodsIDText'>{{item.orderID}}仙坛食品有限公司</text>
+          <text class='goodsIDText'>{{item.Customer_Name}}</text>
         </view>
         <view class='goodsMoney'>
-          <text class='goodsIDText'>业务员：梁方刚{{item.workFlowState}}</text>
+          <text class='goodsIDText'>业务员：{{item.Employee_Name}}</text>
         </view>
       </view>
       <view class='bottomView'>
         <view class='goodsNum'>
-          <text class='goodsNumText'>数量：1000{{item.Customer_Name}}</text>
+          <text class='goodsNumText'>数量：{{item.TotalNumber}}</text>
         </view>
         <view class='goodsMoney'>
-          <text class='goodsMoneyText'>日期：2018.2.9{{item.time}}</text>
+          <text class='goodsMoneyText'>日期：{{item.LoadTime}}</text>
         </view>
       </view>
     </view>