Merge branch 'portal_dev_4.9' into 'portal_dev_4.9'

Update: 增加APP直播楼层



See merge request !1

@@ -1587,4 +1587,58 @@
             </div>
         </div>
     </div>
+</script>
+
+<!-- APP直播 -->
+<script type="text/template" id="livePicture-template">
+    <div class="form-group">
+        <div class="col-sm-6">
+            <label>标题:</label>&emsp;&emsp;
+            <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
+        </div>
+        <div class="col-sm-6">
+            <label>更多名称:</label>
+            <input type="text" class="form-control input-form observe" placeholder="更多名称" value="[[contentData.data.title.more_name]]" data-field="title.more_name">
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-sm-6">
+            <label>跳转目的:</label>
+            <select name="goTo" class="observe form-control input-form" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action">
+                [[layout action_template]]
+            </select>
+        </div>
+        <div class="col-sm-6">
+            <label>跳转地址:</label>
+            <input type="text" class="form-control input-form observe" placeholder="跳转地址" value="[[contentData.data.title.more_url.url]]" data-field="title.more_url.url">
+        </div>
+    </div>
+    <ul class="draggable" data-array="data.list">
+        [[each contentData.data.list as item index]]
+        <li>
+            <table class="table table-hover table-bordered responsive dataTable no-footer">
+                <tbody>
+                <tr>
+                    <td align="center">[[index+1]]</td>
+                    <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src" required/></td>
+                    <td>
+                        <div class="form-group">
+                            <div class="col-sm-10">
+                                <select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="list.[[index]].url.action">
+                                    [[layout action_template]]
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-sm-10">
+                                <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </li>
+        [[/each]]
+    </ul>
 </script>
\ No newline at end of file

@@ -431,4 +431,20 @@
             <img style="height: 50%;width: 100%" src="[[module.contentData.data.list[3].src]]">
         </div>
     </div>
+</div>
+[[else if module.contentData.template_name=='livePicture']]
+<div class="offCodeArea">
+    <div class="recommend-info">
+        [[if module.contentData.data.title.name]]
+        <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
+        [[/if]]
+
+        <p class="big-pic"><img src="[[module.contentData.data.list[0].src]]"></p>
+        <div class="col-sm-6 matchImage" style="padding-left: 3px">
+            <img src="[[module.contentData.data.list[1].src]]">
+        </div>
+        <div class="col-sm-6 matchImage">
+            <img style="height: 50%;width: 100%" src="[[module.contentData.data.list[2].src]]">
+        </div>
+    </div>
 </div>
\ No newline at end of file

@@ -1022,6 +1022,45 @@ var Button = [
                 }
             }
         }
+    },
+    {
+        button_name: "直播楼层",
+        template_name: "livePicture",
+        template_intro: "app直播",
+        dialog: "livePicture-template",
+        data: {
+            "title": {
+                "name": "",
+                "more_name": "",
+                "more_url": {
+                    "action": "",
+                    "url": ""
+                }
+            },
+            "list": [
+                {
+                    "url": {
+                        "action": "",
+                        "url": ""
+                    },
+                    "src": ""
+                },
+                {
+                    "url": {
+                        "action": "",
+                        "url": ""
+                    },
+                    "src": ""
+                },
+                {
+                    "url": {
+                        "action": "",
+                        "url": ""
+                    },
+                    "src": ""
+                }
+            ]
+        }
     }
 ];