|
|
@@ -6,28 +6,28 @@
|
|
|
<view class="goodsList">
|
|
|
<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
|
|
|
<view class="title">广西京东自营店南宁分店</view>
|
|
|
- <view class="state" v-if="item.goodsStatus == 1">
|
|
|
+ <view class="state" v-if="item.isDelivery == 1">
|
|
|
<text class="icon" style="color: #13ce66"></text>
|
|
|
<text>已完成</text>
|
|
|
</view>
|
|
|
<view class="state" v-else>
|
|
|
<text class="icon" style="color: #f44336"></text>
|
|
|
- <text>下架</text>
|
|
|
+ <text>待收货</text>
|
|
|
</view>
|
|
|
<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
|
|
|
<view class="con">
|
|
|
- <view class="productName omit">八角茴香（未磨）（可食用）</view>
|
|
|
+ <view class="productName omit">{{ item.goodsName }}</view>
|
|
|
<view class="desc omit">
|
|
|
- <text>50吨</text>
|
|
|
- <text>云南互市区云南互市区云南互市区云南互市区云南互市区</text>
|
|
|
+ <text>{{item.goodsQuantity}} {{item.goodsUnit}}</text>
|
|
|
+ <text>{{item.tradeAreaName}}</text>
|
|
|
</view>
|
|
|
<view class="price">¥ 5000</view>
|
|
|
</view>
|
|
|
<view class="clear"></view>
|
|
|
<view class="op">
|
|
|
- <view class="date">2022-12-12:12:12</view>
|
|
|
- <view class="an" style="color: #f44336">取消订单</view>
|
|
|
- <view class="an" style="color: #4581fb">通知确认</view>
|
|
|
+ <view class="date">{{item.createTime}}</view>
|
|
|
+ <view class="an" style="color: #f44336" v-if="item.isDelivery == 0" @click.stop="toDelivery(item.id)">确认收货</view>
|
|
|
+ <view class="an" style="color: #4581fb">物流详情</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
|
|
|
@@ -41,11 +41,11 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
tab: [
|
|
|
- { name: '全部', goodsStatus: '' },
|
|
|
- { name: '待收货', goodsStatus: 1 },
|
|
|
- { name: '已完成', goodsStatus: 0 }
|
|
|
+ { name: '全部', orderFinish: '' ,isDelivery: ''},
|
|
|
+ { name: '待收货', orderFinish: 0 ,isDelivery: 0},
|
|
|
+ { name: '已完成', orderFinish: 1 ,isDelivery: 1}
|
|
|
],
|
|
|
- param: { pageNo: 1, pageSize: 10, isOrders: 0 },
|
|
|
+ param: { pageNo: 1, pageSize: 10 },
|
|
|
list: [],
|
|
|
loadMore: true
|
|
|
};
|
|
|
@@ -59,7 +59,7 @@ export default {
|
|
|
methods: {
|
|
|
getData() {
|
|
|
this.http.request({
|
|
|
- url: '/level-two-server/app/TbOrders/getList',
|
|
|
+ url: '/level-two-server/app/TbOrders/getPurchaserOrderList',
|
|
|
loading: 'false',
|
|
|
data: this.param,
|
|
|
success: res => {
|
|
|
@@ -70,9 +70,20 @@ export default {
|
|
|
},
|
|
|
//点击tab切换
|
|
|
click(e) {
|
|
|
- this.param.goodsStatus = e.goodsStatus;
|
|
|
+ this.param.orderFinish = e.orderFinish;
|
|
|
+ this.param.isDelivery = e.isDelivery;
|
|
|
this.refresh();
|
|
|
},
|
|
|
+ toDelivery(id) {
|
|
|
+ this.http.request({
|
|
|
+ url: '/level-two-server/app/TbOrders/toDelivery',
|
|
|
+ loading: 'false',
|
|
|
+ data: {id: id,orderFinish: 1,isDelivery: 1},
|
|
|
+ success: res => {
|
|
|
+ this.refresh();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
del(id) {
|
|
|
uni.showModal({
|
|
|
title: '提示',
|
