1.修改短信接口

2.上线5月10号
yj-dev
杨杰 3 years ago
parent 0ac6b0de78
commit c55b3cce40
  1. 4
      Utils/Api.js
  2. 2
      manifest.json
  3. 2
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 3
      pages/goods/refuel-details/refuel-details.vue
  5. 221
      pages/goods/refuel/refuel.vue
  6. 7
      pages/login/register.vue
  7. 21
      pages/tabBar/user/user.vue
  8. 7
      pages/user/bindingCard/bindingCard.vue
  9. 23
      pages/user/order_list/order_list.vue
  10. 7
      pages/userLogin/userLogin.vue

@ -329,8 +329,8 @@ export const getH5UserInfo = params => {
return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
}
//获取验证码
export const sendSmsCode = params => {
return POST('GET', `${base}/sms/sendSmsCode`, params).then(res => res.data);
export const sendSmsCodeByHw = params => {
return POST('GET', `${base}/SendSms/sendSmsCodeByHw`, params).then(res => res.data);
}
//绑定手机号
export const bindUserPhone = params => {

@ -83,7 +83,7 @@
"title" : "嗨加油",
"router" : {
"mode" : "hash",
"base" : "/hsgH5"
"base" : "/H5"
},
"devServer" : {
"port" : "",

@ -214,7 +214,7 @@
return;
}
if (this.paytype == 'jifen') {
if (this.paytype == 'gonghuika') {
let params = {
"orderId": this.orderNo,
"cardNo": this.user.hltCardNo.cardNo,

@ -293,6 +293,9 @@
this.priceVip = item.priceVip;
this.priceOfficial = item.priceOfficial;
this.priceGun = item.priceGun;
this.totalPrice = '0.00';
this.discountPrice = '0.00';
this.inputMoney = '';
this.$refs.popup.hide();
},
//

@ -8,20 +8,21 @@
@result="result"></slFilter> -->
<view class="width100 height40 backcorfff">
<view class="width90">
<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
<!-- <view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
</view> -->
</view>
</view>
<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
</view>
<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
@ -29,7 +30,8 @@
</image>
<view class="recontright">
<view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)">
{{item.store_name}}</view>
{{item.store_name}}
</view>
<view class="width100 mart5 height22">
<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
{{item.address}}
@ -48,7 +50,7 @@
<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">筛选距离</view>
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view>
<!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view> -->
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view>
<view class="mart15" v-if="typeId == 1">
<view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
@ -57,29 +59,29 @@
</view>
</view>
<view class="mart15" v-if="typeId == 2">
<!-- <view class="mart15" v-if="typeId == 2">
<view :class="item.name == distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
:key="index" @click="changeValue1(item)">
{{item.name}}
</view>
</view>
</view> -->
<view class="mart15" v-if="typeId == 3">
<view v-for="(item,index) in oilList" :key="index">
<view class="font15 fcor666 width90 mart10 height22">{{item.name}}</view>
<view :class="items.name == onilName?'activeRefuel':'refuel'"
v-for="(items,indexs) in item.nillist" :key="indexs" @click="changeValue2(items)">
{{items.name}}
</view>
<view class="font15 fcor666 width90 mart10 height22">油品</view>
<view :class="items.codeName == onilName?'activeRefuel':'refuel'" v-for="(items,indexs) in oilList"
:key="indexs" @click="changeValue2(items)">
{{items.codeName}}
</view>
</view>
</wybPopup>
<!-- <authorize></authorize> -->
</view>
</template>
<script>
import {
getGasStoreList
getGasStoreList,
getDictionaryByCodeType
} from '../../../Utils/Api.js';
import slFilter from '@/components/sl-filter/sl-filter.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@ -99,80 +101,10 @@
titleColor: '#666666',
filterResult: '',
imagewxUrl: app.globalData.imageWxImg,
imgadres:'btjy.png',
imgadres1:'dh.png',
imgadres2:'xiala.png',
imgadres3:'noorder.png',
menuList: [
{
'title': '油号',
'key': 'single2',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '90#',
'value': ''
}, {
'title': '92#',
'value': '92#'
}, {
'title': '95#',
'value': '95#'
}, {
'title': '98#',
'value': '98#'
}, {
'title': '101#',
'value': '101#'
}, ]
},
{
'title': '距离',
'key': 'single3',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '6km内',
'value': ''
},
{
'title': '10km内',
'value': '10km内'
},
{
'title': '15km内',
'value': '15km内'
},
{
'title': '20km内',
'value': '20km内'
},
{
'title': '50km内',
'value': '50km内'
}, {
'title': '2000km内',
'value': '2000'
}
]
}, {
'title': '距离',
'key': 'single1',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '距离最近',
'value': ''
}]
}
],
imgadres: 'btjy.png',
imgadres1: 'dh.png',
imgadres2: 'xiala.png',
imgadres3: 'noorder.png',
refuelList: [],
pageNum: 1,
pageSize: 10,
@ -216,102 +148,16 @@
name: '距离最近'
}],
typeId: '',
oilList: [{
id: 1,
name: '汽油',
nillist: [{
id: 1,
name: '90#'
},
{
id: 2,
name: '92#'
},
{
id: 3,
name: '95#'
},
{
id: 4,
name: '98#'
},
{
id: 5,
name: '101#'
},
{
id: 6,
name: '95(甲醇)#'
},
{
id: 7,
name: '92(甲醇)#'
}
]
},
{
id: 2,
name: '柴油',
nillist: [{
id: 1,
name: '-40#'
},
{
id: 2,
name: '-35#'
},
{
id: 3,
name: '-30#'
},
{
id: 4,
name: '-20#'
},
{
id: 5,
name: '-10#'
},
{
id: 6,
name: '车队0#'
},
{
id: 7,
name: '0#'
},
{
id: 8,
name: '柴油#'
},
]
},
{
id: 3,
name: '天然气',
nillist: [{
id: 1,
name: 'CNG'
},
{
id: 2,
name: 'LNG'
},
{
id: 3,
name: 'LPG'
}
]
}
],
onilName: '92#',
latitudeful:'',
longitudeful:'',
oilList: [],
onilName: '0#',
latitudeful: '',
longitudeful: '',
isTyAgent: false //
}
},
onLoad() {
let that = this;
that.getDictionaryByCodeType();
if (app.globalData.accountId) {
that.isTyAgent = true;
}
@ -328,6 +174,17 @@
this.getGasStoreList();
},
methods: {
//
getDictionaryByCodeType() {
let datas = {
codeType: 'GAS_OIL_TYPE'
}
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
this.oilList = res.return_data;
}
})
},
//
changeValue(item) {
this.distance = item.name;
@ -357,7 +214,7 @@
},
changeValue2(item) {
this.onilName = item.name;
this.onilName = item.codeName;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];

