Merge branch 'ma'

# Conflicts:
#	pages/product/goods.vue
#	pages/product/product/shop/-shop.vue
#	pages/product/product/style.scss
This commit is contained in:
mabo
2021-06-24 17:58:34 +08:00
5 changed files with 60 additions and 33 deletions

View File

@@ -7,10 +7,14 @@ const dev = {
// common: "http://192.168.0.100:8890",
// buyer: "http://192.168.0.100:8888",
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
};
// 生产环境
const prod = {
const prod = {
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
};