Merge branch 'feature/freeMailAct' into 'release/6.0'

个人中心权益



See merge request !743

@@ -114,7 +114,7 @@ module.exports = class extends global.yoho.BaseModel {
                             description: val.description,
                             description: val.description,
                             pic: val.pic,
                             pic: val.pic,
                             title: val.title,
                             title: val.title,
-                            href: val.id === 8
+                            href: val.id === 8 ? '//m.yohobuy.com/activity/birthday' : _.get(val, 'actionParam', false)
                         };
                         };
 
 
                         obj.privilege.push(enp);
                         obj.privilege.push(enp);

@@ -464,7 +464,7 @@ const getPreferential = (params) => {
                 description: val.description,
                 description: val.description,
                 pic: val.pic,
                 pic: val.pic,
                 title: val.title,
                 title: val.title,
-                href: val.id === 8
+                href: val.id === 8 ? '//m.yohobuy.com/activity/birthday' : _.get(val, 'actionParam', false)
             };
             };
 
 
             resu.privilege.push(obj);
             resu.privilege.push(obj);

 <div class="vip-privilege-page yoho-page">
 <div class="vip-privilege-page yoho-page">
 	<div class="privilege-list clearfix">
 	<div class="privilege-list clearfix">
 	    {{#each privilege}}
 	    {{#each privilege}}
-	        <a{{#if href}} href="//m.yohobuy.com/activity/birthday"{{/if}}>
+	        <a{{#if href}} href="{{href}}"{{/if}}>
 	            <img class="icon" src="{{pic}}">
 	            <img class="icon" src="{{pic}}">
 	            <p>
 	            <p>
 	                {{title}}
 	                {{title}}

 <div class="privilege-list clearfix">
 <div class="privilege-list clearfix">
     {{#each privilege}}
     {{#each privilege}}
-        <a{{#if href}} href="//m.yohobuy.com/activity/birthday"{{/if}}>
+        <a{{#if href}} href="{{href}}"{{/if}}>
             <img class="icon" src="{{pic}}">
             <img class="icon" src="{{pic}}">
             <p>
             <p>
                 {{title}}
                 {{title}}