xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改冲突

Browse Source
This commit is contained in:
Haiyi
2022-06-28 10:18:19 +08:00
parent 376c87c3f6 f38df6f9f1
commit 2fdb73afd6
32 changed files with 752 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/constant.js
+6 -1
View File
@@ -4,13 +4,18 @@
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/lymarket`
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
// export const BASE_URL = `http://192.168.1.30:40001/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` // 正式环境
<<<<<<< HEAD
// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添
=======
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
>>>>>>> f38df6f9f11edcef0ff8efb9504e2f5df8df4078
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
// CDN
src/common/enum.ts
+1 -1
View File
@@ -22,7 +22,7 @@ export const AFTER_ORDER_STATUS = {
ReturnStageChecked : {value:2, label:'待验布'}, // 待验布
ReturnStageReturned : {value:3, label:'已退款'}, // 已退款
ReturnStageCancel : {value:4, label:'已取消'}, // 已取消
ReturnStageQualityCheckPendingRefund : {value:5, label:'待退款'}, // 待退款-质检
ReturnStageQualityCheckPendingRefund : {value:5, label:'待退款'}, // 已验布
ReturnStageServiceOrderPendingRefund : {value:6, label:'待退款'}, // 待退款
ReturnStageRejected : {value:7, label:'已拒绝'}, // 已拒绝
}