YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by DengXinFei
Commit 98bfb927611e5b5089f3cb44b25038eda4c80319 2 parents c7591067 090c4294

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

Inline Side-by-side
Showing 2 changed files with 12 additions and 0 deletions
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 <value>/ActivateUnionRest/queryActivateHour</value> 38 <value>/ActivateUnionRest/queryActivateHour</value>
39 <value>/ActivateUnionRest/queryActivateDay</value> 39 <value>/ActivateUnionRest/queryActivateDay</value>
40 <value>/ActivateUnionRest/queryByDeviceId</value> 40 <value>/ActivateUnionRest/queryByDeviceId</value>
  41 + <value>/channel/addActualCostForGDT</value>
41 <value>/jump</value> 42 <value>/jump</value>
42 <value>/go</value> 43 <value>/go</value>
43 <value>/pushUnionOrders</value> 44 <value>/pushUnionOrders</value>
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
56 <input id="activateTimeEnd" name="activateTimeEnd" type="text" class="easyui-datetimebox" editable="false" 56 <input id="activateTimeEnd" name="activateTimeEnd" type="text" class="easyui-datetimebox" editable="false"
57 data-options="prompt:'激活结束时间'" style="width: 200px;"> 57 data-options="prompt:'激活结束时间'" style="width: 200px;">
58 <a id="searchBtn" class="easyui-linkbutton btn-info" style="margin-left: 30px; "></a> 58 <a id="searchBtn" class="easyui-linkbutton btn-info" style="margin-left: 30px; "></a>
  59 + <a id="searchBtn3" class="easyui-linkbutton btn-info" style="margin-left: 30px; "></a>
59 </form> 60 </form>
60 </div> 61 </div>
61 </div> 62 </div>
@@ -651,6 +652,16 @@ @@ -651,6 +652,16 @@
651 } 652 }
652 }); 653 });
653 654
  655 + $("#searchBtn3").linkbutton({
  656 + iconCls: "icon-search",
  657 + text: "报表",
  658 + onClick:function(){
  659 + window.location.href = "http://union.yoho.cn/union/admin/mktReportform.html";
  660 + }
  661 + }
  662 +
  663 + )
  664 +
654 $("#searchBtn2").linkbutton({ 665 $("#searchBtn2").linkbutton({
655 iconCls: "icon-search", 666 iconCls: "icon-search",
656 text: "查询", 667 text: "查询",