diff --git a/api/newFun.js b/api/newFun.js
index e90699d..0436084 100644
--- a/api/newFun.js
+++ b/api/newFun.js
@@ -231,10 +231,5 @@ export const setStorePrice = (param) => {
}
// 会员分类xiangqing
export const getStorePriceInfo = (param) => {
- return request.post('store/getStorePriceInfo', param)
-}
-
-// 会员分类编辑
-export const editStore = (param) => {
- return request.post('store/editStore', param)
+ return request.get('store/getStorePriceInfo', param)
}
\ No newline at end of file
diff --git a/pages/news/recycling/confirm1.vue b/pages/news/recycling/confirm1.vue
index e08b653..76aff03 100644
--- a/pages/news/recycling/confirm1.vue
+++ b/pages/news/recycling/confirm1.vue
@@ -68,7 +68,7 @@
{{obj.server_time?obj.server_time:(tabIndex <= 1?'请选择预约到店时间':'请选择预计寄出商品的时间')}}
-
+
@@ -100,7 +100,8 @@
发件地址
-
+
+
@@ -116,7 +117,7 @@
-
+
@@ -866,7 +867,6 @@
}
.c {
- padding-top: 20rpx;
overflow: hidden;
.slot-btn {
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index 23a549a..67d8840 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -7,11 +7,12 @@
- {{infor.username}}
+
+ {{infor.username}}
{{infor.mobile}}
+ :src="$picUrl+'/static/news/icon-recycling-order-02.png'">
@@ -100,18 +101,18 @@
-
+
-
+
快递单号：
-
+
确认发货
@@ -129,7 +130,7 @@
联系商家
-
+
修改预约
@@ -189,8 +190,9 @@
methods: {
reservation() {
uni.navigateTo({
- url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" + encodeURIComponent(JSON.stringify(
- this.infor))
+ url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" +
+ encodeURIComponent(JSON.stringify(
+ this.infor))
})
},
copyOrderNumber(orderNumber) {
diff --git a/pages/news/recycling/recoveryList.vue b/pages/news/recycling/recoveryList.vue
index 852a6bf..f35a186 100644
--- a/pages/news/recycling/recoveryList.vue
+++ b/pages/news/recycling/recoveryList.vue
@@ -54,12 +54,17 @@
取消订单
- 完成
- 验收
- 确认收款
+ 验收
+
+ 收款
+
+ 收货
+
@@ -99,7 +104,7 @@
},
onPullDownRefresh() {
this.pageNum = 1;
- this.goodsList = [];
+ this.getOrderList = [];
this.getList();
setTimeout(() => {
uni.stopPullDownRefresh();
@@ -108,7 +113,7 @@
onReachBottom() {
if (this.goodsList.length <= this.total) {
this.pageNum++;
- this.getList();
+ this.getOrderList();
}
},
methods: {
@@ -144,7 +149,7 @@
confirmColor: "#F21A1C",
complete(res) {
if (res.confirm) {
- that.toComplete(index, a.order_id);
+ that.toCheck(index, a.order_id, 40, a.recovery_id);
}
}
})
@@ -157,7 +162,7 @@
confirmColor: "#F21A1C",
complete(res) {
if (res.confirm) {
- that.toCheck(index, a.order_id,20,a.recovery_id);
+ that.toCheck(index, a.order_id, 20, a.recovery_id);
}
}
})
@@ -170,25 +175,40 @@
confirmColor: "#F21A1C",
complete(res) {
if (res.confirm) {
- that.toCheck(index, a.order_id,40,a.recovery_id);
+ that.toCheck(index, a.order_id, 40, a.recovery_id);
+ }
+ }
+ })
+ }
+ // 店长收货
+ if (i == 7) {
+ uni.showModal({
+ title: "温馨提示",
+ content: "是否确认收货？",
+ confirmColor: "#F21A1C",
+ complete(res) {
+ if (res.confirm) {
+ that.toCheck(index, a.order_id, 40, a.recovery_id);
}
}
})
}
},
- async toCheck(index, order_id,stat,recovery_id) {
+ async toCheck(index, order_id, stat, recovery_id) {
const {
status,
message,
data
} = await newFunApi.updateOrderStatus({
- order_id:order_id,status:stat,recovery_id:recovery_id
+ order_id: order_id,
+ status: stat,
+ recovery_id: recovery_id
});
if (status == 200) {
uni.showToast({
title: "操作成功"
})
- this.classifyShow = 1
+ this.classifyShow = stat == 40 ? 2 : 1
this.pageNum = 1;
this.goodsList = []
this.getOrderList(1)
@@ -570,7 +590,7 @@
justify-content: flex-end;
.btn {
- width: 180upx;
+ width: 160upx;
height: 56upx;
background: #FFFFFF;
border-radius: 50px 50px 50px 50px;
diff --git a/pages/news3/components/category.vue b/pages/news3/components/category.vue
index a2ac32a..07d9945 100644
--- a/pages/news3/components/category.vue
+++ b/pages/news3/components/category.vue
@@ -59,8 +59,15 @@
this.activeIndex = []
},
getShop(item, category_id) {
+ console.log(category_id,this.activeIndex)
if (uni.getStorageSync('list').indexOf(category_id) > -1) {
- return this.$toast('此分类已被设置规则')
+
+ if(this.activeIndex.indexOf(category_id)!==-1){
+ console.log(this.activeIndex.indexOf(category_id)!==-1)
+ let index=this.activeIndex.indexOf(category_id);
+ this.activeIndex.splice(index, 1); // 通过索引位置删除元素
+ }
+ // return this.$toast('此分类已被设置规则')
}
let arrIndex = this.activeIndex.indexOf(category_id)
if (arrIndex > -1) {