merge master

This commit is contained in:
lemon橪
2021-06-28 18:16:41 +08:00
14 changed files with 528 additions and 174 deletions

View File

@@ -22,10 +22,10 @@ export default {
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn',
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.109:8887'
// common: 'http://192.168.0.100:8890',
// buyer: 'http://192.168.0.100:8888',
// seller: 'http://192.168.0.100:8889',
// manager: 'http://192.168.0.100:8887'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

View File

@@ -121,7 +121,7 @@
</div>
<div class="detail-item">
<div>
<div @click="navigateTo('seckill')">
<span>{{homeData.seckillNum || 0}}</span>
<div>待参加活动</div>
</div>