回收订单

version/0412
fanfan 9 months ago
parent fcc51b8ddc
commit 06327d9a94
  1. 7
      api/newFun.js
  2. 8
      pages/news/recycling/confirm1.vue
  3. 12
      pages/news/recycling/order.vue
  4. 48
      pages/news/recycling/recoveryList.vue
  5. 9
      pages/news3/components/category.vue

@ -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)
}

@ -68,7 +68,7 @@
<view class="select" :class="obj.server_time?'select-on':''">
{{obj.server_time?obj.server_time:(tabIndex <= 1?'请选择预约到店时间':'请选择预计寄出商品的时间')}}
</view>
<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
<u-icon style="margin-left: 10rpx;" color="#8B8B8B" name="arrow-right"></u-icon>
</view>
</view>
<view class="item">
@ -100,7 +100,8 @@
<view class="item" v-if="tabIndex == 2 ||tabIndex == 1">
<view class="a" @click="addrshow=true">发件地址</view>
<view class="b" @click="addrshow=true">
<input type="text" disabled placeholder="请选择地址" v-model="obj.shipping_address">
<input type="text" disabled style="font-size: 28rpx;" placeholder="请选择地址" v-model="obj.shipping_address">
<u-icon name="arrow-right" color="#8B8B8B" size="30"></u-icon>
<u-picker @confirm="changeRegion" v-model="addrshow" mode="region"></u-picker>
</view>
</view>
@ -116,7 +117,7 @@
<input class="box" v-model="obj.expect_price" type="number" placeholder="请输入您期待的售卖价格(元)" />
</view>
</view>
<view class="c">
<view class="c" style="margin-top: 20rpx;">
<u-upload :action="action" :header="header" @on-uploaded="onSuccess" @on-remove="onRemove"
width="180" height="180" :file-list="fileList" :custom-btn="true" max-count="6">
<template v-slot:addBtn>
@ -866,7 +867,6 @@
}
.c {
padding-top: 20rpx;
overflow: hidden;
.slot-btn {

@ -7,7 +7,8 @@
<view class="l">
<view class="a">
<view class="name">
<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>{{infor.username}}
<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>
{{infor.username}}
<text>{{infor.mobile}}</text>
</view>
<image @click="copyOrderNumber(infor.mobile)" class="copy"
@ -100,18 +101,18 @@
<view class="m red" v-if="infor.express_no==''">
<picker @change="changeOption" mode="selector" range-key="express_name" :value="index"
:range="expressList">
<u-icon style="color:#999" name="arrow-right"></u-icon>
<u-icon style="color:#999" name="arrow-right" v-if="infor.order_status == 10"></u-icon>
</picker>
</view>
</view>
<view class="item">
<view class="item" v-if="infor.recovery_type==30">
<view class="l">快递单号</view>
<view class="r">
<input type="text" :disabled='infor.express_no?true:false' v-model="express_no"
placeholder="请输入物流单号" />
</view>
<view class="m red" @click="onSend" v-if="infor.express_no==''">
<view class="m red" @click="onSend" v-if="infor.express_no=='' && infor.order_status == 10">
<view class="btn">确认发货</view>
</view>
</view>
@ -189,7 +190,8 @@
methods: {
reservation() {
uni.navigateTo({
url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" + encodeURIComponent(JSON.stringify(
url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" +
encodeURIComponent(JSON.stringify(
this.infor))
})
},

@ -54,12 +54,17 @@
</view>
<view class="btn info" v-if="item.order_status == 10" @click.stop="openPage(1,index,item)">取消订单
</view>
<view class="btn info" v-if="item.is_success==1 && (item.order_status == 20)"
<view class="btn info" style="width: 120rpx;" v-if="item.order_status == 20"
@click.stop="openPage(4,index,item)">完成</view>
<view class="btn info" v-if="item.order_status == 10&&userInfo.user_type == 40"
@click.stop="openPage(5,index,item)">验收</view>
<view class="btn info" v-if="item.order_status == 10&&userInfo.user_type !=40"
@click.stop="openPage(6,index,item)">确认收款</view>
<view class="btn info" style="width: 120rpx;"
v-if="item.order_status == 10&&userInfo.user_type == 40" @click.stop="openPage(5,index,item)">验收
</view>
<view class="btn info" style="width: 120rpx;"
v-if="item.order_status == 10&&userInfo.user_type !=40" @click.stop="openPage(6,index,item)">收款
</view>
<view class="btn info" style="width: 120rpx;"
v-if="item.order_status == 10&&userInfo.user_type ==40" @click.stop="openPage(7,index,item)">收货
</view>
</view>
</view>
</view>
@ -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;

@ -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) {

Loading…
Cancel
Save