|
@@ -1,5 +1,6 @@
|
|
|
<template>
|
|
|
<view class="order-pages">
|
|
|
+ <v-select v-show="false" ref="rubbishType" placeholder="" code="RESERVE_RUBBISH_TYPE" style="width: 100%"></v-select>
|
|
|
<view class="order-info">
|
|
|
<!-- 订单状态 -->
|
|
|
<view class="order-status">
|
|
@@ -8,7 +9,7 @@
|
|
|
{{orderInfo.orderStatusDictValue || '--'}}
|
|
|
</view>
|
|
|
<view class="status-care">
|
|
|
- 预约时间:2021-05-10 15:10:05
|
|
|
+ 预约时间:{{orderInfo.reserveTime}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 服务信息 -->
|
|
@@ -30,7 +31,7 @@
|
|
|
<view class="item-info">
|
|
|
<view class="item flex justify_between">
|
|
|
<text>预约品类</text>
|
|
|
- <text>纸品类,金属类</text>
|
|
|
+ <text>{{typeNames}}</text>
|
|
|
</view>
|
|
|
<view class="item flex justify_between">
|
|
|
<text>预约重量</text>
|
|
@@ -48,38 +49,38 @@
|
|
|
</view>
|
|
|
<view class="item flex justify_between">
|
|
|
<text>下单时间</text>
|
|
|
- <text>{{orderInfo.confirmDate}}</text>
|
|
|
+ <text>{{orderInfo.createDate}}</text>
|
|
|
</view>
|
|
|
<view class="item flex justify_between">
|
|
|
<text>服务时间</text>
|
|
|
- <text>2021-04-19 15:33</text>
|
|
|
+ <text>{{orderInfo.finishDate}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 图片 -->
|
|
|
- <view class="item-info">
|
|
|
+ <!-- <view class="item-info">
|
|
|
<view class="item-title flex justify_between">
|
|
|
<text>图片</text>
|
|
|
</view>
|
|
|
<view class="item flex">
|
|
|
<u-image class="img-icon" :src="item.icon?item.icon:'../../static/img/mddef.jpg'" border-radius="16" width="160" height="160"></u-image>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
<!-- 回收品类明细 -->
|
|
|
<view class="item-info">
|
|
|
<view class="item-title flex justify_between">
|
|
|
<text>回收品类明细</text>
|
|
|
</view>
|
|
|
<view class="item flex">
|
|
|
- <view class="item-type active">
|
|
|
- 纸质类
|
|
|
+ <view :class="['item-type', curType == item.code ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id" @click="curIndex=index" >
|
|
|
+ {{item.name}}
|
|
|
</view>
|
|
|
- <view class="item-type">
|
|
|
+ <!-- <view class="item-type">
|
|
|
纸质类
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
- <view class="item flex justify_between">
|
|
|
- <text>黄纸1.24元/kg</text>
|
|
|
- <text>5kg/6.20元</text>
|
|
|
+ <view v-for="item in typeData[curIndex].typeList" :key="item.id" class="item flex justify_between">
|
|
|
+ <text>{{item.typeName || '--'}} {{item.rubbishPrice || 0}}元/kg</text>
|
|
|
+ <text>{{item.rubbishWeight || 0}}kg/{{item.totalAmount || 0}}元</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 金额 -->
|
|
@@ -100,47 +101,18 @@
|
|
|
<script>
|
|
|
import moment from 'moment'
|
|
|
import { orderDetailFind } from '@/api/order.js'
|
|
|
+ import vSelect from '@/components/select/v-select.vue'
|
|
|
export default {
|
|
|
+ components: {
|
|
|
+ vSelect
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
- orderInfo: {
|
|
|
- id: '',
|
|
|
- createDate: '2021-05-10 15:22',
|
|
|
- orderStateDictValue: '已完成',
|
|
|
- storeName: '昆仑润滑·车领主 (西咸新区-...',
|
|
|
- location: '2.9km',
|
|
|
- orderState:'WAIT_PAY',
|
|
|
- type: [
|
|
|
- {
|
|
|
- name:'纸质类',
|
|
|
- id: '1'
|
|
|
- },
|
|
|
- {
|
|
|
- name:'衣物类',
|
|
|
- id: '12'
|
|
|
- }
|
|
|
- ],
|
|
|
- orderGoodsList: [
|
|
|
- {
|
|
|
- goodsImages: '',
|
|
|
- goodsName: '水蜡免擦洗车(轿车)',
|
|
|
- payGold: 200,
|
|
|
- buyQty: 2,
|
|
|
- goodsNum: 5,
|
|
|
- },
|
|
|
- {
|
|
|
- goodsImages: '',
|
|
|
- goodsName: '水蜡免擦洗车(轿车)',
|
|
|
- payGold: 200,
|
|
|
- buyQty: 2,
|
|
|
- goodsNum: 5,
|
|
|
- },
|
|
|
- ],
|
|
|
- payGold: 450
|
|
|
- },
|
|
|
- totalPrice: 0, // 支付合计
|
|
|
- password: '', // 支付密码
|
|
|
+ orderInfo: {},
|
|
|
orderReserveNo: '', // 订单no
|
|
|
+ typeData: [], // 订单包含类型数据
|
|
|
+ typeNames: '', // 预约品类名称
|
|
|
+ curIndex: 0 // 当前类型下标
|
|
|
}
|
|
|
},
|
|
|
onLoad(options) {
|
|
@@ -161,13 +133,40 @@
|
|
|
methods: {
|
|
|
// 获取订单详情
|
|
|
getOrderDetail() {
|
|
|
+ uni.showLoading({
|
|
|
+ title: '加载中...'
|
|
|
+ })
|
|
|
+ this.typeData = []
|
|
|
+ this.typeNames = ''
|
|
|
orderDetailFind({
|
|
|
orderReserveNo: this.orderReserveNo
|
|
|
}).then(res => {
|
|
|
console.log(res,'rrrrrrrr')
|
|
|
if (res.status == 200) {
|
|
|
this.orderInfo = res.data
|
|
|
+ this.orderInfo.reserveTime = moment(this.orderInfo.confirmDate).format('YYYY-MM-DD') + this.orderInfo.reserveTimeType
|
|
|
+ let data = this.$refs.rubbishType.getDataList()
|
|
|
+ // 重组类型数据
|
|
|
+ data.map(k =>{
|
|
|
+ let arr = this.orderInfo.orderReserveItemEntityList.filter(item=>{
|
|
|
+ return item.rubbishType == k.code
|
|
|
+ })
|
|
|
+ console.log(arr,'dddd')
|
|
|
+ if(arr.length) {
|
|
|
+ let p = {
|
|
|
+ typeCode: k.code,
|
|
|
+ name: k.dispName,
|
|
|
+ typeList: arr
|
|
|
+ }
|
|
|
+ this.typeData.push(p)
|
|
|
+ console.log(p,this.typeData,'pppppp')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.typeData.map(item=>{
|
|
|
+ this.typeNames = (this.typeNames ? (this.typeNames + ','):'') + item.name
|
|
|
+ })
|
|
|
}
|
|
|
+ uni.hideLoading()
|
|
|
})
|
|
|
},
|
|
|
|