diff --git a/Utils/Api.js b/Utils/Api.js index 669025f..9409ab1 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -131,6 +131,14 @@ export const getUserNormalDiscountList = params => { export const getStoreList = params => { return POST('GET', `${base}/highMerchantStore/getStoreList`, params).then(res => res.data); } +//查询团油列表 +export const getGasStoreList = params => { + return POST('GET', `${base}/highGas/getGasStoreList`, params).then(res => res.data); +} +//查询团油详情 +export const getGasDetailByStoreKey = params => { + return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data); +} /** * H5 获取用户信息 diff --git a/pages.json b/pages.json index 1d182c4..a6b6d30 100644 --- a/pages.json +++ b/pages.json @@ -1,28 +1,6 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path" : "pages/goods/refuel-succes/refuel-succes", - "style" : - { - // 支付成功 - "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - - },{ - "path": "pages/goods/refuel-confirm/refuel-confirm", - "style": { - "navigationBarTitleText": "确认订单", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - - }, { "path": "pages/tabBar/home/home", "style": { "navigationBarTextStyle": "black", @@ -40,6 +18,27 @@ }] } } + }, { + "path": "pages/goods/refuel-succes/refuel-succes", + "style": { + // 支付成功 + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/goods/refuel-confirm/refuel-confirm", + "style": { + "navigationBarTitleText": "确认订单", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + }, { "path": "pages/user/order_details/order_details", "style": { @@ -424,8 +423,8 @@ } } - - ], + + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index bf1b561..59ed087 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -23,15 +23,15 @@ 92# - 团购价 + 团购价 6.38 - 油站价 + 油站价 6.88 - 国标价 + 国标价 6.88 diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue index 38e80d3..7cdc5ca 100644 --- a/pages/goods/refuel/refuel.vue +++ b/pages/goods/refuel/refuel.vue @@ -6,52 +6,14 @@ - - + + - 贵州花冠中石油燃气加油站 + {{item.store_name}} - 花冠路贵惠大道桐荫26号 - - - 1.9km - - - - 6.40油站价¥6.88 - - - - - - - - - 贵州花冠中石油燃气加油站 - - - 花冠路贵惠大道桐荫26号 - - - 1.9km - - - - 6.40油站价¥6.88 - - - - - - - - - 贵州花冠中石油燃气加油站 - - - 花冠路贵惠大道桐荫26号 + {{item.address}} 1.9km @@ -67,6 +29,7 @@