1.修改短信接口

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

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

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

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

@ -292,7 +292,10 @@
this.gasOilNo = item.oilNo; this.gasOilNo = item.oilNo;
this.priceVip = item.priceVip; this.priceVip = item.priceVip;
this.priceOfficial = item.priceOfficial; this.priceOfficial = item.priceOfficial;
this.priceGun = item.priceGun; this.priceGun = item.priceGun;
this.totalPrice = '0.00';
this.discountPrice = '0.00';
this.inputMoney = '';
this.$refs.popup.hide(); this.$refs.popup.hide();
}, },
// //

@ -1,502 +1,359 @@
<template> <template>
<view> <view>
<view class="width100 backcorfff"> <view class="width100 backcorfff">
<image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image> <image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image>
<uSearchBar @confirm="search" @input="input"></uSearchBar> <uSearchBar @confirm="search" @input="input"></uSearchBar>
</view> </view>
<!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList" <!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList"
@result="result"></slFilter> --> @result="result"></slFilter> -->
<view class="width100 height40 backcorfff"> <view class="width100 height40 backcorfff">
<view class="width90"> <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> <image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> </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> <image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> </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> <image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> </view> -->
</view>
</view> </view>
</view>
<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image> <view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
</view> <image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index"> </view>
<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r" <view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
style="max-height: 80px;" @click="goDetails(item.store_key,item.id)"> <image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
</image> style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
<view class="recontright"> </image>
<view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)"> <view class="recontright">
{{item.store_name}}</view> <view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)">
<view class="width100 mart5 height22"> {{item.store_name}}
<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)"> </view>
{{item.address}} <view class="width100 mart5 height22">
</view> <view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)"> {{item.address}}
<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image> </view>
{{item.distance}}km <view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
</view> <image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
</view> {{item.distance}}km
<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)"> </view>
<text class="font18 fontwig6">{{item.price_vip}}</text><text </view>
class="fcor999 margle">油站价{{item.price_gun}}</text> <view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
</view> <text class="font18 fontwig6">{{item.price_vip}}</text><text
</view> class="fcor999 margle">油站价{{item.price_gun}}</text>
</view> </view>
</view>
<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false"> </view>
<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> <wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view> <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">筛选距离</view>
<view class="mart15" v-if="typeId == 1"> <!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view> -->
<view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber" <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view>
:key="index" @click="changeValue(item)"> <view class="mart15" v-if="typeId == 1">
{{item.name}} <view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
</view> :key="index" @click="changeValue(item)">
</view> {{item.name}}
</view>
<view class="mart15" v-if="typeId == 2"> </view>
<view :class="item.name == distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
:key="index" @click="changeValue1(item)"> <!-- <view class="mart15" v-if="typeId == 2">
{{item.name}} <view :class="item.name == distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
</view> :key="index" @click="changeValue1(item)">
</view> {{item.name}}
<view class="mart15" v-if="typeId == 3"> </view>
<view v-for="(item,index) in oilList" :key="index"> </view> -->
<view class="font15 fcor666 width90 mart10 height22">{{item.name}}</view> <view class="mart15" v-if="typeId == 3">
<view :class="items.name == onilName?'activeRefuel':'refuel'" <view class="font15 fcor666 width90 mart10 height22">油品</view>
v-for="(items,indexs) in item.nillist" :key="indexs" @click="changeValue2(items)"> <view :class="items.codeName == onilName?'activeRefuel':'refuel'" v-for="(items,indexs) in oilList"
{{items.name}} :key="indexs" @click="changeValue2(items)">
</view> {{items.codeName}}
</view> </view>
</view> </view>
</wybPopup> </wybPopup>
<!-- <authorize></authorize> --> <!-- <authorize></authorize> -->
</view>
</template> </view>
</template>
<script>
import { <script>
getGasStoreList import {
} from '../../../Utils/Api.js'; getGasStoreList,
import slFilter from '@/components/sl-filter/sl-filter.vue'; getDictionaryByCodeType
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; } from '../../../Utils/Api.js';
import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'; import slFilter from '@/components/sl-filter/sl-filter.vue';
// import authorize from '../../../components/Authorize.vue' import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp(); import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
export default { // import authorize from '../../../components/Authorize.vue'
components: { let app = getApp();
slFilter, export default {
// authorize, components: {
uSearchBar, slFilter,
wybPopup // authorize,
}, uSearchBar,
data() { wybPopup
return { },
themeColor: '#089bf5', data() {
titleColor: '#666666', return {
filterResult: '', themeColor: '#089bf5',
imagewxUrl: app.globalData.imageWxImg, titleColor: '#666666',
imgadres:'btjy.png', filterResult: '',
imgadres1:'dh.png', imagewxUrl: app.globalData.imageWxImg,
imgadres2:'xiala.png', imgadres: 'btjy.png',
imgadres3:'noorder.png', imgadres1: 'dh.png',
menuList: [ imgadres2: 'xiala.png',
{ imgadres3: 'noorder.png',
'title': '油号', refuelList: [],
'key': 'single2', pageNum: 1,
'isMutiple': false, pageSize: 10,
'detailTitle': '', isNoMoreData: false,
'reflexTitle': true, searname: '',
'defaultSelectedIndex': 0, gunnumber: [{
'detailList': [{ id: 1,
'title': '90#', name: '6km内',
'value': '' value: 6
}, { },
'title': '92#', {
'value': '92#' id: 2,
}, { name: '10km内',
'title': '95#', value: 10
'value': '95#' },
}, { {
'title': '98#', id: 3,
'value': '98#' name: '15km内',
}, { value: 15
'title': '101#', },
'value': '101#' {
}, ] id: 4,
}, name: '20km内',
{ value: 20
'title': '距离', },
'key': 'single3', {
'isMutiple': false, id: 5,
'detailTitle': '', name: '50km内',
'reflexTitle': true, value: 50
'defaultSelectedIndex': 0, }, {
'detailList': [{ id: 6,
'title': '6km内', name: '2000km内',
'value': '' value: 2000
}, }
{ ],
'title': '10km内', distance: '50km内',
'value': '10km内' distanceNum: '50',
}, distanceName: '距离最近',
{ detailList: [{
'title': '15km内', id: 1,
'value': '15km内' name: '距离最近'
}, }],
{ typeId: '',
'title': '20km内', oilList: [],
'value': '20km内' onilName: '0#',
}, latitudeful: '',
{ longitudeful: '',
'title': '50km内', isTyAgent: false //
'value': '50km内' }
}, { },
'title': '2000km内', onLoad() {
'value': '2000' let that = this;
} that.getDictionaryByCodeType();
] if (app.globalData.accountId) {
}, { that.isTyAgent = true;
'title': '距离', }
'key': 'single1', uni.getLocation({
'isMutiple': false, type: 'wgs84',
'detailTitle': '', success: function(res) {
'reflexTitle': true, that.latitudeful = res.latitude;
'defaultSelectedIndex': 0, that.longitudeful = res.longitude;
'detailList': [{ that.getGasStoreList();
'title': '距离最近', }
'value': '' })
}] },
onReachBottom() {
} this.getGasStoreList();
], },
refuelList: [], methods: {
pageNum: 1, //
pageSize: 10, getDictionaryByCodeType() {
isNoMoreData: false, let datas = {
searname: '', codeType: 'GAS_OIL_TYPE'
gunnumber: [{ }
id: 1, getDictionaryByCodeType(datas).then(res => {
name: '6km内', if (res.return_code == '000000') {
value: 6 this.oilList = res.return_data;
}, }
{ })
id: 2, },
name: '10km内', //
value: 10 changeValue(item) {
}, this.distance = item.name;
{ this.distanceNum = item.value;
id: 3, this.pageNum = 1;
name: '15km内', this.isNoMoreData = false;
value: 15 this.refuelList = [];
}, this.getGasStoreList();
{ this.$refs.popup.hide();
id: 4, },
name: '20km内',
value: 20 seeloaction(item) {
}, uni.openLocation({
{ latitude: Number(item.latitude), //
id: 5, longitude: Number(item.longitude), //
name: '50km内', name: item.store_name,
value: 50 address: item.address
}, { })
id: 6, },
name: '2000km内', changeValue1(item) {
value: 2000 this.distanceName = item.name;
} this.pageNum = 1;
], this.isNoMoreData = false;
distance: '50km内', this.refuelList = [];
distanceNum: '50', this.getGasStoreList();
distanceName: '距离最近', this.$refs.popup.hide();
detailList: [{ },
id: 1,
name: '距离最近' changeValue2(item) {
}], this.onilName = item.codeName;
typeId: '', this.pageNum = 1;
oilList: [{ this.isNoMoreData = false;
id: 1, this.refuelList = [];
name: '汽油', this.getGasStoreList();
nillist: [{ this.$refs.popup.hide();
id: 1, },
name: '90#' //
}, showPopup(item) {
{ this.typeId = item;
id: 2, this.$refs.popup.show();
name: '92#' },
}, search(res) {
{ uni.showToast({
id: 3, title: '搜索:' + res.value,
name: '95#' icon: 'none'
}, })
{ },
id: 4, input(res) {
name: '98#' this.searname = res;
}, this.pageNum = 1;
{ this.isNoMoreData = false;
id: 5, this.refuelList = [];
name: '101#' this.getGasStoreList();
}, },
{ //
id: 6, getGasStoreList() {
name: '95(甲醇)#' uni.showLoading({
}, title: '加载中...'
{ })
id: 7, if (this.isNoMoreData) {
name: '92(甲醇)#' uni.hideLoading()
} return false;
] }
}, let pagenum = this.pageNum;
{ let params = {
id: 2, storeName: this.searname,
name: '柴油', distance: this.distanceNum,
nillist: [{ regionId: app.globalData.cityId,
id: 1, oilNoName: this.onilName,
name: '-40#' latitude: this.latitudeful,
}, longitude: this.longitudeful,
{ pageNum: pagenum,
id: 2, pageSize: this.pageSize,
name: '-35#' isTyAgent: this.isTyAgent
}, }
{ getGasStoreList(params).then(res => {
id: 3, if (res.return_code == '000000') {
name: '-30#' uni.hideLoading();
}, this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
{ if (res.return_data.total == (this.pageNum * this.pageSize)) {
id: 4, this.isNoMoreData = true;
name: '-20#' }
}, this.refuelList = this.refuelList.concat(res.return_data.list);
{ this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
id: 5, } else {
name: '-10#' this.refuelList = [];
}, uni.hideLoading()
{ }
id: 6, })
name: '车队0#' },
}, //
{ goDetails(items, itemId) {
id: 7, uni.navigateTo({
name: '0#' url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
}, })
{ },
id: 8, result(val) {
name: '柴油#' console.log('filter_result:' + JSON.stringify(val));
}, this.filterResult = JSON.stringify(val, null, 2)
] }
}, }
{ }
id: 3, </script>
name: '天然气',
nillist: [{ <style lang="scss">
id: 1, page {
name: 'CNG' background-color: #f1f3f5;
}, }
{
id: 2, .refuel {
name: 'LNG' padding: 6px 5px;
}, border-radius: 5px;
{ background-color: #f6f6f6;
id: 3, color: #666666;
name: 'LPG' margin-left: 10px;
} margin-top: 15px;
] display: inline-block;
} font-size: 13px;
], width: 18%;
onilName: '92#', text-align: center;
latitudeful:'', }
longitudeful:'',
isTyAgent: false // .activeRefuel {
} padding: 6px 5px;
}, border-radius: 5px;
onLoad() { border: 1px solid #089bf5;
let that = this; color: #089bf5;
if (app.globalData.accountId) { margin-left: 10px;
that.isTyAgent = true; margin-top: 15px;
} display: inline-block;
uni.getLocation({ font-size: 13px;
type: 'wgs84', width: 18%;
success: function(res) { text-align: center;
that.latitudeful = res.latitude; }
that.longitudeful = res.longitude;
that.getGasStoreList(); .stuMenu {
} width: 33.3%;
}) height: 30px;
}, line-height: 30px;
onReachBottom() { font-size: 14px;
this.getGasStoreList(); color: #333333;
},
methods: { .stuimg {
// width: 10px;
changeValue(item) { vertical-align: middle;
this.distance = item.name; }
this.distanceNum = item.value; }
this.pageNum = 1;
this.isNoMoreData = false; .sear {
this.refuelList = []; margin-left: 10px;
this.getGasStoreList(); width: 50px;
this.$refs.popup.hide(); }
},
.searImg {
seeloaction(item) { margin-left: 55px;
uni.openLocation({ }
latitude: Number(item.latitude), //
longitude: Number(item.longitude), // .recontleft {
name: item.store_name, width: 80px;
address: item.address margin-left: 10px;
}) }
},
changeValue1(item) { .recontright {
this.distanceName = item.name; margin-left: 95px;
this.pageNum = 1; }
this.isNoMoreData = false;
this.refuelList = []; .text {
this.getGasStoreList(); margin-top: 50px;
this.$refs.popup.hide(); margin-left: 20px;
}, width: 100%;
}
changeValue2(item) {
this.onilName = item.name;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
//
showPopup(item) {
this.typeId = item;
this.$refs.popup.show();
},
search(res) {
uni.showToast({
title: '搜索:' + res.value,
icon: 'none'
})
},
input(res) {
this.searname = res;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
},
//
getGasStoreList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
storeName: this.searname,
distance: this.distanceNum,
regionId: app.globalData.cityId,
oilNoName: this.onilName,
latitude: this.latitudeful,
longitude: this.longitudeful,
pageNum: pagenum,
pageSize: this.pageSize,
isTyAgent: this.isTyAgent
}
getGasStoreList(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.refuelList = this.refuelList.concat(res.return_data.list);
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.refuelList = [];
uni.hideLoading()
}
})
},
//
goDetails(items, itemId) {
uni.navigateTo({
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
})
},
result(val) {
console.log('filter_result:' + JSON.stringify(val));
this.filterResult = JSON.stringify(val, null, 2)
}
}
}
</script>
<style lang="scss">
page {
background-color: #f1f3f5;
}
.refuel {
padding: 6px 5px;
border-radius: 5px;
background-color: #f6f6f6;
color: #666666;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.activeRefuel {
padding: 6px 5px;
border-radius: 5px;
border: 1px solid #089bf5;
color: #089bf5;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.stuMenu {
width: 33.3%;
height: 30px;
line-height: 30px;
font-size: 14px;
color: #333333;
.stuimg {
width: 10px;
vertical-align: middle;
}
}
.sear {
margin-left: 10px;
width: 50px;
}
.searImg {
margin-left: 55px;
}
.recontleft {
width: 80px;
margin-left: 10px;
}
.recontright {
margin-left: 95px;
}
.text {
margin-top: 50px;
margin-left: 20px;
width: 100%;
}
</style> </style>

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

