Commit 059cc9b91a78997ae34603433c76291e7f508e66

Authored by yvan.ni
1 parent 6e2513f7

再来一单确认门店

pages/user/order_detail/order_detail.js
@@ -966,6 +966,18 @@ Page({ @@ -966,6 +966,18 @@ Page({
966 }).then(res=>{ 966 }).then(res=>{
967 pickup = res.data.data; 967 pickup = res.data.data;
968 }) 968 })
  969 + if(!pickup){
  970 + wx.hideLoading();
  971 + getApp().confirmBox("找不到门店");
  972 + this.data.moring=0;
  973 + return false;
  974 + }
  975 + if(!pickup.is_pos){
  976 + wx.hideLoading();
  977 + getApp().confirmBox("门店不允许销售");
  978 + this.data.moring=0;
  979 + return false;
  980 + }
969 981
970 //--------获取商品---------- 982 //--------获取商品----------
971 var goods_list=item.order_goods; 983 var goods_list=item.order_goods;
pages/user/order_list/order_list.js
@@ -1131,9 +1131,22 @@ Page({ @@ -1131,9 +1131,22 @@ Page({
1131 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { 1131 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
1132 1132
1133 }).then(res=>{ 1133 }).then(res=>{
1134 - pickup = res.data.data; 1134 + if(res.data.code==0){
  1135 + pickup = res.data.data;
  1136 + }
1135 }) 1137 })
1136 - 1138 + if(!pickup){
  1139 + wx.hideLoading();
  1140 + getApp().confirmBox("找不到门店");
  1141 + this.data.moring=0;
  1142 + return false;
  1143 + }
  1144 + if(!pickup.is_pos){
  1145 + wx.hideLoading();
  1146 + getApp().confirmBox("门店不允许销售");
  1147 + this.data.moring=0;
  1148 + return false;
  1149 + }
1137 //--------获取商品---------- 1150 //--------获取商品----------
1138 var goods_list=item.order_goods; 1151 var goods_list=item.order_goods;
1139 //--- 返回的内容 --- 1152 //--- 返回的内容 ---