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

antploy
2 parents 6a123357 8fbe979a
Showing 1 changed file with 1 additions and 1 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -5719,7 +5719,7 @@ Page({
       getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0", {
         success: function (res) {
           console.log(res);
-          if (res.data.code == 0) {
+          if (res.data.code == 0 && res.data.data) {
             var r_data = res.data.data;
             var max = 0, min = 0;
             if (r_data.collocationList) {