修复：酒道馆进货商品列表 搜索无效
修复：酒道馆进货订单列表 点击订单详情如果出现错误则会跳转到用户订单列表而不是返回酒道馆进货订单列表 修复：酒道馆进货订单支付结果页面 点击查看信息跳转的是用户订单列表而不是酒道馆进货列表
This commit is contained in:
parent
cb7f9908f7
commit
60b41f0ce8
|
|
@ -23,7 +23,7 @@
|
|||
<text v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<!--定金预售-->
|
||||
<text v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="right-btn-box event_box">
|
||||
<view class="btn-item" v-if="item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
|
||||
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
|
||||
|
|
@ -35,13 +35,13 @@
|
|||
</view>
|
||||
</view>
|
||||
<view v-if="orderData.status >= 10" class="event_progress">
|
||||
<view class="progress_list">
|
||||
<view class="progress_list">
|
||||
<view class="progress_name">阶段一： 买家已付款</view>
|
||||
<view class="progress_price">商品定金 <text class="align_right">￥{{ orderData.pay_price }}</text></view>
|
||||
<view class="progress_pay">定金实付款<text class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
|
||||
</view>
|
||||
<view class="progress_list">
|
||||
<view class="progress_name">阶段二：
|
||||
<view class="progress_name">阶段二：
|
||||
<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
|
||||
<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
|
||||
<text v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
|
||||
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js';
|
||||
import { goShopDetail } from '@/libs/order.js'
|
||||
import { initiateAssistApi } from '@/api/activity.js';
|
||||
import { mapGetters } from "vuex";
|
||||
import { mapGetters } from "vuex";
|
||||
export default {
|
||||
props: {
|
||||
evaluate: {
|
||||
|
|
@ -158,6 +158,8 @@
|
|||
}
|
||||
},
|
||||
jumpCon:function(item){
|
||||
if(item.product_type == 35) return false;
|
||||
|
||||
if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id
|
||||
if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id
|
||||
goShopDetail(item).then(res => {
|
||||
|
|
@ -166,21 +168,21 @@
|
|||
uni.hideLoading();
|
||||
uni.navigateTo({
|
||||
url: '/pages/activity/assist_detail/index?id=' + id
|
||||
});
|
||||
});
|
||||
}).catch((err) => {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: 'none'
|
||||
})
|
||||
})
|
||||
});
|
||||
})
|
||||
})
|
||||
},
|
||||
// 退款
|
||||
refund(item){
|
||||
refund(item){
|
||||
// #ifdef MP
|
||||
openOrderRefundSubscribe().then(() => {
|
||||
uni.hideLoading();
|
||||
if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0){
|
||||
if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0){
|
||||
uni.navigateTo({
|
||||
url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
|
||||
})
|
||||
|
|
@ -194,7 +196,7 @@
|
|||
})
|
||||
// #endif
|
||||
// #ifdef H5 || APP-PLUS
|
||||
if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0){
|
||||
if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0){
|
||||
uni.navigateTo({
|
||||
url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
|
||||
})
|
||||
|
|
@ -231,7 +233,7 @@
|
|||
&::after{
|
||||
content: "";
|
||||
width: 750rpx;
|
||||
border-bottom: 2rpx dotted #D8D8D8;
|
||||
border-bottom: 2rpx dotted #D8D8D8;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
|
@ -331,13 +333,13 @@
|
|||
color: #fff;
|
||||
font-size: 20rpx;
|
||||
padding: 0 8rpx;
|
||||
line-height: 30rpx;
|
||||
line-height: 30rpx;
|
||||
text-align: center;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
.event_ship{
|
||||
font-size: 20rpx;
|
||||
margin-top: 10rpx;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
.goodWrapper.item1{
|
||||
&::after{
|
||||
|
|
@ -346,6 +348,6 @@
|
|||
width: 750rpx;
|
||||
height: 14rpx;
|
||||
background: #F0F0F0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -487,7 +487,7 @@
|
|||
},
|
||||
// 返回店铺首页
|
||||
goStore(mer_id){
|
||||
if(this.hide_mer_status != 1){
|
||||
if(this.hide_mer_status != 1 && this.orderInfo.activity_type != 35 && this.orderInfo.activity_type != 36){
|
||||
uni.navigateTo({
|
||||
url: '/pages/store/home/index?id=' + mer_id
|
||||
})
|
||||
|
|
@ -553,7 +553,7 @@
|
|||
if (res.status === 200) {
|
||||
that.$util.Tips({
|
||||
title: res.message
|
||||
});
|
||||
});
|
||||
}
|
||||
})
|
||||
} else if(res.cancel) {
|
||||
|
|
@ -727,7 +727,7 @@
|
|||
uni.showLoading({
|
||||
title: "正在加载中"
|
||||
});
|
||||
getOrderDetail(that.order_id).then(res => {
|
||||
getOrderDetail(that.order_id).then(res => {
|
||||
uni.hideLoading();
|
||||
that.$set(that, 'orderInfo', res.data);
|
||||
that.orderInfo.take = res.data.take;
|
||||
|
|
@ -747,7 +747,10 @@
|
|||
uni.hideLoading();
|
||||
that.$util.Tips({
|
||||
title: err
|
||||
}, '/pages/users/order_list/index');
|
||||
}, {
|
||||
tab: 3,
|
||||
url: 1
|
||||
});
|
||||
});
|
||||
},
|
||||
qrR(res) {
|
||||
|
|
@ -785,7 +788,7 @@
|
|||
data: that.orderInfo.delivery_id,
|
||||
success: function(res){
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
},
|
||||
// #endif
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
} else {
|
||||
this.isAuto = true;
|
||||
this.isShowAuth = true
|
||||
}
|
||||
}
|
||||
},
|
||||
onHide: function(){
|
||||
clearInterval(this.timer);
|
||||
|
|
@ -210,25 +210,31 @@
|
|||
*/
|
||||
goOrderDetails: function(e) {
|
||||
let that = this;
|
||||
if(that.order_type == 20){
|
||||
uni.navigateTo({
|
||||
url: '/pages/points_mall/exchange_record?delte=1'
|
||||
})
|
||||
}else{
|
||||
if (that.order_pay_info.paid == 0) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index'
|
||||
})
|
||||
} else if(that.order_pay_info.orderList[0]['is_virtual'] == 2){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index?status=3'
|
||||
})
|
||||
}else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index?status=1'
|
||||
})
|
||||
}
|
||||
}
|
||||
if(that.order_pay_info.activity_type == 35){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index?is_with_goods=1'
|
||||
});
|
||||
}else{
|
||||
if(that.order_type == 20){
|
||||
uni.navigateTo({
|
||||
url: '/pages/points_mall/exchange_record?delte=1'
|
||||
})
|
||||
}else{
|
||||
if (that.order_pay_info.paid == 0) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index'
|
||||
})
|
||||
} else if(that.order_pay_info.orderList[0]['is_virtual'] == 2){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index?status=3'
|
||||
})
|
||||
}else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index?status=1'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
destroyed() {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<!--顶部搜索-->
|
||||
<view class="search-content">
|
||||
<view class="search-main">
|
||||
<input class="search-input" type="text" placeholder="请输入商品名称...">
|
||||
<input class="search-input" v-model="search.store_name" type="text" placeholder="请输入商品名称...">
|
||||
<view class="search-btn" @click="getGoodsList(1)">搜索</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -263,12 +263,17 @@ export default {
|
|||
if(Number(page) > 0) params.page = page;
|
||||
// 数据查询
|
||||
supplierGoodsList(params).then(res => {
|
||||
let oldList = Object.assign({}, _this.list);
|
||||
// 判断：如果是第一页 则数据重置
|
||||
if(params.page == 1) oldList = [];
|
||||
// 数据合并
|
||||
let list = res.data.list || {};
|
||||
if (Object.values(list).length > 0) {
|
||||
_this.list = _this.$util.SplitArray(list, _this.list);
|
||||
_this.$set(_this, 'list', _this.list);
|
||||
oldList = _this.$util.SplitArray(list, oldList);
|
||||
_this.search.page++;
|
||||
}
|
||||
|
||||
_this.$set(_this, 'list', oldList);
|
||||
}).catch(err => {
|
||||
this.$util.Tips({title: err});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue