提交即将结束代码

@@ -27,6 +27,7 @@ exports.activity = (req, res) => {
 
 
 exports.willBeEnd = (req, res) => {
 exports.willBeEnd = (req, res) => {
     outletModel.willBeEnd().then(result => {
     outletModel.willBeEnd().then(result => {
+        console.log(result);
         res.render('outlet/will-end', Object.assign(renderData, result));
         res.render('outlet/will-end', Object.assign(renderData, result));
     });
     });
 };
 };

@@ -149,7 +149,7 @@ const getHomeActivity = (id) => {
         platform: 2,
         platform: 2,
         size: 0,
         size: 0,
         yh_channel: 1,
         yh_channel: 1,
-        type: id,
+        type: 0,
         sort: 2,
         sort: 2,
         client_type: 'h5'
         client_type: 'h5'
     };
     };
@@ -187,19 +187,25 @@ exports.getActivity = (id) => {
 };
 };
 
 
 exports.willBeEnd = () => {
 exports.willBeEnd = () => {
-    return getHomeActivity(3).then(res => {
-        var data = {};
+    return getHomeActivity().then(res => {
+        var data = {
+            activity: {
+                data: res
+            }
+        };
 
 
-        data.activity = res;
         return data;
         return data;
     });
     });
 };
 };
 
 
 exports.willBeCome = () => {
 exports.willBeCome = () => {
-    return getHomeActivity(4).then(res => {
-        var data = {};
+    return getHomeActivity().then(res => {
+        var data = {
+            activity: {
+                data: res
+            }
+        };
 
 
-        data.activity = res;
-        return res;
+        return data;
     });
     });
 };
 };

-{{# activity}}
-{{> resources/acivity-outlets}}
-{{/ activity}}
+<div class="outlet-page">
+    {{log activity}}
+    {{# activity}}
+        {{#data}}
+            <a class="will-end-back" href="{{activityUrl}}" >
+                <img class="back-image" src="{{image coverUrl 640 300}}">
+                <div class="last-time">{{startLeftTime}}</div>
+                <div class="line-space">
+                    <span class="num">{{promotionName}} </span>
+                    <span class="title">{{title}}</span>
+                    <img class="logo" src="{{image logoUrl 150 100}}"></img>
+                </div>
+            </a>
+        {{/data}}
+    {{/ activity}}
+</div>

-{{# activity}}
-{{> resources/acivity-outlets}}
-{{/ activity}}
+<div class="outlet-page">
+    {{log activity}}
+    {{# activity}}
+        {{> resources/acivity-outlets}}
+    {{/ activity}}
+</div>
+

-{{log data}}
 {{#data}}
 {{#data}}
     <a class="back-ground-white {{#if hide}} hidden {{/if}}" href="{{activityUrl}}" >
     <a class="back-ground-white {{#if hide}} hidden {{/if}}" href="{{activityUrl}}" >
         <img class="back-image" src="{{image coverUrl 640 300}}">
         <img class="back-image" src="{{image coverUrl 640 300}}">

@@ -75,6 +75,57 @@
 
 
     }
     }
 
 
+    .will-end-back {
+        display: inline-block;
+        position: relative;
+        margin: 40px 0;
+        width: 100%;
+        height: 300px;
+
+        .last-time {
+            position: absolute;
+            top: 10px;
+            margin-left: 15px;
+            height: 20px;
+        }
+
+        .logo {
+            top: 10px;
+            width: 80px;
+            height: 60px;
+            margin-right: 20px;
+            float: right;
+        }
+
+        .line-space {
+            width: 100%;
+            height: auto;
+            display: inline-block;
+            margin-bottom: 40px;
+        }
+
+        .num {
+            top: 10px;
+            width: 100px;
+            font-size: 30px;
+            color: #ff0705;
+            margin-left: 30px;
+        }
+
+        .title {
+            top: 10px;
+            margin-left: 30px;
+            width: 200px;
+            font-size: 28px;
+            font-weight: bold;
+        }
+
+        .time {
+            font-size: 22px;
+        }
+
+    }
+
     .outlet-discount {
     .outlet-discount {
         width: 100%;
         width: 100%;
         color: #fff;
         color: #fff;