diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js
index a54db7f..9adfe6d 100644
--- a/apis/interfaces/store.js
+++ b/apis/interfaces/store.js
@@ -102,12 +102,10 @@ const storeAudit = (refund_id, data) => {
}
// 提货单列表
-const storeDeliver = (state) => {
+const storeDeliver = (data) => {
return request({
url: 'manages/shipments',
- data: {
- state
- }
+ data
})
}
diff --git a/components/store-order/store-order.vue b/components/store-order/store-order.vue
index 6d7a4bc..4452ee1 100644
--- a/components/store-order/store-order.vue
+++ b/components/store-order/store-order.vue
@@ -12,9 +12,9 @@
退货单号： {{item.shipment_no}}
退货单号： {{item.refund_no}}
- {{item.state_text}}
+ {{item.state_text}}
- {{item.state.text}}
+ {{item.state.text}}
@@ -81,6 +81,9 @@
},
goReTokens(id,index){
this.$emit('goReToken',{id:id,index:index});
+ },
+ goDetail(id){
+ this.$emit('navDetail', {id: id})
}
}
}
diff --git a/pages.json b/pages.json
index 9f8830b..6a98427 100644
--- a/pages.json
+++ b/pages.json
@@ -756,8 +756,7 @@
}]
}
}
- },
- {
+ },{
"path": "pages/store/return",
"name": "Return",
"style": {
diff --git a/pages/store/deliver.vue b/pages/store/deliver.vue
index 3c98d6b..b203435 100644
--- a/pages/store/deliver.vue
+++ b/pages/store/deliver.vue
@@ -8,7 +8,7 @@
-
+
@@ -26,28 +26,26 @@
return {
returnInfo : [] ,// 列表
navList : [{
- name : '待发货',
- state : '1'
- },{
- name : '已发货',
- state : '2'
- },{
- name : '待提货',
- state : '3'
- },{
- name : '已提货',
- state : '4'
- }
+ name : '待发货',
+ state : '1'
+ },{
+ name : '已发货',
+ state : '2'
+ },{
+ name : '待提货',
+ state : '3'
+ },{
+ name : '已提货',
+ state : '4'
+ }
],
selectNavId : '1',
// 分页
pageStatus : '',
- page : 1
+ pageCurrent : 1
}
},
- created() {
- },
onShow() {
// 获取退货单列表
this.returnData();
@@ -57,14 +55,14 @@
returnData(){
storeDeliver({
state: this.selectNavId,
- page : this.goodsPage
+ page : this.pageCurrent
}).then(res=>{
if(res.page.current === 1){
this.returnInfo = []
}
- this.returnInfo = this.returnInfo.concat(res.data)
- this.goodsPage = res.page.current
- this.pageStatus = res.page.has_more ? 'more': 'noMore'
+ this.returnInfo = this.returnInfo.concat(res.data)
+ this.pageCurrent = res.page.current
+ this.pageStatus = res.page.has_more ? 'more': 'noMore'
})
},
@@ -72,46 +70,17 @@
selectNav(id) {
if (this.selectNavId !== id) {
this.selectNavId = id
+ this.pageCurrent = 1
this.returnData()
}
},
-
- // 我要发货
- goSend(orderNo) {
- console.log(orderNo)
- return
- uni.showModal({
- title: '是否签收此订单？',
- success: res => {
- if(res.confirm) {
- storeSign(orderNo).then(() => {
- uni.showToast({
- icon: 'none',
- title: '签收成功'
- })
- setTimeout(()=>{
- this.returnData()
- },3000)
- }).catch(err => {
- uni.showToast({
- icon: 'none',
- title: err.message
- })
- })
- }
- }
- })
- },
-
+
// 下拉加载
onReachBottom() {
if(this.pageStatus == 'more'){
this.pageStatus = 'loading'
- if(this.selectNavId === '1') {
- this.goodsPage += 1
- // 获取退货单列表
- this.returnData();
- }
+ this.pageCurrent += 1
+ this.returnData();
}
}
}
diff --git a/pages/store/deliverForm.vue b/pages/store/deliverForm.vue
index d87b24e..e76b7d0 100644
--- a/pages/store/deliverForm.vue
+++ b/pages/store/deliverForm.vue
@@ -158,9 +158,9 @@
}
}
.submit {
- background: #e93340;
+ background: $mian-color;
color: white;
- border-color: #e93340;
- margin: $margin*4 $margin 0;
+ border-color: $mian-color;
+ margin: $margin;
}
diff --git a/pages/store/logistic.vue b/pages/store/logistic.vue
index a58650e..506fabe 100644
--- a/pages/store/logistic.vue
+++ b/pages/store/logistic.vue
@@ -77,7 +77,7 @@
height: 100%;
}
.take-tips {
- background-color: #e53d4c;
+ background-color: $mian-color;
width: $uni-img-size-sm;
height: $uni-img-size-sm;
border-radius: $uni-border-radius-circle;
@@ -123,13 +123,13 @@
height: 100%;
}
&:first-child {
- color: #e53d4c;
+ color: $mian-color;
}
&:last-child::before {
background-color: $uni-bg-color;
}
&:first-child::after {
- background-color: #e53d4c;
+ background-color: $mian-color;
}
.list-name {
margin-bottom: $margin - 10;
diff --git a/pages/store/return.vue b/pages/store/return.vue
index 205854d..4305922 100644
--- a/pages/store/return.vue
+++ b/pages/store/return.vue
@@ -7,21 +7,15 @@
{{item.name}}
-
-