2.肯德基和星巴克新增用户选择数量 3.星巴克肯德基新增打烊时间 4.肯德基订单详情新增手机点击查看 5.肯德基和星巴克修改文字位置 6.绑定工会卡优化 7.修改贵州柴油汽油专区 8.优化积分支付密码功能 9..新增话费充值弹master
parent
815337acc7
commit
cfb0389f82
@ -1,103 +1,164 @@ |
|||||||
<template> |
<template> |
||||||
<view> |
<view> |
||||||
<view class="logo"> |
<view class="logo"> |
||||||
<view class="img"> |
<view class="img"> |
||||||
<image mode="widthFix" src="../../../static/img/logo2.jpg"> |
<image mode="widthFix" src="../../../static/img/logo2.jpg"> |
||||||
</image> |
</image> |
||||||
</view> |
</view> |
||||||
</view> |
</view> |
||||||
<!-- 账号密码输入框 --> |
<!-- 账号密码输入框 --> |
||||||
<view class="form"> |
<view class="form re"> |
||||||
<view class="password"> |
<view class="username"> |
||||||
<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;"></image><input |
<view class="get-code" style="color: #676767;" @click.stop="getCode()">{{getCodeText}}</view> |
||||||
placeholder="请输入旧密码" type="number" maxlength="6" v-model="jpasswd" password=true placeholder-style="color: #333333;" /> |
<input placeholder="请输入手机号" disabled="true" v-model="phoneNumber" placeholder-style="color: #676767;" /> |
||||||
</view> |
</view> |
||||||
<view class="password"> |
<view class="code"> |
||||||
<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;"></image><input |
<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #676767;" /> |
||||||
placeholder="请输入新密码" type="number" maxlength="6" v-model="xpasswd" password=true placeholder-style="color: #333333;" /> |
</view> |
||||||
</view> |
<!-- <view class="password"> |
||||||
<view class="btn mart50" @tap="updateUserPayPwd">确 认</view> |
<image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;"></image> |
||||||
</view> |
<input placeholder="请输入旧密码" type="number" maxlength="6" v-model="jpasswd" password=true |
||||||
</view> |
placeholder-style="color: #333333;" /> |
||||||
</template> |
</view> --> |
||||||
|
<view class="password"> |
||||||
<script> |
<!-- <image src="../../../static/img/pas.png" style="width: 40rpx;height: 40rpx;"></image> --> |
||||||
import { |
<input placeholder="请输入新密码" type="number" maxlength="6" v-model="xpasswd" password=true |
||||||
updateUserPayPwd |
placeholder-style="color: #676767;" /> |
||||||
} from "../../../Utils/Api.js"; |
</view> |
||||||
let app =getApp(); |
<view class="btn mart50" @tap="updateUserPayPwd">确 认</view> |
||||||
export default { |
</view> |
||||||
data() { |
</view> |
||||||
return { |
</template> |
||||||
jpasswd: '', |
|
||||||
xpasswd: '', |
<script> |
||||||
} |
import { |
||||||
}, |
updateUserPayPwd, |
||||||
methods: { |
sendSmsCodeByHw |
||||||
updateUserPayPwd() { |
} from "../../../Utils/Api.js"; |
||||||
uni.hideKeyboard(); |
let app = getApp(); |
||||||
if (this.jpasswd == '') { |
export default { |
||||||
uni.showToast({ |
data() { |
||||||
title: '请填写旧密码', |
return { |
||||||
icon: "none" |
phoneNumber: "", |
||||||
}); |
code: '', |
||||||
return false; |
getCodeText: '获取验证码', |
||||||
} |
getCodeisWaiting: false, |
||||||
if (this.xpasswd == '') { |
jpasswd: '', |
||||||
uni.showToast({ |
xpasswd: '', |
||||||
title: '请填写新密码', |
} |
||||||
icon: "none" |
}, |
||||||
}); |
onLoad() { |
||||||
return false; |
this.phoneNumber = app.globalData.userInfo.phone; |
||||||
} |
}, |
||||||
uni.showLoading({ |
methods: { |
||||||
title: '设置中...' |
//发送短信 |
||||||
}) |
getCode() { |
||||||
let datas = { |
uni.hideKeyboard() |
||||||
"password": this.jpasswd, |
if (this.getCodeisWaiting) { |
||||||
"newPassword":this.xpasswd |
return; |
||||||
} |
} |
||||||
updateUserPayPwd(datas).then(res => { |
uni.showLoading({ |
||||||
if (res.return_code == '000000') { |
title: '发送中...' |
||||||
uni.hideLoading(); |
}) |
||||||
uni.showToast({ |
let params = { |
||||||
title: '修改成功', |
phone: this.phoneNumber, |
||||||
|
HWMSG: 6 |
||||||
|
} |
||||||
|
sendSmsCodeByHw(params).then(res => { |
||||||
|
if (res.return_code == '000000') { |
||||||
|
this.getCodeisWaiting = true; |
||||||
|
uni.showToast({ |
||||||
|
title: '验证码已发送', |
||||||
|
icon: "none" |
||||||
|
}); |
||||||
|
this.setTimer(); |
||||||
|
} else { |
||||||
|
uni.showToast({ |
||||||
|
title: res.return_msg, |
||||||
|
duration: 2000, |
||||||
|
icon: "none" |
||||||
|
}) |
||||||
|
uni.hideLoading() |
||||||
|
} |
||||||
|
}) |
||||||
|
}, |
||||||
|
//发送验证码 |
||||||
|
setTimer() { |
||||||
|
let holdTime = 60; |
||||||
|
this.getCodeText = "重新获取(60)" |
||||||
|
this.Timer = setInterval(() => { |
||||||
|
if (holdTime <= 0) { |
||||||
|
this.getCodeisWaiting = false; |
||||||
|
this.getCodeBtnColor = "#ffffff"; |
||||||
|
this.getCodeText = "获取验证码" |
||||||
|
clearInterval(this.Timer); |
||||||
|
return; |
||||||
|
} |
||||||
|
this.getCodeText = "重新获取(" + holdTime + ")" |
||||||
|
holdTime--; |
||||||
|
|
||||||
|
}, 1000) |
||||||
|
}, |
||||||
|
//修改密码 |
||||||
|
updateUserPayPwd() { |
||||||
|
uni.hideKeyboard(); |
||||||
|
if (this.code == '') { |
||||||
|
uni.showToast({ |
||||||
|
title: '请填写验证码', |
||||||
|
icon: "none", |
||||||
|
duration: 2000 |
||||||
|
}); |
||||||
|
return false; |
||||||
|
} |
||||||
|
|
||||||
|
if (this.xpasswd == '') { |
||||||
|
uni.showToast({ |
||||||
|
title: '请填写新的积分支付密码', |
||||||
|
icon: "none", |
||||||
|
duration: 2000 |
||||||
|
}); |
||||||
|
return false; |
||||||
|
} |
||||||
|
uni.showLoading({ |
||||||
|
title: '设置中...' |
||||||
|
}) |
||||||
|
let datas = { |
||||||
|
"code": this.code, |
||||||
|
"newPassword": this.xpasswd |
||||||
|
} |
||||||
|
updateUserPayPwd(datas).then(res => { |
||||||
|
if (res.return_code == '000000') { |
||||||
|
uni.hideLoading(); |
||||||
|
uni.showToast({ |
||||||
|
title: '修改成功', |
||||||
|
icon: "none", |
||||||
|
duration: 2000 |
||||||
|
}); |
||||||
|
uni.navigateBack({}) |
||||||
|
} else { |
||||||
|
uni.hideLoading(); |
||||||
|
uni.showToast({ |
||||||
|
title: res.return_msg, |
||||||
icon: "none", |
icon: "none", |
||||||
duration:2000 |
duration: 2000 |
||||||
}); |
}) |
||||||
app.globalData.userInfo = res.return_data |
} |
||||||
.object |
}) |
||||||
.highUser; |
} |
||||||
uni.setStorage({ |
} |
||||||
key: "user", |
} |
||||||
data: res.return_data |
</script> |
||||||
.object |
|
||||||
.highUser |
<style lang="scss"> |
||||||
}) |
@import '../../../static/css/login.scss'; |
||||||
uni.navigateBack({ |
|
||||||
}) |
.form { |
||||||
} else { |
.res { |
||||||
uni.hideLoading(); |
display: flex; |
||||||
uni.showToast({ |
justify-content: space-between; |
||||||
title: res.return_msg, |
align-items: center; |
||||||
icon: "none" |
height: 100upx; |
||||||
}) |
color: rgba($color: #ffffff, $alpha: 0.8); |
||||||
} |
} |
||||||
}) |
} |
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
</script> |
|
||||||
|
|
||||||
<style lang="scss"> |
|
||||||
@import "../../../static/css/login.scss"; |
|
||||||
.form { |
|
||||||
.res { |
|
||||||
display: flex; |
|
||||||
justify-content: space-between; |
|
||||||
align-items: center; |
|
||||||
height: 100upx; |
|
||||||
color: rgba($color: #ffffff, $alpha: 0.8); |
|
||||||
} |
|
||||||
} |
|
||||||
</style> |
</style> |
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,30 +1,68 @@ |
|||||||
<template> |
<template> |
||||||
<view> |
<view> |
||||||
<image class="width100" mode="widthFix" src="../../../static/img/unionimg/upay3.jpg"></image> |
<image class="width100" mode="widthFix" src="../../../static/img/unionimg/upay3.jpg"></image> |
||||||
<image class="width94 mart20" mode="widthFix" src="../../../static/img/unionimg/upay4.jpg" @click="jumprecent(1)"></image> |
<image class="width94 mart20" mode="widthFix" src="../../../static/img/unionimg/upay4.jpg" |
||||||
<image class="width94 mart10" mode="widthFix" src="../../../static/img/unionimg/upay2.jpg" @click="jumprecent(2)"></image> |
@click="jumprecent(1)"></image> |
||||||
<image class="width94 mart10" mode="widthFix" src="../../../static/img/unionimg/upay1.jpg" @click="jumprecent(3)"></image> |
<image class="width94 mart10" mode="widthFix" src="../../../static/img/unionimg/upay2.jpg" |
||||||
</view> |
@click="jumprecent(2)"></image> |
||||||
</template> |
<image class="width94 mart10" mode="widthFix" src="../../../static/img/unionimg/upay1.jpg" |
||||||
|
@click="jumprecent(3)"></image> |
||||||
<script> |
<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true"> |
||||||
export default { |
<image class="popImg" :src="imageUrl+imgadres1"></image> |
||||||
data() { |
</wybPopup> |
||||||
return { |
</view> |
||||||
|
</template> |
||||||
} |
|
||||||
}, |
<script> |
||||||
methods: { |
import { |
||||||
//跳转充值 |
getCmsContent |
||||||
jumprecent(item){ |
} from '../../../Utils/Api.js' |
||||||
uni.navigateTo({ |
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; |
||||||
url: '../recharge-centre/recharge-centre?id='+ item |
let app = getApp(); |
||||||
}) |
export default { |
||||||
} |
components: { |
||||||
} |
wybPopup |
||||||
} |
}, |
||||||
</script> |
data() { |
||||||
|
return { |
||||||
<style> |
imageUrl: app.globalData.imgUrl, |
||||||
|
imgadres1: '', |
||||||
|
} |
||||||
|
}, |
||||||
|
onLoad() { |
||||||
|
this.getCmsAactibity(); |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
//跳转充值 |
||||||
|
jumprecent(item) { |
||||||
|
uni.navigateTo({ |
||||||
|
url: '../recharge-centre/recharge-centre?id=' + item |
||||||
|
}) |
||||||
|
}, |
||||||
|
//查询弹窗 |
||||||
|
getCmsAactibity() { |
||||||
|
let params = { |
||||||
|
regionId: app.globalData.cityId, |
||||||
|
categoryCode: 'CMS_TELEPHONE_POP_UP' |
||||||
|
} |
||||||
|
getCmsContent(params).then(res => { |
||||||
|
if (res.return_code == '000000' && res.return_data != '') { |
||||||
|
//弹窗首页广告 |
||||||
|
this.imgadres1 = res.return_data[0].imgData; |
||||||
|
this.showPopup(); |
||||||
|
} |
||||||
|
}); |
||||||
|
}, |
||||||
|
//显示弹出 |
||||||
|
showPopup() { |
||||||
|
this.$refs.popup.show(); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
</script> |
||||||
|
<style lang="scss"> |
||||||
|
.popImg { |
||||||
|
width: 100%; |
||||||
|
height: 430px; |
||||||
|
} |
||||||
</style> |
</style> |
||||||
|
|||||||
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
Loading…
Reference in new issue