Merge branch 'test' into 'qa'

Test See merge request !288

Merge branch 'test' into 'qa'
Test See merge request !288
后端研发-苏明海
2 parents 8430df3b a1717743
Showing 1 changed file with 2 additions and 1 deletions
pages/user/index/index.js
@@ -66,7 +66,8 @@ Page({
     }).then(res => {
         if(res.data.code==0 && res.data.data){
             var item=res.data.data[0];
-            th.setData({ad_img:item.ad_code})
+				  	if (item && item.ad_code)
+                th.setData({ad_img:item.ad_code})
         }
     })
   },