diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 0c304f8..1706531 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -23,7 +23,7 @@
{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内
{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内
-
+
申请退款
退款中 x {{item.product_num - item.refund_num}}
@@ -35,13 +35,13 @@
-
+
阶段一： 买家已付款
商品定金 ￥{{ orderData.pay_price }}
定金实付款￥{{ orderData.pay_price }}
- 阶段二：
+ 阶段二：
未开始
等待买家付尾款
交易已关闭
@@ -77,7 +77,7 @@
去评价
已评价
-
+
@@ -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;
- }
+ }
}
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 6f7b8a4..f5b87f5 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -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
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 2be2064..4d48e58 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -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() {
diff --git a/pages/supplier/stock/with_goods.vue b/pages/supplier/stock/with_goods.vue
index 24231f5..ee48497 100644
--- a/pages/supplier/stock/with_goods.vue
+++ b/pages/supplier/stock/with_goods.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -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});
});