liuqing
/
huazhiyu
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

change: 订单状态

Browse Source
dev-1021
Seep 1 year ago
parent 9157a2ea98
commit 8e8bc12c5e
11 changed files with 100 additions and 76 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      pages/my/my.vue
  2. 74
      pages/warehouse/buy.vue
  3. 68
      pages/warehouse/sell.vue
  4. 2
      unpackage/dist/build/h5/index.html
  5. 2
      unpackage/dist/build/h5/static/js/index.52189dad.js
  6. 1
      unpackage/dist/build/h5/static/js/pages-my-my.5348942a.js
  7. 1
      unpackage/dist/build/h5/static/js/pages-my-my.7ad04992.js
  8. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.251d754f.js
  9. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-buy.dd54ac7f.js
  10. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.8e28fbd0.js
  11. 1
      unpackage/dist/build/h5/static/js/pages-warehouse-sell.c4f7e482.js

24
pages/my/my.vue
Unescape View File

@ -113,7 +113,7 @@
买方
</view>
<view class="infoContainer">
<view class="list" @click="goBuyWareHouse(-1)">
<view class="list" @click="goBuyWareHouse('-2')">
<view class="icon">
<image src="../../static/image/c1.png" mode="heightFix"></image>
</view>
@ -121,23 +121,23 @@
<text>我的仓库</text>
</view>
</view>
<view class="list" @click="goBuyWareHouse(0)">
<view class="list" @click="goBuyWareHouse('1')">
<view class="icon">
<image src="../../static/image/c2.png" mode="heightFix"></image>
</view>
<view class="title">
<text>确认付款</text>
<text>已付款</text>
</view>
</view>
<view class="list" @click="goBuyWareHouse(1)">
<view class="list" @click="goBuyWareHouse('5')">
<view class="icon">
<image src="../../static/image/c3.png" mode="heightFix"></image>
</view>
<view class="title">
<text>确认收货</text>
<text>已提货</text>
</view>
</view>
<view class="list" @click="goBuyWareHouse(3)">
<view class="list" @click="goBuyWareHouse('6')">
<view class="icon">
<image src="../../static/image/c4.png" mode="heightFix"></image>
</view>
@ -153,7 +153,7 @@
卖方
</view>
<view class="infoContainer">
<view class="list" @click="goSellWareHouse(-1)">
<view class="list" @click="goSellWareHouse('-2')">
<view class="icon">
<image src="../../static/image/c1.png" mode="heightFix"></image>
</view>
@ -161,23 +161,23 @@
<text>我的仓库</text>
</view>
</view>
<view class="list" @click="goSellWareHouse(0)">
<view class="list" @click="goSellWareHouse('0')">
<view class="icon">
<image src="../../static/image/c2.png" mode="heightFix"></image>
</view>
<view class="title">
<text>确认付款</text>
<text>待付款</text>
</view>
</view>
<view class="list" @click="goSellWareHouse(1)">
<view class="list" @click="goSellWareHouse('2')">
<view class="icon">
<image src="../../static/image/c3.png" mode="heightFix"></image>
</view>
<view class="title">
<text>确认收货</text>
<text>上架中</text>
</view>
</view>
<view class="list" @click="goSellWareHouse(3)">
<view class="list" @click="goSellWareHouse('6')">
<view class="icon">
<image src="../../static/image/c4.png" mode="heightFix"></image>
</view>

74
pages/warehouse/buy.vue
Unescape View File

