Merge branch 'master' into test6.9.7

@@ -5,13 +5,14 @@ package com.yoho.ufo.order.constant;
  * 100:成功;200:失败，201:没有支付宝账号;202:金额不合法;299:转账失败
  * 100:成功;200:失败，201:没有支付宝账号;202:金额不合法;299:转账失败
  */
  */
 public enum TradeStatusEnum {
 public enum TradeStatusEnum {
-	transfering(90,"转账中"),
-    success(100,"成功"),
-    fail_200_fail(200,"打款失败"),
-    fail_201_no_alipayAccount(201,"没有支付宝账号"),
-    fail_202_invalid_money(202,"金额不合法"),
-    fail_203_wait_payment(203,"海外卖家待付款"),
-    fail_299_transfer_failure(299,"转账失败");
+	TRANSFERING(90,"转账中"),
+    SUCCESS(100,"成功"),
+    FAIL_200_FAIL(200,"打款失败"),
+    FAIL_201_NO_ALIPAY_ACCOUNT(201,"没有支付宝账号"),
+    FAIL_202_INVALID_MONEY(202,"金额不合法"),
+    HK_AMOUNT_WAIT_PAYMENT(203,"海外卖家待付款"),
+    YOHO_STORE_AMOUNT_WAIT_PAYMENT(204,"YOHO!STORE卖家待付款"),
+    FAIL_299_TRANSFER_FAILURE(299,"转账失败");
     private Integer code;
     private Integer code;
     private String desc;
     private String desc;
 
 

@@ -505,6 +505,17 @@ function lastImg(){
     }
     }
 }
 }
 
 
+function jumpPage() {
+    if (event.keyCode==37)//左
+        lastImg();
+
+    if (event.keyCode==39)//右
+        nextImg();
+
+}
+
+document.onkeydown=jumpPage;
+
 //建立  下一张  函数
 //建立  下一张  函数
 function nextImg(){
 function nextImg(){
 	index++;
 	index++;