Commit 8a32da74 authored by dragondean@qq.com's avatar dragondean@qq.com

Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	src/pages/order/order.vue
parents d8dc177d 9dbe2e62
......@@ -2,7 +2,7 @@
// const domain = 'https://api.jd.jdshangmen.com'
// const domain = 'https://api.sit.jdshangmen.com'
// const domain = 'https://api2.groupage.cn'
const domain = 'https://apitest.groupage.cn'
const domain = 'https://api2.groupage.cn'
const config = {
CDN_DOMAIN: domain,
API: domain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment