diff --git a/src/api/index.js b/src/api/index.js index b1e386a..cf23aed 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -57,7 +57,7 @@ const postMobileCode = (mobile, code) => service.post('/api/sms-validate', { mob const getGoodsDetail = (goods_type, goods_id, temple_id) => service.get(`/api/${goods_type}/get-info?id=${goods_id}&temple_id=${temple_id}`); // 佛前供灯商品 -const getGoodsLightDetail = (goods_type, goods_id, temple_id) => service.get(`/api/temple/light?id=${goods_id}&temple_id=${temple_id}`); +const getGoodsLightDetail = (goods_type, goods_id, temple_id) => service.get(`/api/temple/light?temple_id=${temple_id}`); // 创建日行一善商品订单 const createFriendlyDayOrder = data => service.post('/api/order/create-friendly', data); @@ -167,7 +167,11 @@ const getPlatformHome = agent_id => service.get(`/api/home?agent_id=${agent_id}` // 查询是否登录 const hasLogin = () => service.get('/api/has-login'); +// 查询 +const getMeritTypes = () => service.get('/api/order/get-merit-types'); + export { + getMeritTypes, getDynamicDataByGoodsId, hasLogin, getHotWords, diff --git a/src/components/merit-name/index.vue b/src/components/merit-name/index.vue index ee46988..d4c3921 100644 --- a/src/components/merit-name/index.vue +++ b/src/components/merit-name/index.vue @@ -34,7 +34,7 @@ export default { default(){ return [] } - } + }, }, data() { return { diff --git a/src/pages/everyday-donation/index.vue b/src/pages/everyday-donation/index.vue index 77963ce..f3d10f0 100644 --- a/src/pages/everyday-donation/index.vue +++ b/src/pages/everyday-donation/index.vue @@ -400,7 +400,7 @@ export default { } .caret{ - padding-bottom: 2.2rem; + padding-bottom: .2rem; .head{ display: flex; justify-content: space-between; diff --git a/src/pages/fill-name/index.vue b/src/pages/fill-name/index.vue index 743d277..0a23b1f 100644 --- a/src/pages/fill-name/index.vue +++ b/src/pages/fill-name/index.vue @@ -5,16 +5,30 @@
- +
- +