diff --git a/App.vue b/App.vue
index e0c8d03..3886872 100644
--- a/App.vue
+++ b/App.vue
@@ -5,14 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://hsg.dctpay.com/crest',
- // imgUrl: 'https://hsg.dctpay.com/filesystem/',
- // brestUrl : 'https://hsg.dctpay.com/brest',
+ url: 'https://hsg.dctpay.com/crest',
+ imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ brestUrl : 'https://hsg.dctpay.com/brest',
+ imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- 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/',
+ // 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/pages/goods/HM-search/HM-search.vue b/pages/goods/HM-search/HM-search.vue
index d0a48b8..9851902 100644
--- a/pages/goods/HM-search/HM-search.vue
+++ b/pages/goods/HM-search/HM-search.vue
@@ -122,7 +122,7 @@
//加载默认搜索关键字
loadDefaultKeyword() {
//定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
- this.defaultKeyword = "搜索卡券";
+ this.defaultKeyword = "搜索门店";
},
//加载历史搜索,自动读取本地Storage
loadOldKeyword() {
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 3134b09..1a9b2b0 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -133,10 +133,10 @@
data() {
return {
imagewxUrl: app.globalData.imageWxImg,
- imgadres:'dhl.png',
- imgadres2:'xiala.png',
- imgadres1:'yhl.png',
- imgadres3:'yql.png',
+ imgadres: 'dhl.png',
+ imgadres2: 'xiala.png',
+ imgadres1: 'yhl.png',
+ imgadres3: 'yql.png',
detailList: [],
gunnumber: [],
user: '',
@@ -171,9 +171,9 @@
gasOilNo: '',
litre: '',
totalPrice: '0.00',
- discountPrice : '0.00',
- gasGunList :[],
- oilType : ''
+ discountPrice: '0.00',
+ gasGunList: [],
+ oilType: ''
}
},
onLoad(options) {
@@ -228,15 +228,14 @@
}
}
- }else{
+ } else {
uni.showToast({
title: res.return_msg,
icon: "none",
- duration:2000,
+ duration: 2000,
success() {
setTimeout(() => {
- uni.navigateBack({
- })
+ uni.navigateBack({})
}, 2000)
}
});
@@ -271,8 +270,10 @@
this.inputMoney = amount.price;
this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
- let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
- this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+ if(this.priceVip != this.priceGun){
+ let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
+ this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+ }
},
// 微信获取手机号
getPhoneNumber(PhoneNumber) {
@@ -307,8 +308,10 @@
Listeningfocus() {
this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
- let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
- this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+ if (this.priceVip != this.priceGun) {
+ let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
+ this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+ }
},
toPay() {
if (this.inputMoney == '' || this.inputMoney < 1) {
@@ -329,14 +332,16 @@
"goodsPrice": this.inputMoney,
"gasGunNo": this.gunNo,
"gasOilNo": this.gasOilNo,
- "gasOilType":this.oilType
+ "gasOilType": this.oilType
}]
}
addOrder(goods).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.redirectTo({
- url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data.payPrice + '&orderId=' + res.return_data.id + '&couponId=' + this.counId+'&adres='+this.storeList.gasAddress
+ url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data
+ .payPrice + '&orderId=' + res.return_data.id + '&couponId=' + this.counId +
+ '&adres=' + this.storeList.gasAddress
})
} else {
uni.showToast({
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index 04fb159..a4c93a0 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -332,7 +332,7 @@
]
}
],
- onilName: '90#',
+ onilName: '92#',
latitudeful:'',
longitudeful:''
}
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 649fb99..ef736fa 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -8,7 +8,7 @@
{{city}}
-
+
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 84a1a6a..6c7cabf 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -14,7 +14,7 @@
-
+
@@ -54,12 +54,14 @@
{{ row.name }}
-
+
-
+
-
+
@@ -69,14 +71,16 @@
-
-
+
+
-
+
@@ -180,13 +184,12 @@
随便逛逛
-
+
-
+
@@ -228,9 +231,9 @@
imgadres1: 'jbhed.png',
imgadres2: 'jt.png',
imgadres3: '',
- imgadres4:'homet.png',
- imgadres5:'homeh.png',
- webUrl:'',
+ imgadres4: 'homet.png',
+ imgadres5: 'homeh.png',
+ webUrl: '',
// 轮播图片
swiperList: [{
id: 1,
@@ -297,6 +300,8 @@
this.city = app.globalData.cityName;
this.getCouponListArea();
this.getCouponListgold();
+ this.getCmsContent();
+ this.getCmsAactibity();
}
},
onLoad() {
@@ -363,8 +368,8 @@
categoryCode: 'CMS_WX_APPLETS_HOME_ACTIVITY'
}
getCmsContent(params).then(res => {
- if (res.return_code == '000000' && res.return_data !='') {
- //弹窗首页广告
+ if (res.return_code == '000000' && res.return_data != '') {
+ //弹窗首页广告
this.showPopup();
this.imgadres3 = res.return_data[0].imgData;
this.webUrl = res.return_data[0].ext1;
@@ -376,7 +381,7 @@
this.$refs.popup.show();
},
close() {
- this.isShowAuth = false;
+ this.isShowAuth = false;
},
//关闭弹窗
closePopup() {
@@ -412,9 +417,9 @@
/**
* 跳转外链
*/
- jumpWeb(){
+ jumpWeb() {
uni.navigateTo({
- url: '../order/webUrl/webUrl?url='+ this.webUrl
+ url: '../order/webUrl/webUrl?url=' + this.webUrl
})
this.closePopup();
},
@@ -438,17 +443,17 @@
',' + res.longitude + '&key=7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB',
data: {},
success: function(res) {
- that.city = res.data.result.address_component.city.replace(/市/g,
- '');
- app.globalData.cityName = res.data.result.address_component.city
- .replace(/市/g, '');
+ // that.city = res.data.result.address_component.city.replace(/市/g,
+ // '');
+ that.city = res.data.result.address_component.province;
+ app.globalData.cityName = res.data.result.address_component.province;
app.globalData.cityId = res.data.result.ad_info.adcode;
// app.globalData.cityId = '500100';
that.getCouponListArea();
that.getCouponListgold();
uni.hideLoading();
that.getCmsContent();
- that.getCmsAactibity()
+ that.getCmsAactibity();
},
fail() {
uni.hideLoading()
@@ -697,7 +702,7 @@
})
},
//跳转团油
- jumpTyou(){
+ jumpTyou() {
uni.navigateTo({
url: '/pages/goods/refuel/refuel'
})
@@ -712,8 +717,8 @@
if (!app.globalData.userInfo) {
this.getuserinfos();
return false;
- }
- if(!app.globalData.userInfo.phone){
+ }
+ if (!app.globalData.userInfo.phone) {
this.isShowAuth = true;
return false;
}
@@ -722,33 +727,33 @@
})
} else if (item.name == '电影票') {
-
+
if (!app.globalData.userInfo) {
this.getuserinfos();
return false;
- }
- if(!app.globalData.userInfo.phone){
+ }
+ if (!app.globalData.userInfo.phone) {
this.isShowAuth = true;
return false;
}
uni.navigateTo({
url: '/pages/tabBar/order/order?id=2'
})
-
+
} else if (item.name == '话费充值') {
if (!app.globalData.userInfo) {
this.getuserinfos();
return false;
- }
- if(!app.globalData.userInfo.phone){
+ }
+ if (!app.globalData.userInfo.phone) {
this.isShowAuth = true;
return false;
}
uni.navigateTo({
url: '/pages/tabBar/order/order?id=3'
})
-
+
} else {
uni.showToast({
title: '暂未开通',
@@ -758,19 +763,19 @@
}
},
//单独跳转话费充值
- jumphuafei(){
+ jumphuafei() {
if (!app.globalData.userInfo) {
this.getuserinfos();
return false;
- }
- if(!app.globalData.userInfo.phone){
+ }
+ if (!app.globalData.userInfo.phone) {
this.isShowAuth = true;
return false;
}
uni.navigateTo({
url: '/pages/tabBar/order/order?id=3'
})
-
+
}
},
@@ -1275,12 +1280,12 @@
color: #777;
font-size: 28rpx;
}
-
+
//弹窗
button::after {
border: none
}
-
+
.Popup {
width: 600rpx;
background-color: #fff;
@@ -1291,7 +1296,7 @@
transform: translateY(-50%);
z-index: 320;
}
-
+
.Popup {
.logo-auth {
z-index: -1;
@@ -1308,20 +1313,20 @@
border-radius: 50%;
background: #fff;
}
-
+
image {
height: 80rpx;
margin-top: -54rpx;
}
}
-
+
.Popup .title {
font-size: 28rpx;
color: #000;
text-align: center;
margin-top: 30rpx
}
-
+
.Popup .tip {
font-size: 14px;
color: #555;
@@ -1329,7 +1334,7 @@
margin-top: 50rpx;
text-align: center;
}
-
+
.Popup .bottom .item {
width: 50%;
height: 90rpx;
@@ -1340,15 +1345,15 @@
color: #666;
margin-top: 54rpx;
}
-
+
.Popup .bottom .item.on {
width: 100%
}
-
+
.flex {
display: flex;
}
-
+
.Popup .bottom .item.grant {
font-size: 28rpx;
color: #fff;
@@ -1357,7 +1362,7 @@
border-radius: 0;
padding: 0;
}
-
+
.mask {
position: fixed;
top: 0;
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index 0c6d408..c1a6bb2 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -309,7 +309,7 @@
},
methods: {
toGoods(e, item) {
- if (item != 2 && item != 4 && item != 5) {
+ if (item != 2 && item != 4 && item != 5 && item != 6) {
uni.navigateTo({
url: '../../goods/goods?id=' + e
});
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 13e449a..81b5f28 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -18,7 +18,9 @@
-
+
+
@@ -96,6 +98,7 @@
headerPosition: "fixed",
imagewxUrl: app.globalData.imageWxImg,
imgadres:'noorder.png',
+ imgadres1:'dhf.png',
headerTop: "0px",
typeText: {
1: '等待付款',
diff --git a/pages/user/positioning/positioning.vue b/pages/user/positioning/positioning.vue
index bdb2b91..44ce932 100644
--- a/pages/user/positioning/positioning.vue
+++ b/pages/user/positioning/positioning.vue
@@ -52,7 +52,7 @@
this.posId = item.regionId;
this.posName = item.regionName;
app.globalData.cityId = item.regionId;
- app.globalData.cityName = item.regionName.replace(/市/g,'');
+ app.globalData.cityName = item.regionName;
uni.navigateBack({
})
}