Merge branch 'dev' into 'test'

礼包前端的优化 See merge request !1007

Merge branch 'dev' into 'test'
礼包前端的优化 See merge request !1007
后端研发-苏明海
2 parents 74e275fd 8ff9f7da
Showing 1 changed file with 1 additions and 1 deletions
pages/giftpack/giftpacklist/giftpacklist.js
@@ -217,7 +217,7 @@ Page({
             giftTitle: res.data.data.giftTitle,
             default_color: res.data.data.bgcolor
           })
-          if (res.data.data.giftRemark == '') {
+          if (!res.data.data.giftRemark || res.data.data.giftRemark == '') {
             th.setData({
               giftRemark: '暂无详情......'
             })