Merge branch 'dev_楼层增加左滑链接' into test6.5.5

@@ -1462,6 +1462,15 @@
             </select>
                 </div>
         </div>
+        <div class="row">
+            <label class="col-sm-2 control-label">左滑链接</label>
+            <div class="col-sm-8">
+                <select name="goTo" class="form-control observe input-form" value="[[contentData.data.url.action]]" data-field="url.action">
+                    [[layout action_template]]
+                </select>
+                <input value="[[contentData.data.url.url]]" class="form-control observe input-form" data-field="url.url" placeholder="url"/>
+            </div>
+        </div>
     </div>
     <div class="panel-body">
         <div class="row">

@@ -1653,7 +1653,11 @@ var Button = [
             "jumpType":"",
             "recommendLogic":"",
             "skns":"",
-            "platformType":"0"
+            "platformType":"0",
+            "url": {
+                "action": "",
+                "url": ""
+            }
         },
         "isNewFloor":"1"
     },