1.新增公众号一键加油入口

yj-dev
杨杰 3 years ago
parent bc9eeb2710
commit 3f48b10e59
  1. 20
      App.vue
  2. 4
      Utils/Api.js
  3. 112
      pages/goods/refuel-details/refuel-details.vue
  4. 22
      pages/tabBar/home/home.vue

@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest', // brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
// //
url: 'https://hsg.dctpay.com/crest', // url: 'https://hsg.dctpay.com/crest',
imgUrl: 'https://hsg.dctpay.com/filesystem/', // imgUrl: 'https://hsg.dctpay.com/filesystem/',
brestUrl : 'https://hsg.dctpay.com/brest', // brestUrl : 'https://hsg.dctpay.com/brest',
imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
// //
// url: 'https://hsgcs.dctpay.com/crest', url: 'https://hsgcs.dctpay.com/crest',
// brestUrl : 'https://hsgcs.dctpay.com/brest', brestUrl : 'https://hsgcs.dctpay.com/brest',
// imgUrl: 'https://hsgcs.dctpay.com/filesystem/', imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "", userInfo: "",
brestUserInfo : '', brestUserInfo : '',
openId: '', openId: '',
@ -34,7 +34,9 @@
// //
storename:'', storename:'',
// //
accountId:'' accountId:'',
//
accountType:''
}, },
onLaunch: function() { onLaunch: function() {
}, },

