diff --git a/App.vue b/App.vue index 5a54d7e..e0c8d03 100644 --- a/App.vue +++ b/App.vue @@ -12,7 +12,7 @@ url: 'https://hsgcs.dctpay.com/crest', brestUrl : 'https://hsgcs.dctpay.com/brest', imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - + imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', userInfo: "", brestUserInfo : '', openId: '', diff --git a/Utils/Api.js b/Utils/Api.js index e7ad43c..8a9f8f7 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -144,6 +144,10 @@ export const getGasDetailByStoreKey = params => { export const getDredgeProvince = params => { return POST('GET', `${base}/common/getDredgeProvince`, params).then(res => res.data); } +//获取cms +export const getCmsContent = params => { + return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data); +} /** @@ -156,10 +160,13 @@ export const getTPigKFCToken = params => { export const getTPigCinemaToken = params => { return POST('GET', `${base}/tPig/getTPigCinemaToken`, params).then(res => res.data); } - export const qzOrderToPay = params => { return POST('POST', `${base}/order/qzOrderToPay`, params).then(res => res.data); } +//取消订单 +export const cancelOrderByOrderNo = params => { + return POST('GET', `${base}/highOrder/cancelOrderByOrderNo`, params).then(res => res.data); +} /** * H5 获取用户信息 diff --git a/pages copy.json b/pages copy.json index aec8c41..e63ff10 100644 --- a/pages copy.json +++ b/pages copy.json @@ -162,14 +162,6 @@ "backgroundColorTop": "#ffffff", "backgroundColorBottom": "#f3f3f3" } - }, { - "path": "pages/user/myQR/myQR", - "style": { - "navigationBarTitleText": "我的二维码", - "app-plus": { - "bounce": "none" - } - } }, { "path": "pages/user/coupon/coupon", "style": { @@ -230,16 +222,7 @@ "backgroundColorTop": "#ffffff", "backgroundColorBottom": "#ffffff" } - }, { - "path": "pages/goods/ratings/ratings", - "style": { - "navigationBarTitleText": "商品评论", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50, - "backgroundColorTop": "#ffffff", - "backgroundColorBottom": "#ffffff" - } - }, + }, { "path": "pages/goods/store-list/store-details", "style": { diff --git a/pages.json b/pages.json index b23f753..72ff2aa 100644 --- a/pages.json +++ b/pages.json @@ -227,17 +227,6 @@ "navigationBarTextStyle": "white", "backgroundColorBottom": "#f3f3f3" } - }, { - "path": "pages/user/myQR/myQR", - "style": { - "navigationBarTitleText": "我的二维码", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white", - "app-plus": { - "bounce": "none" - } - } }, { "path": "pages/msg/msg", "style": { @@ -307,15 +296,6 @@ "backgroundColorTop": "#ffffff", "backgroundColorBottom": "#ffffff" } - }, { - "path": "pages/goods/ratings/ratings", - "style": { - "navigationBarTitleText": "商品评论", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50, - "backgroundColorTop": "#ffffff", - "backgroundColorBottom": "#ffffff" - } }, { "path": "pages/goods/store-list/store-details", @@ -440,7 +420,16 @@ } } - ], + ,{ + "path" : "pages/tabBar/order/webUrl/webUrl", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue index 6b1b1a6..8a16313 100644 --- a/pages/goods/coupon-details/coupon-details.vue +++ b/pages/goods/coupon-details/coupon-details.vue @@ -39,7 +39,7 @@ - + {{store.distance}}km @@ -62,6 +62,8 @@ return { couDesId: '', imageUrl: app.globalData.imgUrl, + imagewxUrl: app.globalData.imageWxImg, + imgadres:'noorder.png', couponDesInfo: [], storeList: [], oneTime: '', diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index 7620b3c..e2802e4 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -19,7 +19,7 @@ 去使用 - + - + - + @@ -19,117 +19,73 @@ - - + + + + + - 报税区直发发生的发生山东省丰盛的但是 - 限购5件 - + {{row.couponName}} + 限购{{row.limitNumber}}件 + - + - 200 + {{ row.discountPrice*100}} - - - - 100 - - - - - - - - - 报税区直发发生的发生山东省丰盛的但是 - 限购5件 - - - - - 200 + + ￥ {{ row.discountPrice*100}} - - + - 100 - - - - - - - - - 报税区直发发生的发生山东省丰盛的但是 - 限购5件 - - - - - 200 - - - - - 100 - - - - - - - - - 报税区直发发生的发生山东省丰盛的但是 - 限购5件 - - - - - 200 - - - - - 100 + ￥{{ row.salesPrice*100}} + - - diff --git a/pages/goods/recording/recording.vue b/pages/goods/recording/recording.vue index c4f4c31..a03ec4f 100644 --- a/pages/goods/recording/recording.vue +++ b/pages/goods/recording/recording.vue @@ -2,7 +2,7 @@ - + @@ -30,11 +30,14 @@ import { getUserGoldRecList } from '../../../Utils/Api.js'; + let app = getApp(); export default { data() { return { typeId: '', recordInfo: [], + imagewxUrl: app.globalData.imageWxImg, + imgadres:'noorder.png', pageNum: 1, pageSize: 10, isNoMoreData: false, diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index 9aa126e..3134b09 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -8,7 +8,7 @@ {{storeList.gasAddress}} - + {{storeList.distance}}km @@ -21,7 +21,7 @@ {{oilNo}} - + 平台价 @@ -44,18 +44,18 @@ 选择油号 - + {{oilNo}} - + 选择油枪 - + {{gunNo}}号 - + @@ -132,6 +132,11 @@ }, data() { return { + imagewxUrl: app.globalData.imageWxImg, + imgadres:'dhl.png', + imgadres2:'xiala.png', + imgadres1:'yhl.png', + imgadres3:'yql.png', detailList: [], gunnumber: [], user: '', diff --git a/pages/goods/refuel-succes/refuel-succes.vue b/pages/goods/refuel-succes/refuel-succes.vue index f890f71..e44f269 100644 --- a/pages/goods/refuel-succes/refuel-succes.vue +++ b/pages/goods/refuel-succes/refuel-succes.vue @@ -1,17 +1,17 @@