refactor

@@ -291,6 +291,12 @@ function getTradeBillsList(){
             width: 40,
             width: 40,
             align: "center",
             align: "center",
             formatter: function (value, rowData, rowIndex) {
             formatter: function (value, rowData, rowIndex) {
+                var markPaidbtn= "<a role='confirmDialog' onclick='openMarkPaidConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #d9534f !important;'>已打款</a>";
+                    markPaidbtn = markPaidbtn.replace("%s",rowData.id);
+                    markPaidbtn = markPaidbtn.replace("%s",rowData.uid);
+                    markPaidbtn = markPaidbtn.replace("%s",rowData.orderCode);
+                    markPaidbtn = markPaidbtn.replace("%s",rowData.alipayAccount);
+                    markPaidbtn = markPaidbtn.replace("%s",rowData.amount);
                 // 已收款 和 等待打款结果 不可以打款
                 // 已收款 和 等待打款结果 不可以打款
             	if (rowData.tradeStatus != 100 && rowData.tradeStatus != 90) {
             	if (rowData.tradeStatus != 100 && rowData.tradeStatus != 90) {
                     var btn= "<a role='confirmDialog' onclick='openConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #5cb85c !important;'>打款</a>";
                     var btn= "<a role='confirmDialog' onclick='openConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #5cb85c !important;'>打款</a>";
@@ -299,13 +305,9 @@ function getTradeBillsList(){
                     btn = btn.replace("%s",rowData.orderCode);
                     btn = btn.replace("%s",rowData.orderCode);
                     btn = btn.replace("%s",rowData.alipayAccount);
                     btn = btn.replace("%s",rowData.alipayAccount);
                     btn = btn.replace("%s",rowData.amount);
                     btn = btn.replace("%s",rowData.amount);
-                    var markPaidbtn= "<a role='confirmDialog' onclick='openMarkPaidConfirmDialog(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")' style='margin-left:10px;background-color: #d9534f !important;'>已打款</a>";
-                    markPaidbtn = markPaidbtn.replace("%s",rowData.id);
-                    markPaidbtn = markPaidbtn.replace("%s",rowData.uid);
-                    markPaidbtn = markPaidbtn.replace("%s",rowData.orderCode);
-                    markPaidbtn = markPaidbtn.replace("%s",rowData.alipayAccount);
-                    markPaidbtn = markPaidbtn.replace("%s",rowData.amount);
                     return btn + markPaidbtn;
                     return btn + markPaidbtn;
+                } else if (rowData.tradeStatus == 90) {
+                    return markPaidbtn;
                 }
                 }
             }
             }
         }]],
         }]],