wxd / MShopWeApp

Commit 5092d9ee78cc586f90306ba185a4cd13ff0c23e3

Authored by antploy
2 parents a9ab3b7b 5f5cc43b

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 2 changed files with 43 additions and 1 deletions
pages/user/order_detail/order_detail.js
  View file @5092d9e
... ... @@ -966,6 +966,26 @@ Page({
966 966 }).then(res=>{
967 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 +
  976 + if(pickup.isstop){
  977 + wx.hideLoading();
  978 + getApp().confirmBox("门店已停用");
  979 + this.data.moring=0;
  980 + return false;
  981 + }
  982 +
  983 + if(!pickup.is_pos){
  984 + wx.hideLoading();
  985 + getApp().confirmBox("门店不允许销售");
  986 + this.data.moring=0;
  987 + return false;
  988 + }
969 989  
970 990 //--------获取商品----------
971 991 var goods_list=item.order_goods;
... ...
pages/user/order_list/order_list.js
  View file @5092d9e
... ... @@ -1131,9 +1131,31 @@ Page({
1131 1131 await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
1132 1132  
1133 1133 }).then(res=>{
1134   - pickup = res.data.data;
  1134 + if(res.data.code==0){
  1135 + pickup = res.data.data;
  1136 + }
1135 1137 })
  1138 + if(!pickup){
  1139 + wx.hideLoading();
  1140 + getApp().confirmBox("找不到门店");
  1141 + this.data.moring=0;
  1142 + return false;
  1143 + }
  1144 +
  1145 + if(pickup.isstop){
  1146 + wx.hideLoading();
  1147 + getApp().confirmBox("门店已停用");
  1148 + this.data.moring=0;
  1149 + return false;
  1150 + }
  1151 +
1136 1152  
  1153 + if(!pickup.is_pos){
  1154 + wx.hideLoading();
  1155 + getApp().confirmBox("门店不允许销售");
  1156 + this.data.moring=0;
  1157 + return false;
  1158 + }
1137 1159 //--------获取商品----------
1138 1160 var goods_list=item.order_goods;
1139 1161 //--- 返回的内容 ---
... ...