Merge branch 'feature/spread' into release/5.9

@@ -31,6 +31,8 @@ module.exports = class extends global.yoho.BaseModel {
             if (resList.code === 200) {
             if (resList.code === 200) {
                 let list = _.get(resList, 'data.data', []);
                 let list = _.get(resList, 'data.data', []);
 
 
+                resData.rules = _.get(resList, 'data.activityRuleDesc', '');
+
                 if (!_.isEmpty(list)) {
                 if (!_.isEmpty(list)) {
                     resData.list = list;
                     resData.list = list;
                 }
                 }
@@ -44,7 +46,7 @@ module.exports = class extends global.yoho.BaseModel {
                         count: _.get(resList, 'data.total', 0),
                         count: _.get(resList, 'data.total', 0),
                         curPage: _.get(resList, 'data.currPage', 1),
                         curPage: _.get(resList, 'data.currPage', 1),
                         totalPages: totalPage
                         totalPages: totalPage
-                    })
+                    });
                 }
                 }
             }
             }
 
 

@@ -7,21 +7,21 @@
             {{# spread}}
             {{# spread}}
                 <div class="spread-wrap clearfix">
                 <div class="spread-wrap clearfix">
                     <div class="item-card">
                     <div class="item-card">
-                        <span class="tag">邀请二维码</span>
+                        <span class="tag">方法一：扫描邀请二维码</span>
                         <div class="card-main">
                         <div class="card-main">
                             <div class="spread-code" data-url="{{url}}"></div>
                             <div class="spread-code" data-url="{{url}}"></div>
                         </div>
                         </div>
                         <p>{{{activityDescribe}}}</p>
                         <p>{{{activityDescribe}}}</p>
                     </div>
                     </div>
                     <div class="item-card">
                     <div class="item-card">
-                        <span class="tag">邀请码</span>
+                        <span class="tag">方法二：使用邀请码</span>
                         <div class="card-main">
                         <div class="card-main">
                             <p class="spread-id">{{inviteCode}}</p>
                             <p class="spread-id">{{inviteCode}}</p>
                         </div>
                         </div>
                         <p>1.复制您的邀请码<br>2.粘贴给您的朋友</p>
                         <p>1.复制您的邀请码<br>2.粘贴给您的朋友</p>
                     </div>
                     </div>
                     <div class="item-card">
                     <div class="item-card">
-                        <span class="tag">邀请链接</span>
+                        <span class="tag">方法二：使用邀请链接</span>
                         <div class="card-main">
                         <div class="card-main">
                             <div class="spread-url">
                             <div class="spread-url">
                                 <input type="text" value="{{url}}" class
                                 <input type="text" value="{{url}}" class
@@ -32,6 +32,10 @@
                         <p>1.复制您的邀请链接<br>2.选择您的社交平台<br>3.粘贴给您的朋友</p>
                         <p>1.复制您的邀请链接<br>2.选择您的社交平台<br>3.粘贴给您的朋友</p>
                     </div>
                     </div>
                 </div>
                 </div>
+                <div class="spread-wrap clearfix spread-rules">
+                    <h2>活动细则</h2>
+                    <p>{{{rules}}}</p>
+                </div>
                 <div class="my-spread-list">
                 <div class="my-spread-list">
                     <table>
                     <table>
                         <thead>
                         <thead>

@@ -28,9 +28,9 @@
         }
         }
 
 
         .tag {
         .tag {
-            width: 76px;
-            height: 24px;
-            line-height: 24px;
+            width: 100%;
+            height: 25px;
+            line-height: 25px;
             background-color: #000;
             background-color: #000;
             color: #fff;
             color: #fff;
             text-align: center;
             text-align: center;
@@ -113,4 +113,20 @@
             text-align: center;
             text-align: center;
         }
         }
     }
     }
+
+    .spread-rules {
+        border: 1px solid #dedede;
+        padding: 10px 20px;
+        width: 736px;
+        margin: 0 auto;
+
+        h2 {
+            font-size: 14px;
+            font-weight: 600;
+        }
+
+        p {
+            line-height: 18px;
+        }
+    }
 }
 }