no message

pages/agent/order-item/index.wxml

@@ -1,5 +1,8 @@
 <!--pages/message/index.wxml-->
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<view style="background-color:#f3f3f3;" wx:if="{{item.tipsTime}}">
+	<text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
+</view>
 <view class="flex flex-justify item-content" style="border-bottom:2rpx solid #f3f3f3" bindtap="lookItem">
 	<view class="flex flex-center">
 		<van-image use-loading-slot width="40rpx" height="40rpx" round lazy-load src="{{item.logoImg}}">

pages/agent/order-list/index.js

@@ -76,8 +76,27 @@ Scene({
     }
     this.data.requesting = true
     getProxyOrderList(this.data.form).then(result => {
-      var respList = result.data.records
-      if (respList && respList.length) {
+      if (result.data && result.data.records && result.data.records.length) {
+        // 对返回的消息列表进行处理，将同一天的消息显示在一起
+        var respList = result.data.records
+        for (let i = 0; i < respList.length; i++) {
+          if (util.isEmpty(this.data.lastTime)) {
+            this.data.lastTime = respList[i].createTime
+            if (this.data.lastTime.length > 10) {
+              this.data.lastTime = this.data.lastTime.substring(0, 10)
+            }
+            respList[i].tipsTime = this.data.lastTime
+          } else {
+            var itemTime = respList[i].createTime
+            if (itemTime.length > 10) {
+              itemTime = itemTime.substring(0, 10)
+            }
+            if (this.data.lastTime !== itemTime) {
+              respList[i].tipsTime = itemTime
+            }
+            this.data.lastTime = itemTime
+          }
+        }
         let nowList = `orderList[${this.data.orderList.length}]`
         var num = this.data.form.pageNum
         var finished = this.data.form.pageNum >= result.data.pages

pages/agent/order-list/index.wxml

@@ -17,7 +17,7 @@
   </view>
   <view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
     <view wx:for="{{pageItem}}" wx:key="index">
-      <view style="height:20rpx" wx:if="{{pageIndex != 0 || index != 0 }}"></view>
+      <view style="height:12rpx" wx:if="{{(pageIndex != 0 || index != 0 ) && !item.tipsTime}}"></view>
       <order-item item="{{item}}"></order-item>
     </view>
   </view>

pages/process/payment/index.js

@@ -1,7 +1,7 @@
 // pages/process/payment/index.js
 import Scene from '../../index/scene'
 import Dialog from '../../../components/dialog/dialog'
-import { getPeymentList, paymentOrder, getFactoryOrderInfo } from "../../../api/saas"
+import { getPeymentList, paymentOrder, getFactoryOrderInfo, getSideOrderInfo } from "../../../api/saas"
 const event = require('../../../utils/event')
 const util = require('../../../utils/util')
 const math = require('../../../utils/math') //导入模块
@@ -12,6 +12,7 @@ Scene({
    * 页面的初始数据
    */
   data: {
+    id: null,
     height: app.globalData.fragmentHeight,
     safeBottom: app.globalData.safeBottom,
     form: {
@@ -53,6 +54,26 @@ Scene({
       channel.on('onParam', function (data) {
         that.amountList([data])
       })
+    } else if(options.id){
+      this.data.id = options.id
+      wx.showLoading({ title: '正在获取', mask: true })
+      getSideOrderInfo({id: options.id}).then(result => {
+        wx.hideLoading()
+        this.data.amount = 0
+        for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
+          const element = result.data.productCategoryInfos[index]
+          element.fileList = []
+          for (let k = 0; k < element.weightNoteImages.length; k++) {
+            element.fileList.push({url: element.weightNoteImages[k]})
+          }
+          element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
+          this.data.amount = math.plus(this.data.amount, element.settlePrice)
+        }
+        this.setData({ orderList: [result.data], amount: this.data.amount, orderStatus: result.data.orderStatus })
+      }).catch(err => {
+        wx.hideLoading()
+        util.showToast(err)
+      })
     }
   },
   amountList: function(orderList){

pages/process/payment/index.json

@@ -8,6 +8,7 @@
     "van-image": "/components/image/index",
     "van-popup": "/components/popup/index",
     "van-dialog": "/components/dialog/index",
+    "submit-layout": "/components/submit-layout/index",
     "notification": "/pages/message/notification/index"
   }
 }

pages/process/payment/index.wxml

@@ -69,13 +69,12 @@
   </view>
 </van-cell>
 
-<view style="height:{{132 + safeBottom}}rpx;"></view>
-<view class="cu-bar bg-white foot" style="height:{{132 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;" wx:if="{{orderList}}">
+<submit-layout wx:if="{{orderList}}">
   <van-button plain type="default" custom-style="height:88rpx;width:254rpx" disabled="{{amount==0}}" bind:click="agentPayment" wx:if="{{orderStatus == 4}}">使用千鸟代付</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" disabled="{{amount==0}}" bind:click="paymentOrder" wx:if="{{orderStatus == 4}}">直接付款</van-button>
   <van-button type="info" custom-style="height:88rpx;width:686rpx" disabled="{{amount==0}}" bind:click="paymentOrder" wx:if="{{orderStatus == 42}}">付款
   </van-button>
-</view>
+</submit-layout>
 
 <van-popup show="{{ popup }}" closeable position="bottom" z-index="66" custom-style="height: {{height * 0.85}}rpx" bind:close="onPopupClose">
   <view class="text-sg text-bold" style="padding:30rpx;border-bottom: 2rpx solid #f3f3f3;height:100rpx">