Merge branch 'test6.8.4_tmp' into test6.8.4

@@ -2118,6 +2118,17 @@
                 </li>
             </ul>
         </div>
+
+        <div class="form-group">
+            <div class="col-sm-10">
+                <label>ufo位置：</label>
+                <select class="form-control input-form" id="focus-select" value="[[contentData.data.ufo_position]]">
+                    <option value="1">无</option>
+                    <option value="2">左</option>
+                    <option value="3">右</option>
+                </select>
+            </div>
+        </div>
     </div>
 </script>
 

@@ -1936,6 +1936,7 @@ var Button = [
         dialog: "cpsShowBanner-template",
         __title:"有货有赚",
         data: {
+            "ufo_position" : "",
         }
     },
     {