二维码生成页面中心icon没了的bug

一次大型分包更新生产了
合作企业路由
/packageQr/pages/partnership/partnership

员工管理路由
/packageStaff/pages/staff/List/List

油站二维码路由
/packageQr/pages/qrsite/QrCode_xy

加油订单路由改成
/packageOrders/pages/orderList/orderList
This commit is contained in:
xk_guohonglei
2021-01-22 17:19:34 +08:00
parent f1210f1a44
commit d2949e657a
46 changed files with 346 additions and 355 deletions

View File

@@ -1,115 +0,0 @@
<template>
<view class="page-content my-bg">
<cu-custom :isBack="true" class="main-topbar bg-main-oil" bgColor="bg-main-oil">
<block slot="content">手机短信验证</block>
<block slot="backText">返回</block>
</cu-custom>
<view class="bg-white cu-card margin-bottom-lg">
<view class="text-gray text-lg padding-top-lg padding-bottom-lg margin-bottom margin-top-lg text-center">
请输入 <text class="text-black">
{{oldPhone}}
</text> 收到的短信验证码
</view>
</view>
<view class="cu-form-group padding-top-sm padding-bottom-sm">
<view class="title text-black ">验证码</view>
<input type="number" :maxlength="6" v-model="authCode" placeholder="填写验证码" name="input" />
<text class="mini-left-border" :class="frozen?'text-gray':'oil-main-color'" @tap="sendMsg">{{tips}}</text>
</view>
<view class="padding margin-top-lg padding-top-lg">
<button class="bg-main-oil" @tap="nextStep">下一步</button>
</view>
</view>
</template>
<script>
import cloudSiteApi from '@/api/cloud-site.js'
export default {
data() {
return {
oldPhone: uni.getStorageSync('oldPhone'),
loginUser: uni.getStorageSync('loginUser'),
auth: {},
type: 'oldPhone',
authCode: "",
tips: '获取验证码',
frozen: false // 冷却时间
}
},
methods: {
nextStep() {
if (this.authCode) {
const data3 = {
phone: this.loginUser.userPhone,
authCode: this.authCode,
type: this.type
}
cloudSiteApi.updatePhone(data3).then(res => {
if (res.code == 20000) {
uni.showToast({
title: res.msg
})
setTimeout(() => {
uni.navigateTo({
url: '/pages/setup/changePhone/changePhone',
fail: (err) => {
console.log(err)
}
})
}, 800);
}
})
} else {
uni.showToast({
title: '请输入验证码',
icon: 'none'
});
}
},
sendMsg() {
if (!this.frozen) {
const data2 = {
phone: this.loginUser.userPhone
}
cloudSiteApi.updatePhoneSms(data2).then(res => {
console.log('res', res)
uni.showToast({
title: res.msg,
icon: 'none'
})
if (res.code == 20000) {
this.frozen = true
let second = 60
this.tips = `${second}秒后重发`
setTimeout(() => {
this.frozen = false
clearInterval(timer)
this.tips = `发送验证码`
}, 1000 * 60);
const timer = setInterval(() => {
second--
if (second) {
this.tips = `${second}秒后重发`
} else {
this.tips = `发送验证码`
}
}, 1000)
}
})
}
},
}
}
</script>
<style scoped>
.mini-left-border {
border-left: 1px solid #999;
padding-left: 1rem;
}
</style>

View File

@@ -1,134 +0,0 @@
<template>
<view class="page-content ">
<cu-custom :isBack="true" class="main-topbar bg-main-oil" bgColor="bg-main-oil">
<block slot="content">更换手机号</block>
<block slot="backText">返回</block>
</cu-custom>
<view class="boforeChange">
<view class="solid-bottom margin-bottom-lg">
<view class="cu-form-group padding-top-sm padding-bottom-sm">
<view class="title text-black ">新手机号</view>
<input type="number" :maxlength="11" v-model="newPhone" placeholder="请输入手机号" name="input" />
</view>
<view class="cu-form-group padding-top-sm solid-bottom padding-bottom-sm">
<view class="title text-black ">验证码</view>
<input type="number" :maxlength="6" v-model="authCode" placeholder="请输入验证码" name="input" />
<text :class="frozen?'text-gray':'oil-main-color'" @tap="sendMsg">{{tips}}</text>
</view>
</view>
<view class="margin-left padding-bottom-lg">
<text class="cuIcon-infofill padding-right-xs text-sm oil-main-color"></text>
<text class="text-sm text-grey">更换成功将会重新登录</text>
</view>
<view class="padding-xl margin-top-lg ">
<button class="bg-main-oil margin-top-lg" @tap="nextStep">提交</button>
</view>
</view>
<!-- <view class="afterChange">
<view class="">
<view class="cu-avatar xl round margin-left bg-red">
<text class="cuIcon-roundcheck"></text>
</view>
</view>
</view> -->
</view>
</template>
<script>
import cloudSiteApi from '@/api/cloud-site.js'
export default {
data() {
return {
oldPhone: uni.getStorageSync('oldPhone'),
newPhone: '',
loginUser: uni.getStorageSync('loginUser'),
auth: {},
type: 'newPhone',
authCode: "",
tips: '获取验证码',
frozen: false // 冷却时间
}
},
methods: {
nextStep() {
if (this.authCode) {
const data3 = {
phone: this.newPhone,
authCode: this.authCode,
type: this.type
}
cloudSiteApi.updatePhone(data3).then(res => {
if (res.code == 20000) {
uni.showToast({
title: res.msg + '请重新登录'
})
setTimeout(() => {
uni.clearStorage()
uni.reLaunch({
url: '/pages/login/boforeLogin/boforeLogin',
fail: (err) => {
console.log(err)
}
})
}, 1000);
}
})
} else {
uni.showToast({
title: '请输入验证码',
icon: 'none'
});
}
},
sendMsg() {
if (!this.frozen) {
if (this.newPhone) {
const data2 = {
phone: this.newPhone
}
cloudSiteApi.updatePhoneSms(data2).then(res => {
console.log('res', res)
uni.showToast({
title: res.msg,
icon: 'none'
})
if (res.code == 20000) {
this.frozen = true
let second = 60
this.tips = `${second}秒后重发`
setTimeout(() => {
this.frozen = false
clearInterval(timer)
this.tips = `发送验证码`
}, 1000 * 60);
const timer = setInterval(() => {
second--
if (second) {
this.tips = `${second}秒后重发`
} else {
this.tips = `发送验证码`
}
}, 1000)
}
})
} else {
uni.showToast({
title: '请输入新手机号'
});
}
}
},
}
}
</script>
<style scoped>
</style>

