电子商城测试版v4

src/common/constant.js

@@ -6,12 +6,13 @@
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
+// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
-export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
+export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
+// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
 
 // CDN
 // 生成密钥

src/common/enum.ts

@@ -29,13 +29,13 @@ export const AFTER_ORDER_STATUS = {
 
 //支付方式
 export const PAYMENT_METHOD = {
-    PaymentMethodPreDeposit: {value:1, label:'预存款'},
-    PaymentMethodAccountPeriod : {value:2, label:'账期'},
-    PaymentMethodofflineRemittance: {value:0, label:'线下汇款'},
-    PaymentMethodScanCodeToPay: {value:3, label:'扫码支付'},
-    PaymentMethodCashOnDelivery: {value:4, label:'货到付款'},
+    PaymentMethodPreDeposit: {value:2, label:'预存款'},
+    PaymentMethodAccountPeriod : {value:3, label:'账期'},
+    PaymentMethodofflineRemittance: {value:1, label:'线下汇款'},
+    PaymentMethodScanCodeToPay: {value:4, label:'扫码支付'},
+    PaymentMethodCashOnDelivery: {value:5, label:'货到付款'},
 }
-export type PAYMENT_METHOD_PARAM = 0|1|2|3|4
+export type PAYMENT_METHOD_PARAM = 1|2|3|4|5
 
 
 //订单类型
@@ -58,10 +58,17 @@ export const  SUBSCRIPTION_MESSAGE_SCENE = {
     ApplyGoods: {value:3, label: '申请退款'}
 }
 
-//退款状态枚举
+//应收单退款状态枚举
 export const REFUND_STATUS = {
     ShouldCollectOrderRefundTypeUnknown: {value:0, label:'未知退款'},
     ShouldCollectOrderRefundTypeAdvanceReceiptRefund: {value:1, label:'预收退款'},
     ShouldCollectOrderRefundTypeReturnForRefund: {value:2, label:'退货退款'},
     ShouldCollectOrderRefundTypeSalesRefund: {value:3, label:'销售退款'},
+}
+
+//申请单退款状态枚举
+export const REFUND_STATUS_ORDER = {
+    ReturnApplyOrderTypeAdvanceReceiptRefund: {value:1, label:'预收退款'}, // 预收退款
+    ReturnApplyOrderTypeReturnForRefund: {value:2, label:'退货退款'}, // 退货退款
+    ReturnApplyOrderTypeSalesRefund: {value:3, label:'销售退款'}, // 销售退款
 }

src/common/util.ts

@@ -24,7 +24,6 @@ export const throttle = (fn, delay) => {
   let pre = 0;
   return (...params) => {
     let now = new Date().getTime();
-    console.log('相差:',now-pre)
     if (now - pre > delay) {
       fn(...params);
       pre = now;