1.对接接口

yj-dev
杨杰 3 years ago
parent a0f8b254a2
commit cafe402af3
  1. 15
      App.vue
  2. 2
      pages/goods/HM-search/HM-search.vue
  3. 39
      pages/goods/refuel-details/refuel-details.vue
  4. 2
      pages/goods/refuel/refuel.vue
  5. 2
      pages/tabBar/category/category.vue
  6. 101
      pages/tabBar/home/home.vue
  7. 2
      pages/user/order_details/order_details.vue
  8. 5
      pages/user/order_list/order_list.vue
  9. 2
      pages/user/positioning/positioning.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: '',

@ -122,7 +122,7 @@
//
loadDefaultKeyword() {
//ajax,
this.defaultKeyword = "搜索卡券";
this.defaultKeyword = "搜索门店";
},
//,Storage
loadOldKeyword() {

@ -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({

@ -332,7 +332,7 @@
]
}
],
onilName: '90#',
onilName: '92#',
latitudeful:'',
longitudeful:''
}

@ -8,7 +8,7 @@
{{city}}<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="input-box">
<input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
<view class="icon search"></view>
</view>
<!-- <view class="icon-btn"> -->

@ -14,7 +14,7 @@
</view>
<!-- 搜索框 -->
<view class="input-box">
<input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
<view class="icon search"></view>
</view>
<!-- 右侧图标按钮 -->
@ -54,12 +54,14 @@
<view class="text">{{ row.name }}</view>
</view>
</view>
<image v-if='productList.length == 0' mode="widthFix" style="margin-top: 30px;width: 90%;margin-left: 5%;" @click="jumpTyou" :src="imagewxUrl+imgadres4"></image>
<image mode="widthFix" style="margin-top: 30px;width: 90%;margin-left: 5%;"
@click="jumpTyou" :src="imagewxUrl+imgadres4"></image>
<!-- 赠券 -->
<view style="width: 91%;margin-left: 5%;" v-if='productList.length != 0' @click="goGoodsList(1)">
<view style="width: 91%;margin-left: 5%;" v-if='productList.length != 0' @click="goGoodsList(1)">
<image class="mart30 width100" mode="widthFix" :src="imagewxUrl+imgadres"></image>
</view>
<swiper class="orange-content" style="border: 2px solid #ff5836;" v-if='productList.length != 0' :display-multiple-items="productListleg">
<swiper class="orange-content" style="border: 2px solid #ff5836;" v-if='productList.length != 0'
:display-multiple-items="productListleg">
<swiper-item class="swiper-hed" v-for="pro in productList" :key="pro.id" @click="toGoods(pro.id)">
<view class="swiper-item" :data-id="pro.id">
<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
@ -69,14 +71,16 @@
</view>
</swiper-item>
</swiper>
<image v-if='goldproductList.length == 0' mode="widthFix" style="margin-top: 30px;width: 90%;margin-left: 5%;" @click="jumphuafei" :src="imagewxUrl+imgadres5"></image>
<image mode="widthFix" style="margin-top: 30px;width: 90%;margin-left: 5%;"
@click="jumphuafei" :src="imagewxUrl+imgadres5"></image>
<!-- 金币 -->
<view style="width: 90%;margin-left: 5%;" v-if='goldproductList.length != 0' @click="goGoodsList(2)">
<image class="mart30 width100" mode="widthFix" :src="imagewxUrl+imgadres1"></image>
</view>
<!-- v-if="goldproductList&&goldproductList.length>0" -->
<swiper class="orange-content" :display-multiple-items="goldproductListleg" v-if='goldproductList.length != 0' next-margin="50rpx">
<swiper class="orange-content" :display-multiple-items="goldproductListleg" v-if='goldproductList.length != 0'
next-margin="50rpx">
<swiper-item class="swiper-hed" v-for="(item,index) in goldproductList" :key="index"
@click="toGoods(item.id)">
<view class="swiper-item" :data-id="item.id">
@ -180,13 +184,12 @@
<view class='bottom flex'>
<view class='item' @click='close'>随便逛逛</view>
<!-- #ifdef MP -->
<button class='item grant' open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber">去授权</button>
<button class='item grant' open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">去授权</button>
<!-- #endif -->
</view>
</view>
<view class='mask' v-if='isShowAuth' @click='close'></view>
<view class="height60"></view>
</view>
</template>
@ -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;

@ -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
});

@ -18,7 +18,9 @@
<view class="left">
<image v-if="row.highChildOrderList[0].goodsType == 1"
:src="imageUrl+row.highChildOrderList[0].goodsImg"></image>
<image v-else :src="row.highChildOrderList[0].goodsImg"></image>
<image v-if="row.highChildOrderList[0].goodsType == 6"
:src="imagewxUrl+imgadres1"></image>
<image v-if="row.highChildOrderList[0].goodsType != 1 && row.highChildOrderList[0].goodsType != 6" :src="row.highChildOrderList[0].goodsImg"></image>
</view>
<view class="right">
<view class="name">
@ -96,6 +98,7 @@
headerPosition: "fixed",
imagewxUrl: app.globalData.imageWxImg,
imgadres:'noorder.png',
imgadres1:'dhf.png',
headerTop: "0px",
typeText: {
1: '等待付款',

@ -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({
})
}

Loading…
Cancel
Save