@ -185,6 +185,10 @@ export const getGasStoreList = params => {
export const getGasDetailByStoreKey = params => { export const getGasDetailByStoreKey = params => {
return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data); return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data);
} }
//团油一键加油查询详情
export const recentGasStation = params => {
return POST('GET', `${base}/highGas/recentGasStation`, params).then(res => res.data);
}
//团油距离限制 //团油距离限制
export const getDictionaryByCodeTypeOl = params => { export const getDictionaryByCodeTypeOl = params => {
return POST('GET', `${base}/common/getDictionaryByCodeTypeOl`, params).then(res => res.data); return POST('GET', `${base}/common/getDictionaryByCodeTypeOl`, params).then(res => res.data);

@ -145,7 +145,8 @@
getGasDetailByStoreKey, getGasDetailByStoreKey,
addOrder, addOrder,
getDictionaryByCodeTypeOl, getDictionaryByCodeTypeOl,
oilPriceDiscountCompute oilPriceDiscountCompute,
recentGasStation
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp(); let app = getApp();
@ -215,13 +216,30 @@
if (app.globalData.accountId) { if (app.globalData.accountId) {
this.isTyAgent = true; this.isTyAgent = true;
} }
// #ifdef H5
if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
this.recentGasStation();
} else {
this.getGasDetailByStoreKey();
}
// #endif
// #ifdef MP
this.getGasDetailByStoreKey(); this.getGasDetailByStoreKey();
// #endif
this.getDictionaryByCodeTypeOl(); this.getDictionaryByCodeTypeOl();
this.getDictionaryByCodeTypeMoney(); this.getDictionaryByCodeTypeMoney();
}, },
onShow() { onShow() {
this.user = app.globalData.userInfo; this.user = app.globalData.userInfo;
}, },
onUnload() {
if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
uni.removeStorage({
key: 'accountType'
})
app.globalData.accountType = '';
}
},
methods: { methods: {
// //
seeloaction() { seeloaction() {
@ -237,8 +255,47 @@
this.typeId = item; this.typeId = item;
this.$refs.popup.show(); this.$refs.popup.show();
}, },
//
recentGasStation() {
uni.showLoading({
title: '加载中...'
})
let params = {
latitude: app.globalData.latitude,
longitude: app.globalData.longitude,
isTyAgent: this.isTyAgent
}
recentGasStation(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.storeList = res.return_data;
if (!this.oilNo) {
this.oilNo = res.return_data.oilPriceList[0].oilNoName;
this.priceVip = res.return_data.oilPriceList[0].priceVip;
this.priceGun = res.return_data.oilPriceList[0].priceGun;
this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
this.detailList = res.return_data.oilPriceList;
this.oilType = res.return_data.oilPriceList[0].oilType;
this.gasGunList = res.return_data.gasGunList;
for (var i = 0; i < res.return_data.gasGunList.length; i++) {
if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
this.gunnumber.push(res.return_data.gasGunList[i])
this.gunNo = res.return_data.gasGunList[i].gunNo;
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
}
}
}
} else {
uni.showToast({
title: res.return_msg,
icon: "none",
duration: 2000
});
}
})
},
// //
getGasDetailByStoreKey() { getGasDetailByStoreKey() {
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
@ -322,26 +379,26 @@
this.priceGun = item.priceGun; this.priceGun = item.priceGun;
this.totalPrice = '0.00'; this.totalPrice = '0.00';
this.discountPrice = '0.00'; this.discountPrice = '0.00';
this.inputMoney = ''; this.inputMoney = '';
this.oilLiters = '0'; this.oilLiters = '0';
this.discount = '0'; this.discount = '0';
this.oilSubsidy = '0'; this.oilSubsidy = '0';
this.litersPreferences = '0'; this.litersPreferences = '0';
this.pricePreferences = '0'; this.pricePreferences = '0';
this.totalPreferences = '0'; this.totalPreferences = '0';
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
// //
changeValue2(item) { changeValue2(item) {
this.gunNo = item.gunNo; this.gunNo = item.gunNo;
this.totalPrice = '0.00'; this.totalPrice = '0.00';
this.discountPrice = '0.00'; this.discountPrice = '0.00';
this.inputMoney = ''; this.inputMoney = '';
this.oilLiters = '0'; this.oilLiters = '0';
this.discount = '0'; this.discount = '0';
this.oilSubsidy = '0'; this.oilSubsidy = '0';
this.litersPreferences = '0'; this.litersPreferences = '0';
this.pricePreferences = '0'; this.pricePreferences = '0';
this.totalPreferences = '0'; this.totalPreferences = '0';
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
@ -374,12 +431,12 @@
this.totalPrice = '0.00'; this.totalPrice = '0.00';
this.discountPrice = '0.00'; this.discountPrice = '0.00';
this.litre = ''; this.litre = '';
this.inputMoney = ''; this.inputMoney = '';
this.oilLiters = '0'; this.oilLiters = '0';
this.discount = '0'; this.discount = '0';
this.oilSubsidy = '0'; this.oilSubsidy = '0';
this.litersPreferences = '0'; this.litersPreferences = '0';
this.pricePreferences = '0'; this.pricePreferences = '0';
this.totalPreferences = '0'; this.totalPreferences = '0';
return; return;
} }
@ -480,7 +537,16 @@
success: function(res) { success: function(res) {
app.globalData.latitude = res.latitude; app.globalData.latitude = res.latitude;
app.globalData.longitude = res.longitude; app.globalData.longitude = res.longitude;
// #ifdef H5
if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
that.recentGasStation();
} else {
that.getGasDetailByStoreKey();
}
// #endif
// #ifdef MP
that.getGasDetailByStoreKey(); that.getGasDetailByStoreKey();
// #endif
setTimeout(() => { setTimeout(() => {
that.toPay(); that.toPay();
}, 500); }, 500);

@ -187,6 +187,20 @@
} }
} }
}) })
uni.getStorage({
key: 'accountType',
success(e) {
if (e.data) {
app.globalData.accountType = e.data;
if (e.data == '000000#/' && app.globalData.h5code) {
uni.navigateTo({
url: '../../goods/refuel-details/refuel-details'
})
}
}
}
})
// #endif // #endif
}, },
onLoad(options) { onLoad(options) {
@ -203,6 +217,10 @@
key: "accountId", key: "accountId",
data: arr2[1] data: arr2[1]
}) })
uni.setStorage({
key: "accountType",
data: arr2[1]
})
} }
if (app.globalData.h5code) { if (app.globalData.h5code) {
@ -261,7 +279,7 @@
methods: { methods: {
jumpcdx() { jumpcdx() {
location.href = location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'; 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
}, },
// //
getCmsContentcmsContent() { getCmsContentcmsContent() {
@ -381,7 +399,7 @@
that.city = res.data.result.address_component.province; that.city = res.data.result.address_component.province;
app.globalData.cityName = res.data.result.address_component app.globalData.cityName = res.data.result.address_component
.province; .province;
app.globalData.cityId = res.data.result.ad_info.adcode; app.globalData.cityId = res.data.result.ad_info.adcode;
uni.hideLoading(); uni.hideLoading();
if (res.data.result.ad_info.adcode) { if (res.data.result.ad_info.adcode) {
that.getCouponListArea(); that.getCouponListArea();

Loading…
Cancel
Save