Merge branch 'master' of git.yoho.cn:yoho30/yohobuy-union

@@ -38,6 +38,7 @@
                             <value>/ActivateUnionRest/queryActivateHour</value>
                             <value>/ActivateUnionRest/queryActivateDay</value>
                             <value>/ActivateUnionRest/queryByDeviceId</value>
+                            <value>/channel/addActualCostForGDT</value>
                             <value>/jump</value>
                             <value>/go</value>
                             <value>/pushUnionOrders</value>

@@ -56,6 +56,7 @@
                     <input id="activateTimeEnd" name="activateTimeEnd" type="text" class="easyui-datetimebox" editable="false"
                            data-options="prompt:'激活结束时间'" style="width: 200px;">
                     <a id="searchBtn" class="easyui-linkbutton btn-info" style="margin-left: 30px; "></a>
+                    <a id="searchBtn3" class="easyui-linkbutton btn-info" style="margin-left: 30px; "></a>
                 </form>
             </div>
         </div>
@@ -651,6 +652,16 @@
             }
         });
 
+        $("#searchBtn3").linkbutton({
+                    iconCls: "icon-search",
+                    text: "报表",
+                    onClick:function(){
+                        window.location.href = "http://union.yoho.cn/union/admin/mktReportform.html";
+                    }
+                }
+
+        )
+
         $("#searchBtn2").linkbutton({
             iconCls: "icon-search",
             text: "查询",