Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuywap-node into release/4.6

@@ -30,6 +30,7 @@ const dateFormate = (str) =>{
     return y + '年' + m + '月' + d + '日' + h + '时';
 };
 
+// 为了活动卡片特殊样式，将折扣信息拆分开来
 const transDiscountToArr = (discount) => {
     return discount.replace(/(?:\d+[.\d]?)([\u4e00-\u9fa5]{1})/g, function(fullMatch, capture) {
         if (capture) {
@@ -44,6 +45,13 @@ const transDiscountToArr = (discount) => {
     }).split(',');
 };
 
+
+/**
+ * 获取资源位
+ * @param  {String} channel 频道
+ * @param  {String} contentcode 内容码
+ * @return {Promise}
+ */
 const getOutletResource = (channel, contentcode) => {
     const params = {
         content_code: contentcode || 'c19ffa03f053f4cac3690b22c8da26b7',
@@ -61,6 +69,11 @@ const getOutletResource = (channel, contentcode) => {
     });
 };
 
+/**
+ * 转换导航数据
+ * @param  {[Object]} 原始导航数据
+ * @return {Object}  转换后的数据
+ */
 const convertNavData = (list) => {
     const formatData = [];
 
@@ -77,6 +90,11 @@ const convertNavData = (list) => {
     return {data: formatData};
 };
 
+/**
+ * 获取导航数据
+ * @param  {String} 导航类型id
+ * @return {Promise}
+ */
 const getNavData = (categoryId) => {
     const params = {
         v: 7,
@@ -96,6 +114,11 @@ const getNavData = (categoryId) => {
     });
 };
 
+/**
+ * 转换奥莱活动数据
+ * @param  {Object} data 原始数据
+ * @return {Object} 转换后的数据
+ */
 const convertActicityData = (data) => {
     const formatData = [];
 
@@ -131,6 +154,11 @@ const convertActicityData = (data) => {
     return formatData;
 };
 
+/**
+ * 获取奥莱活动详情
+ * @param  {String} id 活动id
+ * @return {Promise} 调用接口的Promise
+ */
 const getActivityDetail = (id) => {
     var params = {
         method: 'app.outlets.activityGet',
@@ -151,6 +179,11 @@ const getActivityDetail = (id) => {
     });
 };
 
+/**
+ * 获取奥莱资频道页活动列表
+ * @param  {Object} data 请求接口所需的参数
+ * @return {Promise} 调用接口的Promise
+ */
 const getHomeActivity = (data) => {
     var params = {
         method: 'app.outlets.activityGet',
@@ -162,6 +195,13 @@ const getHomeActivity = (data) => {
     });
 };
 
+/**
+ * 获取奥莱资首页内容
+ * @param  {String} categoryId 父级菜单id，用于标明当前页面是奥莱页面
+ * @param  {Strting} channel 奥莱频道
+ * @param  {Strting} code 内容码
+ * @return {Promise} 调用接口的Promise
+ */
 exports.getContent = (categoryId, channel, code) => {
     let params = {
         type: 0,
@@ -180,7 +220,11 @@ exports.getContent = (categoryId, channel, code) => {
     });
 };
 
-
+/**
+ * 获取奥莱活动详情
+ * @param  {String} id 活动id
+ * @return {Promise} 调用接口的Promise
+ */
 exports.getActivity = (id) => {
     return getActivityDetail(id).then(res => {
         return {
@@ -194,7 +238,7 @@ exports.getActivity = (id) => {
 
 /**
  * 获取即将开始或即将结束的活动列表
- * @param  {Number} type 标明是即将开始还是即将技术
+ * @param  {Number} type 标明是上线预告还是即将结束
  * @param  {String} categoryId 父级菜单id，用于标明当前页面是奥莱页面
  * @return {Object} 活动列表数据
  */