View File

@@ -1,157 +0,0 @@
<template>
<view class="page-content">
<cu-custom :isBack="true" class="main-topbar bg-main-oil" bgColor="bg-main-oil">
<block slot="content">绑定星油云站</block>
<block slot="backText">返回</block>
</cu-custom>
<view class=" margin radius cu-card shadow no-card padding-top padding-bottom ">
<view class="radius ">
<!-- <view class="cu-form-group">
<view class="title text-black">工号</view>
<input v-model="oilSiteNo" placeholder="请输入云站编号" name="input"></input>
</view> -->
<view class="cu-form-group">
<view class="title text-black mini-label">手机号</view>
<view class="text-right">
{{loginUser.userPhone}}
</view>
</view>
<view class="cu-form-group">
<input type="number" class="padding-left-xs" :maxlength="6" v-model="auth.authCode" placeholder="请输入六位数字验证码" name="input"></input>
<text :class="frozen?'text-gray':'oil-main-color'" @tap="sendMsg">{{tips}}</text>
</view>
<view class="cu-form-group">
<view class="title text-black mini-label">新密码</view>
<input type="password" v-model="pwd" class="text-right" placeholder="请输入新密码" name="input"></input>
</view>
<view class="cu-form-group solid-bottom">
<view class="title text-black mini-label">确认密码</view>
<input type="password" v-model="authpwd" class="text-right" placeholder="请确认密码" name="input"></input>
</view>
</view>
</view>
<view class="margin-left">
<text class="cuIcon-infofill padding-right-xs text-sm oil-main-color"></text>
<text class="text-sm">密码必须至少8个字符而且同时包含字母和数字</text>
</view>
<view class="margin padding-top-lg margin-top-xl">
<button class="bg-main-oil" @tap="comfirmPwd">
确定
</button>
</view>
</view>
</template>
<script>
import cloudSiteApi from '@/api/cloud-site.js'
import md5 from 'js-md5'
export default {
data() {
return {
tips: '发送验证码',
frozen: false, // 验证码冷却时间
auth: {
},
loginUser: uni.getStorageSync('loginUser')
}
},
methods: {
// 确认修改
comfirmPwd() {
if (!this.auth.authCode) {
uni.showToast({
title: '请输入验证码',
icon: "none"
});
return false
}
if (!this.pwd) {
uni.showToast({
title: '请输入新密码',
icon: "none"
});
return false
}
if (!this.authpwd) {
uni.showToast({
title: '请确认新密码',
icon: "none"
});
return false
}
if (this.authpwd.length < 8) {
uni.showToast({
title: '密码至少8个字符',
icon: "none"
});
return false
}
if (this.pwd === this.authpwd) {
const data3 = {
phone: this.loginUser.userPhone,
authCode: this.auth.authCode,
oldPassword: md5(this.pwd),
newPassword: md5(this.authpwd)
}
cloudSiteApi.setPassword(data3).then(res => {
if (res.code == 20000) {
uni.showToast({
title: res.msg
})
setTimeout(() => {
uni.navigateBack()
}, 1500);
}
})
} else {
uni.showToast({
icon: 'none',
title: '两次输入密码不一致'
})
}
},
sendMsg() {
if (!this.frozen) {
const data2 = {
phone: this.loginUser.userPhone
}
cloudSiteApi.sendPwdSms(data2).then(res => {
console.log('res', res)
uni.showToast({
title: res.msg,
icon: 'none'
})
if (res.code == 20000) {
this.frozen = true
let second = 60
this.tips = `${second}秒后重发`
setTimeout(() => {
this.frozen = false
clearInterval(timer)
this.tips = `发送验证码`
}, 1000 * 60);
const timer = setInterval(() => {
second--
if (second) {
this.tips = `${second}秒后重发`
} else {
this.tips = `发送验证码`
}
}, 1000)
}
})
}
},
}
}
</script>
<style scoped>
.shadow {
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
}
</style>

View File

@@ -91,7 +91,7 @@
methods: {
changePhone() {
uni.navigateTo({
url: '/pages/setup/changePhone/auth',
url: '/packageSecurity/changePhone/auth',
fail: (err) => {
console.log(err)
}
@@ -113,7 +113,7 @@
},
setpwd() {
uni.navigateTo({
url: '/pages/setup/setPassword/setPassword',
url: '/packageSecurity/setPassword/setPassword',
fail: (err) => {
console.log(err)
}