Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/everyday/everyday.js

           })
         }
         this.setData({
-          taskName: "集齐启辰星【" + res.data.shortName+"】碎片1/4",
+          taskName: "集齐启辰星【" + res.data.shortName + "】碎片" + res.data.completeNum + "/" + res.data.childTotal,
           taskImgUrl: res.data.popPicUrl,
         })
         this.data.shareId = res.data.shareId;