@ -13,13 +13,13 @@
<image :src="user.headerImg" v-else></image> <image :src="user.headerImg" v-else></image>
</view> </view>
<!-- 昵称,个性签名 --> <!-- 昵称,个性签名 -->
<view class="right"> <view class="right">
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class="username" v-if="user && user.infoCompleteStatus == 1" @click="jumplogin">点击获取信息</view> <view class="username" v-if="user && user.infoCompleteStatus == 1" @click="jumplogin">点击获取信息</view>
<view class="username" v-else>{{user.name}}</view> <view class="username" v-else>{{user.name}}</view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class="username" >{{user.name}}</view> <view class="username">{{user.name}}</view>
<!-- #endif --> <!-- #endif -->
<view class="font14 fcorfff" v-if="!user.gold">积分: 0</view> <view class="font14 fcorfff" v-if="!user.gold">积分: 0</view>
<view class="font14 fcorfff" v-else>积分: {{user.gold}} </view> <view class="font14 fcorfff" v-else>积分: {{user.gold}} </view>
@ -27,11 +27,11 @@
</view> </view>
<!-- 二维码按钮 --> <!-- 二维码按钮 -->
<!-- #ifdef MP --> <!-- #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"> @getphonenumber="loginByPhone">
<image src="../../../static/img/jingbi.png"></image> 充值积分 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button> -->
<button class="erweima fotct aliitem font14" v-else @click="toDeposit"> <button class="erweima fotct aliitem font14" @click="toDeposit">
<image src="../../../static/img/jingbi.png"></image> 充值积分 <image src="../../../static/img/jingbi.png"></image> 充值积分
</button> </button>
<!-- #endif --> <!-- #endif -->
@ -371,10 +371,10 @@
}) })
}, },
// //
jumplogin() { jumplogin() {
uni.navigateTo({ uni.navigateTo({
url: '../../userLogin/userLogin' url: '../../userLogin/userLogin'
}) })
}, },
// //
toMsg() { toMsg() {
@ -413,9 +413,16 @@
return false return false
}, },
toDeposit() { toDeposit() {
uni.navigateTo({ if (this.user) {
url: '../../user/deposit/deposit' uni.navigateTo({
}) url: '../../user/deposit/deposit'
})
} else {
uni.navigateTo({
url: '/pages/userLogin/userLogin'
})
}
}, },
toPage(url, item) { toPage(url, item) {
if (item != '客服') { if (item != '客服') {

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

@ -16,37 +16,44 @@
<view class="width96 height40" @click="jumpDetails(row.id)"> <view class="width96 height40" @click="jumpDetails(row.id)">
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 1"> 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>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 2"> 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" </view>
v-if="row.highChildOrderList[0].goodsType == 7"> <view class="width50 flleft aliitem fotlt font16"
<image src="../../../static/img/order9.png" class="marglerig" style="width: 50rpx;height: 50rpx;"></image> v-if="row.highChildOrderList[0].goodsType == 7">
优惠券包 <image src="../../../static/img/order9.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
优惠券包
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3"> 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>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5"> 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>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4"> 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 KFC
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 8"> 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>
<view class="width50 flright fotrt fcor666 font15"> <view class="width50 flright fotrt fcor666 font15">
@ -316,7 +323,7 @@
url: "/pages/pay/payment/payment?amount=" + row.payPrice + url: "/pages/pay/payment/payment?amount=" + row.payPrice +
'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0] '&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[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, loginByPhone,
HandleCode, HandleCode,
loginByTel, loginByTel,
sendSmsCode sendSmsCodeByHw
} from "../../Utils/Api.js" } from "../../Utils/Api.js"
export default { export default {
data() { data() {
@ -211,9 +211,10 @@
title: '发送中...' title: '发送中...'
}) })
let params = { let params = {
phone: this.phoneNumber phone: this.phoneNumber,
HWMSG:5
} }
sendSmsCode(params).then(res => { sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.getCodeisWaiting = true; this.getCodeisWaiting = true;
uni.showToast({ uni.showToast({

Loading…
Cancel
Save