Browse Source

no message

feature/v1.1
xpz2018 5 years ago
parent
commit
9cb59ad305
4 changed files with 9 additions and 5 deletions
  1. 2
      pages/process/agent-list/index.js
  2. 2
      pages/process/index/index.wxml
  3. 6
      pages/process/order-info/index.js
  4. 4
      pages/process/order-info/index.wxml

2
pages/process/agent-list/index.js

@ -120,7 +120,7 @@ Page({
}, },
lookItem: function (e) { lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.orderId}` })
wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}` })
}, },
onUnload: function(){ onUnload: function(){
event.remove('OrderMessage', this) event.remove('OrderMessage', this)

2
pages/process/index/index.wxml

@ -118,7 +118,7 @@
<view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx"> <view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx">
<view class="flex flex-center" style="justify-content: flex-start"> <view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#FF8413"></view> <view style="height:24rpx;width:6rpx;background:#FF8413"></view>
<view class="text-black text-sm" style="margin-left: 12rpx">待付款订单</view>
<view class="text-black text-sm" style="margin-left: 12rpx">待付款金额</view>
</view> </view>
<view class="text-xxl text-bold text-price" style="margin:12rpx 0rpx">{{userInfo.usedCreditLine}}</view> <view class="text-xxl text-bold text-price" style="margin:12rpx 0rpx">{{userInfo.usedCreditLine}}</view>
</view> </view>

6
pages/process/order-info/index.js

@ -12,12 +12,16 @@ Page({
data: { data: {
safeBottom: app.globalData.safeBottom, safeBottom: app.globalData.safeBottom,
form: null, form: null,
agent: 0,
title: '过磅详情' title: '过磅详情'
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
if(options.agent){
this.data.agent = Number(options.agent)
}
if(options.id){ if(options.id){
this.fetchOrderInfo(options.id) this.fetchOrderInfo(options.id)
} }
@ -31,7 +35,7 @@ Page({
} else if(result.data.status == 5){ } else if(result.data.status == 5){
this.data.title = '已完成' this.data.title = '已完成'
} }
this.setData({ safeBottom: app.globalData.safeBottom, form: result.data, title: this.data.title })
this.setData({ safeBottom: app.globalData.safeBottom, form: result.data, title: this.data.title, agent: this.data.agent })
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()
this.setData({ safeBottom: app.globalData.safeBottom }) this.setData({ safeBottom: app.globalData.safeBottom })

4
pages/process/order-info/index.wxml

@ -154,9 +154,9 @@
</van-cell> </van-cell>
</view> </view>
<view style="height:{{16 + safeBottom}}rpx;"></view> <view style="height:{{16 + safeBottom}}rpx;"></view>
<view style="height:120rpx;" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}"></view>
<view style="height:120rpx;" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42) && !agent}}"></view>
<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;" <view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding:0rpx 32rpx {{safeBottom}}rpx 32rpx;"
wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}">
wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42) && !agent }}">
<van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder" wx:if="{{form.status == 3}}">重新过皮重</van-button> <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder" wx:if="{{form.status == 3}}">重新过皮重</van-button>
<van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder" wx:if="{{form.status == 3}}">通过审核</van-button> <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder" wx:if="{{form.status == 3}}">通过审核</van-button>
<van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 4}}">进行支付</van-button> <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 4}}">进行支付</van-button>

Loading…
Cancel
Save