Merge branch 'master' of 121.43.114.153:/home/git/repositories/mshop

# Conflicts:
#	src/lib/api.js

src/lib/api.js

@@ -1,6 +1,5 @@
 let envHost = process.env.API_ROOT;
 class Api {
-
     static host() {
         return envHost;
     }
@@ -41,8 +40,8 @@ class Api {
         return this.host() + '/mobile/index.php?act=cart&op=list&client_type=ajax'
     }
 
-    static changeOrderState(action,order_id) {
-        return this.host() + '/mobile/index.php?act=member_order&op=change_state&client_type=ajax&act_type='+action+"&order_id="+order_id
+    static changeOrderState(action, order_id) {
+        return this.host() + '/mobile/index.php?act=member_order&op=change_state&client_type=ajax&act_type=' + action + "&order_id=" + order_id
     }
 
     static orderList() {
@@ -50,7 +49,7 @@ class Api {
     }
 
     static refundOrder(order_sn) {
-        return this.host() + '/mobile/index.php?act=member_refund&op=order_refund&client_type=ajax&order_sn='+order_sn
+        return this.host() + '/mobile/index.php?act=member_refund&op=order_refund&client_type=ajax&order_sn=' + order_sn
     }
 
     static deliverInfo(order_id) {
@@ -119,7 +118,7 @@ class Api {
         return this.host() + `/mobile/index.php?act=member_address&op=set_default&curpage=1&client_type=ajax&address_id=${id}&is_default=${is_default}`;
     }
 
-    static paySn(pay_sn){
+    static paySn(pay_sn) {
         return this.host() + `/mobile/index.php?act=member_order&op=pay_info&curpage=1&pay_sn=${pay_sn}&client_type=ajax`;
     }
 }