@ -2,11 +2,11 @@
<view class="page">
<!-- 订单tab -->
<view class="order-tab">
<view class="tab" :class="{'action':status==-1}" @click="onOrderTab(-1)">
<text>我的仓库</text>
<view v-for="(item,index) in tabList" :key="index" class="tab" :class="{'action':item.status.join(',') === status.join(',')}" @click="onOrderTab(item.status)">
<text>{{item.name}}</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':status==0}" @click="onOrderTab(0)">
<!-- <view class="tab" :class="{'action':status==0}" @click="onOrderTab(0)">
<text>付款确认</text>
<text class="line"></text>
</view>
@ -21,7 +21,7 @@
<view class="tab" :class="{'action':status==4}" @click="onOrderTab(4)">
<text>发货状态</text>
<text class="line"></text>
</view>
</view> -->
</view>
<!-- 订单列表 -->
<view class="order-list">
@ -54,7 +54,7 @@
</view>
</view>
</view>
<view class="status-btn" v-if="item.status==0">
<!-- <view class="status-btn" v-if="item.status==0">
<view class="btn" style="margin:0;" @click.native.stop="cancelOrderHandle(item)">取消订单</view>
<view class="btnGroup">
<view class="btn" @click.native.stop="uploadPay(item,index)">上传凭证</view>
@ -62,22 +62,22 @@
<view class="btn" @click.native.stop="confirmPay(item)">支付确认</view>
</view>
</view>
</view> -->
<view class="status-btn" v-if="item.status==2">
<view class="btn" style="margin:0;" @click.native.stop="changeStatusHandle(item)">提取货物</view>
<view class="btn" style="margin:0;" @click.native.stop="changeStatusHandle(item)">提物</view>
<view class="btnGroup">
<view class="btn" @click.native.stop="weituoHandle(item)">委托上架</view>
</view>
</view>
<view class="status-btn" v-if="item.status==4">
<!-- <view class="status-btn" v-if="item.status==4">
<view class="btnGroup">
<view class="btn" @click.native.stop="tixingHandle(item)">提醒发货</view>
</view>
</view>
</view> -->
</view>
</view>
@ -117,7 +117,7 @@
return {
page:1,
limit:10,
status:null,
status:[-2],
tableData:[],
total:0,
content:'确定取消订单',
@ -128,19 +128,37 @@
tiquSelected:{},
tool:'',
statusList:[
{id:0,name:'待支付'},
{id:1,name:'待确认'},
{id:2,name:'待委托'},
{id:3,name:'已投诉'},
{id:4,name:'待发货'},
{id:5,name:'待收货'},
{id:0,name:'待付款'},
{id:1,name:'已付款'},
{id:2,name:'待转售'},
{id:3,name:'委卖中'},
{id:4,name:'提货中'},
{id:5,name:'已提货'},
{id:-1,name:'已取消'},
{id:7,name:'已上架'},
{id:6,name:'已完成'},
],
tabList:[
{name:'全部',status:[-2]},
{name:'待付款',status:[0]},
{name:'已付款',status:[1]},
{name:'待转售',status:[2]},
{name:'提货中/已提货',status:[4,5]},
{name:'已结束',status:[6]},
{name:'已取消',status:[-1]},
]
};
},
onLoad(params) {
this.status = params.type;
let arr = params.type.split(',');
if(arr.length > 0){
arr.forEach((item,index) => {
arr[index] = Number(item)
});
}else{
arr = [-2]
}
console.log(arr, 'arr')
this.status = arr;
this.getList()
},
methods:{
@ -169,7 +187,7 @@
let params={
page:this.page,
limit:this.limit,
status:this.status==-1?'':this.status
status:this.status==-2?'':this.status.join(',')
}
getBuyerOrderList({...params,custom: { auth: true }}).then(res=>{
if(val){
@ -255,11 +273,12 @@
* 订单tab点击
*/
onOrderTab(type){
if(type==4){
this.status="4,5"
}else{
this.status = type;
}
this.status = type;
// if(type==4){
// this.status="4,5"
// }else{
// this.status = type;
// }
this.getList()
},
/**
@ -341,15 +360,18 @@
z-index: 10;
display: flex;
align-items: center;
width: 100%;
// width: 100%;
overflow-x: auto;
height: 90rpx;
background: rgb(35, 96, 48);
.tab{
position: relative;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
width: 20%;
padding: 0 20px;
// width: 20%;
height: 80%;
text{
font-size: 26rpx;

68
pages/warehouse/sell.vue
Unescape View File

@ -2,24 +2,8 @@
<view class="page">
<!-- 订单tab -->
<view class="order-tab">
<view class="tab" :class="{'action':status==-1}" @click="onOrderTab(-1)">
<text>我的仓库</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':status==0}" @click="onOrderTab(0)">
<text>付款确认</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':status==1}" @click="onOrderTab(1)">
<text>收款确认</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':status==3}" @click="onOrderTab(3)">
<text>投诉订单</text>
<text class="line"></text>
</view>
<view class="tab" :class="{'action':status==4}" @click="onOrderTab(4)">
<text>发货状态</text>
<view v-for="(item,index) in tabList" :key="index" class="tab" :class="{'action':item.status.join(',') === status.join(',')}" @click="onOrderTab(item.status)">
<text>{{item.name}}</text>
<text class="line"></text>
</view>
</view>
@ -53,21 +37,21 @@
</view>
</view>
</view>
<view class="status-btn" v-show="item.status==1">
<!-- <view class="status-btn" v-show="item.status==1">
<view class="btnGroup">
<view class="btn" @click.native.stop="confirmPay(item,3)">投诉</view>
<view class="btn" @click.native.stop="confirmPay(item,2)">确认收款</view>
</view>
</view>
<view class="status-btn" v-show="item.status==3">
</view> -->
<!-- <view class="status-btn" v-show="item.status==3">
<view class="btnGroup">
<view class="btn" @click.native.stop="confirmPay(item,2)">取消投诉</view>
</view>
</view>
</view> -->
</view>
</view>
<view class="empty" v-else>
@ -87,24 +71,39 @@
return {
page:1,
limit:10,
status:null,
status:[-2],
tableData:[],
total:0,
tool:'',
statusList:[
{id:0,name:'待支付'},
{id:1,name:'待确认'},
{id:2,name:'待委托'},
{id:3,name:'已投诉'},
{id:4,name:'待发货'},
{id:5,name:'待收货'},
{id:0,name:'待付款'},
{id:1,name:'已付款'},
{id:2,name:'待转售'},
{id:3,name:'委卖中'},
{id:4,name:'提货中'},
{id:5,name:'已提货'},
{id:-1,name:'已取消'},
{id:7,name:'已上架'},
{id:6,name:'已完成'},
],
tabList:[
{name:'全部',status:[-2]},
{name:'待付款',status:[0]},
{name:'上架中',status:[2]},
{name:'已结束',status:[6]},
]
};
},
onLoad(params) {
this.status = params.type;
let arr = params.type.split(',');
if(arr.length > 0){
arr.forEach((item,index) => {
arr[index] = Number(item)
});
}else{
arr = [-2]
}
console.log(arr, 'arr')
this.status = arr;
this.getList()
},
methods:{
@ -122,7 +121,7 @@
let params={
page:this.page,
limit:this.limit,
status:this.status==-1?'':this.status
status:this.status==-2?'':this.status.join(',')
}
getSellerOrderList({...params,custom: { auth: true }}).then(res=>{
if(val){
@ -195,14 +194,17 @@
display: flex;
align-items: center;
width: 100%;
// overflow-x: auto;
height: 90rpx;
background: rgb(35, 96, 48);
.tab{
position: relative;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
width: 20%;
padding: 0 20px;
width: 25%;
height: 80%;
text{
font-size: 26rpx;

2
unpackage/dist/build/h5/index.html vendored
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.a7af4f66.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.52189dad.js></script></body></html>

2
unpackage/dist/build/h5/static/js/index.a7af4f66.js → unpackage/dist/build/h5/static/js/index.52189dad.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-my-my.5348942a.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-my-my.7ad04992.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-buy.251d754f.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-buy.dd54ac7f.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-sell.8e28fbd0.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-warehouse-sell.c4f7e482.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save