From 059cc9b91a78997ae34603433c76291e7f508e66 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 24 Nov 2021 09:36:53 +0800 Subject: [PATCH] 再来一单确认门店 --- pages/user/order_detail/order_detail.js | 12 ++++++++++++ pages/user/order_list/order_list.js | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index aae5de6..f842386 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -966,6 +966,18 @@ Page({ }).then(res=>{ pickup = res.data.data; }) + if(!pickup){ + wx.hideLoading(); + getApp().confirmBox("找不到门店"); + this.data.moring=0; + return false; + } + if(!pickup.is_pos){ + wx.hideLoading(); + getApp().confirmBox("门店不允许销售"); + this.data.moring=0; + return false; + } //--------获取商品---------- var goods_list=item.order_goods; diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 8e3c85d..7315747 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1131,9 +1131,22 @@ Page({ await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { }).then(res=>{ - pickup = res.data.data; + if(res.data.code==0){ + pickup = res.data.data; + } }) - + if(!pickup){ + wx.hideLoading(); + getApp().confirmBox("找不到门店"); + this.data.moring=0; + return false; + } + if(!pickup.is_pos){ + wx.hideLoading(); + getApp().confirmBox("门店不允许销售"); + this.data.moring=0; + return false; + } //--------获取商品---------- var goods_list=item.order_goods; //--- 返回的内容 --- -- libgit2 0.21.4