|
|
@@ -97,20 +97,18 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="upimg" v-if="item.status == 2 || item.status == 3">
|
|
|
+ <!-- <view class="upimg" v-if="item.status == 2 || item.status == 3">
|
|
|
<view class="up-tit">打款凭证：</view>
|
|
|
<view class="img-wrap" v-if="item.upload_image" @click="lookimg(item.upload_image)"><image :src="item.upload_image" mode=""></image></view>
|
|
|
<view class="" style="color: #0F253A;font-weight: bold;font-size: 26rpx;" v-else>买家未上传支付凭证</view>
|
|
|
- </view>
|
|
|
- <view class="action-box b-t" v-if="item.status == 1"><button @click.stop="orderPay(item)" class="action-btn recom">联系买家</button></view>
|
|
|
- <view class="action-box b-t" v-if="item.status == 2">
|
|
|
- <!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
|
|
|
+ </view> -->
|
|
|
+ <!-- <view class="action-box b-t" v-if="item.status == 1"><button @click.stop="orderPay(item)" class="action-btn recom">联系买家</button></view> -->
|
|
|
+<!-- <view class="action-box b-t" v-if="item.status == 2">
|
|
|
<button @click.stop="orderPay(item)" class="action-btn recom">通过</button>
|
|
|
- </view>
|
|
|
- <view class="action-box b-t" v-if="!item.status">
|
|
|
- <!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
|
|
|
+ </view> -->
|
|
|
+<!-- <view class="action-box b-t" v-if="!item.status">
|
|
|
<button @click.stop="cancel(item)" class="action-btn recom">取消挂售</button>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
|
|
|
<uni-load-more :status="tabItem.loadingType"></uni-load-more>
|
|
|
@@ -125,7 +123,8 @@
|
|
|
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
|
|
|
import empty from '@/components/empty';
|
|
|
import { orderList, orderCancel, orderDel, orderTake, adopt, user_auction_order, seller, cancel, untreated } from '@/api/order.js';
|
|
|
-import { tabbar } from '@/utils/tabbar.js';
|
|
|
+import { tabbar } from '@/utils/tabbar.js';
|
|
|
+import { zfpay, hanging_sale } from '@/api/index.js'
|
|
|
export default {
|
|
|
components: {
|
|
|
uniLoadMore,
|
|
|
@@ -168,7 +167,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
state: 2,
|
|
|
- text: '待审核',
|
|
|
+ text: '已完成',
|
|
|
loadingType: 'more',
|
|
|
orderList: [],
|
|
|
isnew:1,//判断是否有新的订单
|
|
|
@@ -176,7 +175,7 @@ export default {
|
|
|
limit: 10 //每次信息条数
|
|
|
},
|
|
|
{
|
|
|
- state: 4,
|
|
|
+ state: 3,
|
|
|
text: '待挂售',
|
|
|
loadingType: 'more',
|
|
|
orderList: [],
|
|
|
@@ -184,62 +183,53 @@ export default {
|
|
|
page: 1, //当前页数
|
|
|
limit: 10 //每次信息条数
|
|
|
},
|
|
|
- {
|
|
|
- state: 3,
|
|
|
- text: '已完成',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
- }
|
|
|
+ // {
|
|
|
+ // state: 3,
|
|
|
+ // text: '已完成',
|
|
|
+ // loadingType: 'more',
|
|
|
+ // orderList: [],
|
|
|
+ // isnew:1,//判断是否有新的订单
|
|
|
+ // page: 1, //当前页数
|
|
|
+ // limit: 10 //每次信息条数
|
|
|
+ // }
|
|
|
],
|
|
|
navList1: [
|
|
|
- {
|
|
|
- state: 0,
|
|
|
- text: '已过期',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
- },
|
|
|
- {
|
|
|
- state: 4,
|
|
|
- text: '售卖中',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
+ {
|
|
|
+ state: 0,
|
|
|
+ text: '已过期',
|
|
|
+ loadingType: 'more',
|
|
|
+ orderList: [],
|
|
|
+ isnew:1,//判断是否有新的订单
|
|
|
+ page: 1, //当前页数
|
|
|
+ limit: 10 //每次信息条数
|
|
|
+ },
|
|
|
+ {
|
|
|
+ state: 1,
|
|
|
+ text: '待支付',
|
|
|
+ loadingType: 'more',
|
|
|
+ orderList: [],
|
|
|
+ isnew:1,//判断是否有新的订单
|
|
|
+ page: 1, //当前页数
|
|
|
+ limit: 10 //每次信息条数
|
|
|
+ },
|
|
|
+ {
|
|
|
+ state: 2,
|
|
|
+ text: '已完成',
|
|
|
+ loadingType: 'more',
|
|
|
+ orderList: [],
|
|
|
+ isnew:1,//判断是否有新的订单
|
|
|
+ page: 1, //当前页数
|
|
|
+ limit: 10 //每次信息条数
|
|
|
+ },
|
|
|
+ {
|
|
|
+ state: 3,
|
|
|
+ text: '挂售商品',
|
|
|
+ loadingType: 'more',
|
|
|
+ orderList: [],
|
|
|
+ isnew:1,//判断是否有新的订单
|
|
|
+ page: 1, //当前页数
|
|
|
+ limit: 10 //每次信息条数
|
|
|
},
|
|
|
- {
|
|
|
- state: 1,
|
|
|
- text: '待支付',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
- },
|
|
|
- {
|
|
|
- state: 2,
|
|
|
- text: '待审核',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
- },
|
|
|
- {
|
|
|
- state: 3,
|
|
|
- text: '已完成',
|
|
|
- loadingType: 'more',
|
|
|
- orderList: [],
|
|
|
- isnew:1,//判断是否有新的订单
|
|
|
- page: 1, //当前页数
|
|
|
- limit: 10 //每次信息条数
|
|
|
- }
|
|
|
]
|
|
|
};
|
|
|
},
|
|
|
@@ -384,14 +374,31 @@ export default {
|
|
|
},
|
|
|
// 订单支付
|
|
|
pay(item) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/hall/hallpay?ordid=' + item.order_id
|
|
|
- });
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/hall/hallpay?ordid=' + item.order_id
|
|
|
+ // });
|
|
|
+ let obj = this
|
|
|
+ zfpay({
|
|
|
+ order_id: item.order_id
|
|
|
+ }).then(res => {
|
|
|
+ obj.$api.msg('支付成功')
|
|
|
+ let s = obj.navList[obj.tabCurrentIndex].orderList.indexOf(item);
|
|
|
+ obj.navList[obj.tabCurrentIndex].orderList.splice(s, 1);
|
|
|
+ })
|
|
|
},
|
|
|
- gsell(item) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/hall/gsell?id=' + item.product_id
|
|
|
- });
|
|
|
+ gsell(item) {
|
|
|
+ console.log(item)
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/hall/gsell?id=' + item.product_id
|
|
|
+ // });
|
|
|
+ let obj = this
|
|
|
+ hanging_sale({
|
|
|
+ id: item.id
|
|
|
+ }).then(res => {
|
|
|
+ obj.$api.msg('挂售成功')
|
|
|
+ let s = obj.navList[obj.tabCurrentIndex].orderList.indexOf(item);
|
|
|
+ obj.navList[obj.tabCurrentIndex].orderList.splice(s, 1);
|
|
|
+ })
|
|
|
},
|
|
|
orderPay(e) {
|
|
|
adopt({ order_id: e.order_id }).then(({ data }) => {
|
|
|
@@ -448,7 +455,7 @@ export default {
|
|
|
.then(({ data }) => {
|
|
|
let arr = data.map(e => {
|
|
|
console.log(state == 4);
|
|
|
- if (state == 4) {
|
|
|
+ if (state == 3) {
|
|
|
e.stateTip = '待挂售';
|
|
|
e.stateTipColor = '#fa436a';
|
|
|
} else {
|
|
|
@@ -583,10 +590,10 @@ export default {
|
|
|
stateTip = '待支付';
|
|
|
break;
|
|
|
case 2:
|
|
|
- stateTip = '待审核';
|
|
|
+ stateTip = '已完成';
|
|
|
break;
|
|
|
case 3:
|
|
|
- stateTip = '已完成';
|
|
|
+ stateTip = '待挂售';
|
|
|
break;
|
|
|
case 4:
|
|
|
stateTip = '待挂售';
|