@ -24,7 +24,7 @@
<script>
import md5 from "@/common/SDK/md5.min.js";
import {
sendSmsCode,
sendSmsCodeByHw,
bindUserPhone,
H5login
} from "../../Utils/Api.js";
@ -63,9 +63,10 @@
title: '发送中...'
})
let params = {
phone: this.phoneNumber
phone: this.phoneNumber,
HWMSG:3
}
sendSmsCode(params).then(res => {
sendSmsCodeByHw(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.getCodeisWaiting = true;

@ -19,7 +19,7 @@
<view class="username" v-else>{{user.name}}</view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="username" >{{user.name}}</view>
<view class="username">{{user.name}}</view>
<!-- #endif -->
<view class="font14 fcorfff" v-if="!user.gold">积分: 0</view>
<view class="font14 fcorfff" v-else>积分: {{user.gold}} </view>
@ -27,11 +27,11 @@
</view>
<!-- 二维码按钮 -->
<!-- #ifdef MP -->
<button class="erweima fotct aliitem font14" v-if="user == null" open-type="getPhoneNumber"
<!-- <button class="erweima fotct aliitem font14" v-if="user == ''" open-type="getPhoneNumber"
@getphonenumber="loginByPhone">
<image src="../../../static/img/jingbi.png"></image> 充值积分
</button>
<button class="erweima fotct aliitem font14" v-else @click="toDeposit">
</button> -->
<button class="erweima fotct aliitem font14" @click="toDeposit">
<image src="../../../static/img/jingbi.png"></image> 充值积分
</button>
<!-- #endif -->
@ -413,9 +413,16 @@
return false
},
toDeposit() {
uni.navigateTo({
url: '../../user/deposit/deposit'
})
if (this.user) {
uni.navigateTo({
url: '../../user/deposit/deposit'
})
} else {
uni.navigateTo({
url: '/pages/userLogin/userLogin'
})
}
},
toPage(url, item) {
if (item != '客服') {

@ -43,7 +43,7 @@
<script>
import md5 from "@/common/SDK/md5.min.js";
import {
sendSmsCode,
sendSmsCodeByHw,
getHuiLianTongCardByCardNo,
getDetailByCardNo,
bindHuiLianTongCard,
@ -132,9 +132,10 @@
title: '发送中...'
})
let params = {
phone: this.phoneNumber
phone: this.phoneNumber,
HWMSG:1
}
sendSmsCode(params).then(res => {
sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
this.getCodeBtnColor = "#999999"

@ -16,37 +16,44 @@
<view class="width96 height40" @click="jumpDetails(row.id)">
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 1">
<image src="../../../static/img/order2.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
卡券订单
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
积分充值
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 7">
<image src="../../../static/img/order9.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order9.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
优惠券包
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order4.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
团油订单
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order5.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
电影票
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order3.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
KFC
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 8">
<image src="../../../static/img/ghkpay.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/ghkpay.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
工会卡充值
</view>
<view class="width50 flright fotrt fcor666 font15">
@ -316,7 +323,7 @@
url: "/pages/pay/payment/payment?amount=" + row.payPrice +
'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
.ext1+ '&goodsType='+ row.highChildOrderList[0].goodsType
.ext1 + '&goodsType=' + row.highChildOrderList[0].goodsType
})
}
}

@ -49,7 +49,7 @@
loginByPhone,
HandleCode,
loginByTel,
sendSmsCode
sendSmsCodeByHw
} from "../../Utils/Api.js"
export default {
data() {
@ -211,9 +211,10 @@
title: '发送中...'
})
let params = {
phone: this.phoneNumber
phone: this.phoneNumber,
HWMSG:5
}
sendSmsCode(params).then(res => {
sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
uni.showToast({

Loading…
Cancel
Save