用户模块
This commit is contained in:
仲么了
@@ -1,12 +1,18 @@
|
||||
<template>
|
||||
<view class='new'>
|
||||
<view class="new">
|
||||
<template v-if="type == 1">
|
||||
<view class="content">
|
||||
<uni-forms>
|
||||
<uni-forms-item label="设备识别码">
|
||||
<view style="display:flex">
|
||||
<uni-easyinput type="number" v-model="code" placeholder="请输入设备识别码" />
|
||||
<uni-icons type="camera" color="#007aff" size="26" class="ml20" @click="scanCode"></uni-icons>
|
||||
<view style="display: flex">
|
||||
<uni-easyinput type="number" v-model="formData.nDid" placeholder="请输入设备识别码" />
|
||||
<uni-icons
|
||||
type="camera"
|
||||
color="#007aff"
|
||||
size="26"
|
||||
class="ml20"
|
||||
@click="scanCode"
|
||||
></uni-icons>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
</uni-forms>
|
||||
@@ -16,37 +22,66 @@
|
||||
</view>
|
||||
</template>
|
||||
<template v-else>
|
||||
|
||||
<view class="content">
|
||||
<uni-forms>
|
||||
<uni-forms-item label="项目">
|
||||
<uni-data-select v-model="formData.project" :localdata="projectRange"></uni-data-select>
|
||||
<uni-data-select
|
||||
v-model="formData.projectId"
|
||||
:localdata="projectRange"
|
||||
@change="queryTopologyDiagramPage"
|
||||
></uni-data-select>
|
||||
</uni-forms-item>
|
||||
<!-- <uni-forms-item label="型号">
|
||||
<uni-data-select v-model="formData.type" :localdata="typeRange"
|
||||
@change="typeChange(item)"></uni-data-select>
|
||||
</uni-forms-item> -->
|
||||
<uni-forms-item label="位置">
|
||||
<view style="display:flex;">
|
||||
<uni-easyinput :clearable="false" type="textarea" autoHeight v-model="formData.address"
|
||||
placeholder="请输入位置信息" />
|
||||
<uni-icons type="location" color="#007aff" size="26" class="ml20"
|
||||
@click="chooseLocation"></uni-icons>
|
||||
<view style="display: flex">
|
||||
<uni-easyinput
|
||||
:clearable="false"
|
||||
type="textarea"
|
||||
autoHeight
|
||||
v-model="formData.area"
|
||||
placeholder="请输入位置信息"
|
||||
/>
|
||||
<!-- <uni-icons
|
||||
type="location"
|
||||
color="#007aff"
|
||||
size="26"
|
||||
class="ml20"
|
||||
@click="chooseLocation"
|
||||
></uni-icons> -->
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="拓扑图">
|
||||
<view style="display:flex;">
|
||||
<view style="flex:1">
|
||||
<image class="gplot" src="/static/test2.pic.png" mode="aspectFill" />
|
||||
<uni-forms-item label="拓扑图" v-if="formData.projectId">
|
||||
<view style="display: flex">
|
||||
<view style="flex: 1">
|
||||
<image
|
||||
v-if="formData.topologyDiagramUrl"
|
||||
class="gplot"
|
||||
:src="formData.topologyDiagramUrl"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图 </view>
|
||||
</view>
|
||||
<uni-icons type="image" color="#007aff" size="26" class="ml20" @click="chooseGplot"></uni-icons>
|
||||
<uni-icons
|
||||
type="image"
|
||||
color="#007aff"
|
||||
size="26"
|
||||
class="ml20"
|
||||
@click="chooseGplot"
|
||||
></uni-icons>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item label="监测点" v-if="pointList.length">
|
||||
<view class="point-item" v-for="(item2, index2) in pointList" :key="index2"
|
||||
@click="editPoint(item2, index2)">
|
||||
<view style="flex:1" v-if="item2.pointName">{{ item2.pointName }}</view>
|
||||
<view style="flex:1;color:#999" v-else>请选择监测点</view>
|
||||
<uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
|
||||
<view
|
||||
class="point-item"
|
||||
v-for="(item2, index2) in pointList"
|
||||
:key="index2"
|
||||
@click="editPoint(item2, index2)"
|
||||
>
|
||||
<view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
|
||||
<view style="flex: 1; color: #999" v-else>请选择监测点</view>
|
||||
<uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
@@ -60,35 +95,39 @@
|
||||
</view>
|
||||
</uni-forms-item> -->
|
||||
</uni-forms>
|
||||
|
||||
</view>
|
||||
<view class="btn-wrap">
|
||||
<!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
|
||||
<view class="btn-wrap-item ml20" @click="submit"> 提交 </view>
|
||||
<view class="btn-wrap-item" @click="submit"> 提交 </view>
|
||||
</view>
|
||||
<uni-drawer ref="gplot" mode="right" :mask-click="false">
|
||||
<scroll-view style="height: 100%;" scroll-y="true">
|
||||
<scroll-view style="height: 100%" scroll-y="true">
|
||||
<view class="content">
|
||||
<image class="gplot gplot-box" mode="aspectFill" :class="{ 'gplot-active': key == activeGplot }"
|
||||
src="/static/test2.pic.png" @click="activeGplot = key" v-for="(item, key) in 3" :key="key" />
|
||||
<image
|
||||
class="gplot gplot-box"
|
||||
mode="aspectFill"
|
||||
:class="{ 'gplot-active': key == activeGplot }"
|
||||
:src="item.filePath"
|
||||
@click="activeGplot = key"
|
||||
v-for="(item, key) in imageList"
|
||||
:key="key"
|
||||
/>
|
||||
<view class="btn-wrap">
|
||||
<view class="btn-wrap-item" @click="closeDrawer"> 取消 </view>
|
||||
<view class="btn-wrap-item ml20" @click="closeDrawer"> 确定 </view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</uni-drawer>
|
||||
<uni-drawer ref="point" mode="right" :mask-click="false">
|
||||
<scroll-view style="height: 100%;" scroll-y="true">
|
||||
<view style="background:#fff">
|
||||
<scroll-view style="height: 100%" scroll-y="true">
|
||||
<view style="background: #fff">
|
||||
<view class="map-pin-box">
|
||||
<image class="gplot" mode="widthFix" src="/static/test2.pic.png" />
|
||||
<image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
|
||||
|
||||
<movable-area class="map-pin-box-area">
|
||||
<movable-view :x="point.x" :y="point.y" direction="all" @change="dragPoint">
|
||||
<movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
|
||||
<view class="point center">
|
||||
<image src="/static/point.png" mode="scaleToFill" />
|
||||
<!-- <uni-icons type="map-pin" color="#007aff" size="26" class="ml20"></uni-icons> -->
|
||||
{{ point.alias || point.name }}
|
||||
</view>
|
||||
</movable-view>
|
||||
</movable-area>
|
||||
@@ -97,7 +136,19 @@
|
||||
<view class="content">
|
||||
<view class="content-des">请拖动图中的蓝色定位图标选择监测点位置(左上角)</view>
|
||||
<uni-forms>
|
||||
<uni-easyinput type="text" v-model="pointName" placeholder="请输入设监测点名称" />
|
||||
<uni-data-select
|
||||
v-model="point.position"
|
||||
:localdata="positionList"
|
||||
@change="positionChange"
|
||||
></uni-data-select>
|
||||
<uni-easyinput
|
||||
:clearable="false"
|
||||
class="mt20"
|
||||
type="text"
|
||||
v-model="point.alias"
|
||||
@change="aliasChange"
|
||||
placeholder="别名（非必填）"
|
||||
/>
|
||||
</uni-forms>
|
||||
<view class="btn-wrap">
|
||||
<view class="btn-wrap-item" @click="closeDrawer"> 取消 </view>
|
||||
@@ -110,154 +161,201 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import { registerDevice, getModel, addDevice } from '@/common/api/device.js'
|
||||
import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
|
||||
export default {
|
||||
data () {
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
code: '',
|
||||
type: 1,
|
||||
formData: {
|
||||
address: '',
|
||||
type: '',
|
||||
project: '',
|
||||
nDid: '',
|
||||
area: '',
|
||||
projectId: '',
|
||||
topologyDiagramUrl: '',
|
||||
topologyDiagram: '',
|
||||
},
|
||||
projectRange: [
|
||||
{ value: 1, text: "项目1", point: 1 },
|
||||
{ value: 2, text: "项目2", point: 2 },
|
||||
{ value: 3, text: "项目3", point: 1 },
|
||||
],
|
||||
// typeRange: [
|
||||
// { value: 1, text: "POS-882AX", point: 1 },
|
||||
// { value: 2, text: "NPOS-681", point: 2 },
|
||||
// { value: 3, text: "NPOS-681", point: 1 },
|
||||
// { value: 4, text: "POV-500", point: 2 },
|
||||
// { value: 5, text: "PQV-300", point: 1 },
|
||||
// { value: 6, text: "NPOS-571W", point: 3 },
|
||||
// { value: 7, text: "NPQS-572W", point: 3 },
|
||||
// { value: 8, text: "POS-882B6", point: 2 },
|
||||
// { value: 9, text: "PQS-882B5", point: 1 },
|
||||
// { value: 10, text: "POS-882B4", point: 2 },
|
||||
// { value: 11, text: "PQS-882B2", point: 1 },
|
||||
// { value: 12, text: "POS-882A", point: 2 },
|
||||
// { value: 13, text: "POS-883A", point: 1 },
|
||||
// { value: 14, text: "NPOS-581", point: 2 },
|
||||
// { value: 15, text: "PQS-681", point: 1 },
|
||||
// { value: 16, text: "POS-8825", point: 3 },
|
||||
// { value: 17, text: "PQS-782", point: 1 },
|
||||
// { value: 18, text: "POS-880X", point: 3 },
|
||||
// { value: 19, text: "NPQS-580", point: 1 },
|
||||
// { value: 20, text: "NPOS-572", point: 2 },
|
||||
// ],
|
||||
projectRange: [],
|
||||
point: {
|
||||
x: 170,
|
||||
y: 100,
|
||||
},
|
||||
pointName: '',
|
||||
pointList: [{
|
||||
name: '',
|
||||
x: 170,
|
||||
y: 100,
|
||||
}, {
|
||||
name: '',
|
||||
x: 170,
|
||||
y: 100,
|
||||
}],
|
||||
pointList: [],
|
||||
activeGplot: 0,
|
||||
editIndex: -1,
|
||||
positionList: [],
|
||||
imageList: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
let engineering = uni.getStorageSync(this.$cacheKey.engineering)
|
||||
getProjectList({
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
engineeringId: engineering.id,
|
||||
}).then((res) => {
|
||||
console.log(res)
|
||||
let arr = [
|
||||
...res.data.records.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
text: item.name,
|
||||
value: item.id,
|
||||
}
|
||||
}),
|
||||
]
|
||||
this.projectRange = arr
|
||||
})
|
||||
let dictData = uni.getStorageSync(this.$cacheKey.dictData)
|
||||
dictData.forEach((item) => {
|
||||
if (item.code == 'Line_Position') {
|
||||
this.positionList = item.children.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
text: item.name,
|
||||
value: item.id,
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
projectChange (e) {
|
||||
queryTopologyDiagramPage() {
|
||||
console.log(this.formData)
|
||||
setTimeout(() => {
|
||||
if (!this.formData.projectId) {
|
||||
return
|
||||
}
|
||||
queryTopologyDiagramPage({
|
||||
projectId: this.formData.projectId,
|
||||
}).then((res) => {
|
||||
this.imageList = res.data.records
|
||||
this.formData.topologyDiagramUrl = res.data.records[0].filePath
|
||||
this.formData.topologyDiagram = res.data.records[0].id
|
||||
})
|
||||
}, 100)
|
||||
},
|
||||
scanCode () {
|
||||
aliasChange(e) {
|
||||
this.$forceUpdate()
|
||||
},
|
||||
positionChange(e) {
|
||||
console.log(e)
|
||||
},
|
||||
projectChange(e) {},
|
||||
scanCode() {
|
||||
uni.scanCode({
|
||||
success: function (res) {
|
||||
console.log('条码类型：' + res.scanType);
|
||||
console.log('条码内容：' + res.result);
|
||||
}
|
||||
});
|
||||
console.log('条码类型：' + res.scanType)
|
||||
console.log('条码内容：' + res.result)
|
||||
},
|
||||
})
|
||||
},
|
||||
register () {
|
||||
this.type = 2
|
||||
register() {
|
||||
if (!this.formData.nDid) {
|
||||
return this.$util.toast('请输入设备识别码')
|
||||
}
|
||||
registerDevice(this.formData.nDid).then(res=>{
|
||||
|
||||
getModel(this.formData.nDid).then((res) => {
|
||||
console.log(res)
|
||||
this.pointList = res.data.map((item) => {
|
||||
return {
|
||||
lat: 0,
|
||||
lng: 0,
|
||||
...item,
|
||||
}
|
||||
})
|
||||
this.type = 2
|
||||
})
|
||||
})
|
||||
},
|
||||
chooseLocation () {
|
||||
chooseLocation() {
|
||||
uni.chooseLocation({
|
||||
success: function (res) {
|
||||
this.address = res.name
|
||||
console.log('位置名称：' + res.name);
|
||||
console.log('详细地址：' + res.address);
|
||||
console.log('纬度：' + res.latitude);
|
||||
console.log('经度：' + res.longitude);
|
||||
}
|
||||
});
|
||||
console.log('位置名称：' + res.name)
|
||||
console.log('详细地址：' + res.address)
|
||||
console.log('纬度：' + res.latitude)
|
||||
console.log('经度：' + res.longitude)
|
||||
},
|
||||
})
|
||||
},
|
||||
chooseGplot () {
|
||||
chooseGplot() {
|
||||
this.$refs.gplot.open()
|
||||
},
|
||||
closeDrawer () {
|
||||
this.pointName = ''
|
||||
this.point = {
|
||||
x: 170,
|
||||
y: 100,
|
||||
}
|
||||
closeDrawer() {
|
||||
this.$refs.gplot.close()
|
||||
this.$refs.point.close()
|
||||
this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
|
||||
this.formData.topologyDiagram = this.imageList[this.activeGplot].id
|
||||
this.$forceUpdate()
|
||||
},
|
||||
add () {
|
||||
add() {
|
||||
this.$refs.point.open()
|
||||
},
|
||||
addPoint () {
|
||||
if (!this.pointName) {
|
||||
this.$util.toast('请输入监测点名称')
|
||||
addPoint() {
|
||||
if (!this.point.position) {
|
||||
this.$util.toast('请选择监测点')
|
||||
return
|
||||
}
|
||||
if (this.editIndex > -1) {
|
||||
this.pointList[this.editIndex] = {
|
||||
x: this.point.x,
|
||||
y: this.point.y,
|
||||
pointName: this.pointName,
|
||||
}
|
||||
this.editIndex = -1
|
||||
if (this.point.alias) {
|
||||
this.point.name = this.point.alias
|
||||
} else {
|
||||
let arr = this.pointList.filter(item => item.pointName == this.pointName)
|
||||
if (arr.length > 0) {
|
||||
this.$util.toast('监测点名称已存在')
|
||||
return
|
||||
}
|
||||
this.pointList.push({
|
||||
x: this.point.x,
|
||||
y: this.point.y,
|
||||
pointName: this.pointName,
|
||||
this.positionList.forEach((item) => {
|
||||
if (item.id == this.point.position) {
|
||||
this.point.name = item.name
|
||||
}
|
||||
})
|
||||
}
|
||||
console.log(this.pointList);
|
||||
this.pointList[this.editIndex] = this.point
|
||||
console.log(this.pointList)
|
||||
this.closeDrawer()
|
||||
},
|
||||
deletePoint (index) {
|
||||
deletePoint(index) {
|
||||
this.pointList.splice(index, 1)
|
||||
},
|
||||
editPoint (item, index) {
|
||||
editPoint(item, index) {
|
||||
this.point = item
|
||||
this.editIndex = index
|
||||
this.point.x = item.x
|
||||
this.point.y = item.y
|
||||
this.pointName = item.pointName
|
||||
if (!this.point.alias) {
|
||||
let every = this.positionList.every((item) => item.name != this.point.name)
|
||||
console.log(every)
|
||||
if (every) {
|
||||
this.point.alias = this.point.name
|
||||
} else {
|
||||
this.point.alias = ''
|
||||
}
|
||||
}
|
||||
this.$refs.point.open()
|
||||
this.$forceUpdate()
|
||||
},
|
||||
dragPoint (e) {
|
||||
dragPoint(e) {
|
||||
console.log(e)
|
||||
this.point.x = e.detail.x
|
||||
this.point.y = e.detail.y
|
||||
this.point.lat = e.detail.x
|
||||
this.point.lng = e.detail.y
|
||||
},
|
||||
submit () {
|
||||
this.$util.toast('提交成功')
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({ delta: 1 })
|
||||
}, 1500);
|
||||
submit() {
|
||||
if (!this.formData.projectId) {
|
||||
return this.$util.toast('请选择项目')
|
||||
}
|
||||
if (!this.formData.topologyDiagram) {
|
||||
return this.$util.toast('请选择拓扑图')
|
||||
}
|
||||
addDevice({
|
||||
...this.formData,
|
||||
list: this.pointList,
|
||||
ndid: this.formData.nDid,
|
||||
}).then((res) => {
|
||||
console.log(res)
|
||||
this.$util.toast('提交成功')
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({ delta: 1 })
|
||||
}, 1500)
|
||||
})
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang='scss'>
|
||||
<style lang="scss">
|
||||
.new {
|
||||
padding: 34rpx;
|
||||
|
||||
@@ -291,6 +389,12 @@ export default {
|
||||
width: 100%;
|
||||
height: 188rpx;
|
||||
}
|
||||
.gplot-empty {
|
||||
margin: 0 auto;
|
||||
border: 1px dashed #dcdfe6;
|
||||
color: #999;
|
||||
height: 188rpx;
|
||||
}
|
||||
|
||||
.gplot-box {
|
||||
height: 280rpx;
|
||||
@@ -342,19 +446,10 @@ export default {
|
||||
}
|
||||
|
||||
.point {
|
||||
height: 100rpx;
|
||||
width: 100rpx;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/deep/ .uni-drawer__content {
|
||||
width: 100vw !important;
|
||||
}
|
||||
@@ -371,4 +466,4 @@ export default {
|
||||
.point-item:first-of-type {
|
||||
border-top: none;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -136,6 +136,10 @@ export default {
|
||||
title: '升级成功',
|
||||
icon: 'none',
|
||||
})
|
||||
// 重新登录
|
||||
uni.reLaunch({
|
||||
url: '/pages/user/login',
|
||||
})
|
||||
})
|
||||
},
|
||||
jump(type) {
|
||||
|
||||
@@ -5,15 +5,32 @@
|
||||
<template v-if="step == 1">
|
||||
<uni-forms ref="form" :rules="rules" :modelValue="formData">
|
||||
<uni-forms-item name="phone">
|
||||
<uni-easyinput disabled type="text" v-model="formData.phoneShow" placeholder="请输入手机号" />
|
||||
<uni-easyinput
|
||||
disabled
|
||||
type="text"
|
||||
maxlength="11"
|
||||
v-model="formData.phoneShow"
|
||||
placeholder="请输入手机号"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="code">
|
||||
<view class="login-box-input">
|
||||
<uni-easyinput type="number" v-model="formData.code" placeholder="请输入验证码" />
|
||||
<view class="ml40"
|
||||
style="margin-left:40rpx;font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
|
||||
v-if="waitTime > 0">{{ waitTime + 's后重新获取' }}</view>
|
||||
<button class="login-box-input-btn" v-else @click="getCode(5)" size="mini">获取验证码</button>
|
||||
<view
|
||||
class="ml40"
|
||||
style="
|
||||
margin-left: 40rpx;
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
width: 200rpx;
|
||||
text-align: center;
|
||||
"
|
||||
v-if="waitTime > 0"
|
||||
>{{ waitTime + 's后重新获取' }}</view
|
||||
>
|
||||
<button class="login-box-input-btn" v-else @click="getCode(5)" size="mini">
|
||||
获取验证码
|
||||
</button>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
</uni-forms>
|
||||
@@ -22,15 +39,31 @@
|
||||
<template v-else>
|
||||
<uni-forms ref="form" :rules="rules" :modelValue="formData">
|
||||
<uni-forms-item name="phone">
|
||||
<uni-easyinput type="number" v-model="formData.phone2" placeholder="请输入新手机号" />
|
||||
<uni-easyinput
|
||||
maxlength="11"
|
||||
type="number"
|
||||
v-model="formData.phone2"
|
||||
placeholder="请输入新手机号"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="code">
|
||||
<view class="login-box-input">
|
||||
<uni-easyinput type="number" v-model="formData.code2" placeholder="请输入验证码" />
|
||||
<view class="ml40"
|
||||
style="margin-left:40rpx;font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
|
||||
v-if="waitTime > 0">{{ waitTime + 's后重新获取' }}</view>
|
||||
<button class="login-box-input-btn" v-else @click="getCode(4)" size="mini">获取验证码</button>
|
||||
<view
|
||||
class="ml40"
|
||||
style="
|
||||
margin-left: 40rpx;
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
width: 200rpx;
|
||||
text-align: center;
|
||||
"
|
||||
v-if="waitTime > 0"
|
||||
>{{ waitTime + 's后重新获取' }}</view
|
||||
>
|
||||
<button class="login-box-input-btn" v-else @click="getCode(4)" size="mini">
|
||||
获取验证码
|
||||
</button>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
</uni-forms>
|
||||
@@ -43,8 +76,8 @@
|
||||
<script>
|
||||
import { apiGetYms, apiComfirmCode, apiRebindPhone } from '@/common/api/user'
|
||||
export default {
|
||||
name: "jiaban",
|
||||
data () {
|
||||
name: 'jiaban',
|
||||
data() {
|
||||
return {
|
||||
step: 1,
|
||||
loading: false,
|
||||
@@ -62,102 +95,108 @@ export default {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写手机号"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写手机号',
|
||||
},
|
||||
],
|
||||
},
|
||||
code: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写验证码"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写验证码',
|
||||
},
|
||||
],
|
||||
},
|
||||
phone2: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写新手机号"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写新手机号',
|
||||
},
|
||||
],
|
||||
},
|
||||
code2: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写验证码"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
};
|
||||
errorMessage: '请填写验证码',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad () {
|
||||
onLoad() {
|
||||
this.init()
|
||||
},
|
||||
methods: {
|
||||
getCode (type) {
|
||||
getCode(type) {
|
||||
if (!this.formData.phone) {
|
||||
return this.$util.toast('请输入手机号！')
|
||||
}
|
||||
uni.showLoading({
|
||||
title: '请稍等'
|
||||
title: '请稍等',
|
||||
})
|
||||
apiGetYms({
|
||||
phone: type == 5 ? this.formData.phone : this.formData.phone2,
|
||||
type,
|
||||
}).then(res => {
|
||||
uni.hideLoading()
|
||||
console.log(res);
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
uni.hideLoading()
|
||||
console.log(err);
|
||||
})
|
||||
.then((res) => {
|
||||
uni.hideLoading()
|
||||
console.log(res)
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
})
|
||||
.catch((err) => {
|
||||
uni.hideLoading()
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
init () {
|
||||
this.formData.phone = uni.getStorageSync('userInfo').phone
|
||||
// 150****0083
|
||||
this.formData.phoneShow = this.formData.phone.substr(0, 3) + '****' + this.formData.phone.substr(7)
|
||||
init() {
|
||||
// 手机号中间四位隐藏
|
||||
this.formData.phone = uni.getStorageSync('userInfo').user_name
|
||||
this.formData.phoneShow = this.formData.phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
|
||||
},
|
||||
firstSubmit () {
|
||||
firstSubmit() {
|
||||
apiComfirmCode({
|
||||
phone: this.formData.phone,
|
||||
code: this.formData.code,
|
||||
}).then(res => {
|
||||
this.step = 2
|
||||
clearInterval(this.inter)
|
||||
this.waitTime = 0
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
.then((res) => {
|
||||
this.step = 2
|
||||
clearInterval(this.inter)
|
||||
this.waitTime = 0
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
secondSubmit () {
|
||||
secondSubmit() {
|
||||
apiRebindPhone({
|
||||
phone: this.formData.phone2,
|
||||
code: this.formData.code2,
|
||||
}).then(res => {
|
||||
this.$util.toast('绑定成功')
|
||||
uni.clearStorageSync();
|
||||
setTimeout(() => {
|
||||
uni.redirectTo({
|
||||
url: '/pages/user/login'
|
||||
})
|
||||
}, 1500);
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
.then((res) => {
|
||||
this.$util.toast('绑定成功')
|
||||
uni.clearStorageSync()
|
||||
setTimeout(() => {
|
||||
uni.redirectTo({
|
||||
url: '/pages/user/login',
|
||||
})
|
||||
}, 1500)
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.index {
|
||||
|
||||
@@ -4,105 +4,191 @@
|
||||
<view class="index">
|
||||
<uni-forms ref="form" :modelValue="formData" :rules="rules">
|
||||
<uni-forms-item name="phone">
|
||||
<uni-easyinput disabled type="text" v-model="formData.phone" placeholder="请输入手机号" />
|
||||
</uni-forms-item>
|
||||
<uni-easyinput
|
||||
maxlength="11"
|
||||
disabled
|
||||
type="text"
|
||||
v-model="formData.showPhone"
|
||||
placeholder="请输入手机号"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="code">
|
||||
<view class="login-box-input mt40">
|
||||
<view class="login-box-input">
|
||||
<uni-easyinput type="number" v-model="formData.code" placeholder="请输入手机验证码" />
|
||||
<view class="ml40"
|
||||
style="margin-left:40rpx;font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
|
||||
v-if="waitTime > 0">{{ waitTime + 's后重新获取' }}</view>
|
||||
<view
|
||||
class="ml40"
|
||||
style="
|
||||
margin-left: 40rpx;
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
width: 200rpx;
|
||||
text-align: center;
|
||||
"
|
||||
v-if="waitTime > 0"
|
||||
>{{ waitTime + 's后重新获取' }}</view
|
||||
>
|
||||
<button class="login-box-input-btn" v-else @click="getCode" size="mini">获取验证码</button>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="password">
|
||||
<uni-easyinput type="text" v-model="formData.password" placeholder="请输入新的登录密码" />
|
||||
<uni-easyinput type="password" v-model="formData.password" placeholder="请输入新的登录密码" />
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="password2">
|
||||
<uni-easyinput type="text" v-model="formData.password2" placeholder="请再次确认密码" />
|
||||
<uni-easyinput type="password" v-model="formData.password2" placeholder="请再次确认密码" />
|
||||
</uni-forms-item>
|
||||
</uni-forms>
|
||||
<button type="default" class="submit-btn" @click="submit">提交</button>
|
||||
<view class="login-box-tips">
|
||||
<view style="color:#999">说明：密码长度为6-18位</view>
|
||||
<view style="color: #999">说明：密码需要包含特殊字符字母数字，长度为8-16</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</Cn-page>
|
||||
</template>
|
||||
<script>
|
||||
import { apiGetYms, apiModifyPsd, gongkey } from '@/common/api/user'
|
||||
import { sm2, encrypt } from '@/common/js/sm2.js'
|
||||
import { sm3Digest } from '@/common/js/sm3.js'
|
||||
export default {
|
||||
name: "ChangePWd",
|
||||
data () {
|
||||
name: 'ChangePWd',
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
waitTime: 0,
|
||||
// 表单数据
|
||||
formData: {
|
||||
phone: '150****0083',
|
||||
showPhone: '',
|
||||
phone: '',
|
||||
code: '',
|
||||
password: '',
|
||||
password2: ''
|
||||
password2: '',
|
||||
},
|
||||
rules: {
|
||||
phone: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写手机号"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写手机号',
|
||||
},
|
||||
],
|
||||
},
|
||||
code: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写验证码"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写验证码',
|
||||
},
|
||||
],
|
||||
},
|
||||
password: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写新密码"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写新密码',
|
||||
},
|
||||
],
|
||||
},
|
||||
password2: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写确认密码"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
};
|
||||
errorMessage: '请填写确认密码',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad () {
|
||||
onLoad() {
|
||||
// 手机号中间四位隐藏
|
||||
this.formData.phone = uni.getStorageSync('userInfo').user_name
|
||||
this.formData.showPhone = this.formData.phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
|
||||
},
|
||||
methods: {
|
||||
getCode () {
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
getCode() {
|
||||
uni.showLoading({
|
||||
title: '请稍等',
|
||||
})
|
||||
apiGetYms({
|
||||
phone: this.formData.phone,
|
||||
type: 2,
|
||||
})
|
||||
.then((res) => {
|
||||
uni.hideLoading()
|
||||
console.log(res)
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
})
|
||||
.catch((err) => {
|
||||
uni.hideLoading()
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
submit () {
|
||||
submit() {
|
||||
this.$refs.form.validate((valid) => {
|
||||
console.log(valid);
|
||||
console.log(valid)
|
||||
if (!valid) {
|
||||
uni.navigateBack({ delta: 1 })
|
||||
if (this.formData.password != this.formData.password2) {
|
||||
uni.showToast({
|
||||
title: '两次密码不一致',
|
||||
icon: 'none',
|
||||
})
|
||||
} else {
|
||||
// 密码需要包含特殊字符字母数字，长度为8-16
|
||||
if (
|
||||
!/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[#@!~%^&*])[a-zA-Z\d#@!~%^&*]{8,16}$/.test(
|
||||
this.formData.password,
|
||||
)
|
||||
) {
|
||||
return this.$util.toast('密码需要包含特殊字符字母数字，长度为8-16')
|
||||
}
|
||||
let loginName = encrypt(this.formData.phone)
|
||||
gongkey({ loginName }).then((response) => {
|
||||
let publicKey = response.data
|
||||
let sm3Pwd = sm3Digest(this.formData.password)
|
||||
let jiamipassword = sm2(sm3Pwd + '|' + this.formData.password, publicKey, 0)
|
||||
// apiPwdLogin({
|
||||
// username: loginName,
|
||||
// password: jiamipassword,
|
||||
// imageCode: '',
|
||||
// grant_type: 'captcha',
|
||||
// verifyCode: 0,
|
||||
// }).then((res) => {
|
||||
// this.$util.loginSuccess(res.data)
|
||||
// })
|
||||
apiModifyPsd({
|
||||
phone: this.formData.phone,
|
||||
code: this.formData.code,
|
||||
password: jiamipassword,
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res)
|
||||
uni.showToast({
|
||||
title: '修改成功',
|
||||
icon: 'none',
|
||||
})
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
})
|
||||
}, 1000)
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
};
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.index {
|
||||
|
||||
@@ -4,30 +4,44 @@
|
||||
<view class="index">
|
||||
<uni-forms ref="form" :modelValue="formData" :rules="rules">
|
||||
<uni-forms-item name="phone">
|
||||
<uni-easyinput type="number" v-model="formData.phone" placeholder="请输入手机号" />
|
||||
<uni-easyinput
|
||||
type="number"
|
||||
maxlength="11"
|
||||
v-model="formData.phone"
|
||||
placeholder="请输入手机号"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="code">
|
||||
<view class="login-box-input">
|
||||
<uni-easyinput type="number" v-model="formData.code" placeholder="请输入验证码" />
|
||||
<view class="ml40"
|
||||
style="margin-left:40rpx;font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
|
||||
v-if="waitTime > 0">{{ waitTime + 's后重新获取' }}</view>
|
||||
<view
|
||||
class="ml40"
|
||||
style="
|
||||
margin-left: 40rpx;
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
width: 200rpx;
|
||||
text-align: center;
|
||||
"
|
||||
v-if="waitTime > 0"
|
||||
>{{ waitTime + 's后重新获取' }}</view
|
||||
>
|
||||
<button class="login-box-input-btn" v-else @click="getCode" size="mini">获取验证码</button>
|
||||
</view>
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="password">
|
||||
<uni-easyinput type="text" v-model="formData.password" placeholder="请输入新的登录密码" />
|
||||
<uni-easyinput type="password" v-model="formData.password" placeholder="请输入新的登录密码" />
|
||||
</uni-forms-item>
|
||||
<uni-forms-item name="password2">
|
||||
<uni-easyinput type="text" v-model="formData.password2" placeholder="请再次确认密码" />
|
||||
<uni-easyinput type="password" v-model="formData.password2" placeholder="请再次确认密码" />
|
||||
</uni-forms-item>
|
||||
</uni-forms>
|
||||
<button type="default" class="submit-btn" @click="submit">提交</button>
|
||||
<view class="login-box-tips">
|
||||
<view style="color:#999">说明：密码长度为6-18位</view>
|
||||
<view style="color: #999">说明：密码长度为6-18位</view>
|
||||
</view>
|
||||
<view class="login-box-tips">
|
||||
<view style="color:#999">点击提交即表示同意</view>
|
||||
<view style="color: #999">点击提交即表示同意</view>
|
||||
<navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
|
||||
<navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
|
||||
</view>
|
||||
@@ -36,11 +50,12 @@
|
||||
</Cn-page>
|
||||
</template>
|
||||
<script>
|
||||
import { apiGetYms, apiReSetPsd } from '@/common/api/user'
|
||||
|
||||
import { apiGetYms, apiReSetPsd, gongkey } from '@/common/api/user'
|
||||
import { sm2, encrypt } from '@/common/js/sm2.js'
|
||||
import { sm3Digest } from '@/common/js/sm3.js'
|
||||
export default {
|
||||
name: "jiaban",
|
||||
data () {
|
||||
name: 'jiaban',
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
waitTime: 0,
|
||||
@@ -49,102 +64,109 @@ export default {
|
||||
phone: '',
|
||||
code: '',
|
||||
password: '',
|
||||
password2: ''
|
||||
password2: '',
|
||||
},
|
||||
rules: {
|
||||
phone: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写手机号"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写手机号',
|
||||
},
|
||||
],
|
||||
},
|
||||
code: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写验证码"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写验证码',
|
||||
},
|
||||
],
|
||||
},
|
||||
password: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写新密码"
|
||||
}
|
||||
]
|
||||
errorMessage: '请填写新密码',
|
||||
},
|
||||
],
|
||||
},
|
||||
password2: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: "请填写确认密码"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
};
|
||||
},
|
||||
onLoad () {
|
||||
errorMessage: '请填写确认密码',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
onLoad() {},
|
||||
methods: {
|
||||
getCode () {
|
||||
getCode() {
|
||||
if (!this.formData.phone) {
|
||||
return this.$util.toast('请输入手机号！')
|
||||
}
|
||||
uni.showLoading({
|
||||
title: '请稍等'
|
||||
title: '请稍等',
|
||||
})
|
||||
apiGetYms({
|
||||
phone: this.formData.phone,
|
||||
type: 3,
|
||||
}).then(res => {
|
||||
uni.hideLoading()
|
||||
console.log(res);
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
uni.hideLoading()
|
||||
console.log(err);
|
||||
})
|
||||
.then((res) => {
|
||||
uni.hideLoading()
|
||||
console.log(res)
|
||||
this.waitTime = 60
|
||||
this.inter = setInterval(() => {
|
||||
if (this.waitTime == 0) {
|
||||
clearInterval(this.inter)
|
||||
} else {
|
||||
this.waitTime--
|
||||
}
|
||||
}, 1000)
|
||||
})
|
||||
.catch((err) => {
|
||||
uni.hideLoading()
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
submit () {
|
||||
submit() {
|
||||
this.$refs.form.validate((valid) => {
|
||||
if (this.formData.password.length < 6 || this.formData.password.length > 18) {
|
||||
return this.$util.toast('密码长度为6-18位')
|
||||
} else if (this.formData.password != this.formData.password2) {
|
||||
if (this.formData.password != this.formData.password2) {
|
||||
return this.$util.toast('两次密码不一致')
|
||||
}
|
||||
uni.showLoading({
|
||||
title: '请稍等'
|
||||
})
|
||||
apiReSetPsd({
|
||||
phone: this.formData.phone,
|
||||
code: this.formData.code,
|
||||
password: this.formData.password,
|
||||
}).then(res => {
|
||||
uni.hideLoading()
|
||||
console.log(res);
|
||||
this.$util.toast('修改成功！')
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
uni.hideLoading()
|
||||
console.log(err);
|
||||
// 密码需要包含特殊字符字母数字，长度为8-16
|
||||
if (!/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[#@!~%^&*])[a-zA-Z\d#@!~%^&*]{8,16}$/.test(this.formData.password)) {
|
||||
return this.$util.toast('密码需要包含特殊字符字母数字，长度为8-16')
|
||||
}
|
||||
let loginName = encrypt(this.formData.phone)
|
||||
gongkey({ loginName }).then((response) => {
|
||||
let publicKey = response.data
|
||||
let sm3Pwd = sm3Digest(this.formData.password)
|
||||
let jiamipassword = sm2(sm3Pwd + '|' + this.formData.password, publicKey, 0)
|
||||
|
||||
apiReSetPsd({
|
||||
phone: this.formData.phone,
|
||||
code: this.formData.code,
|
||||
password: jiamipassword,
|
||||
})
|
||||
.then((res) => {
|
||||
this.$util.toast('修改成功！')
|
||||
setTimeout(() => {
|
||||
uni.navigateBack()
|
||||
}, 1000)
|
||||
})
|
||||
.catch((err) => {
|
||||
uni.hideLoading()
|
||||
console.log(err)
|
||||
})
|
||||
})
|
||||
})
|
||||
},
|
||||
}
|
||||
};
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.index {
|
||||
|
||||
@@ -9,14 +9,19 @@
|
||||
<image class="login-box-logo" mode="widthFix" src="/static/logo.png"></image>
|
||||
<template v-if="loginType == 'yzm'">
|
||||
<view class="login-box-input mt100">
|
||||
<input class="login-box-input-main" maxlength="11" v-model="yzmForm.phone" placeholder="请输入手机号" />
|
||||
<input
|
||||
class="login-box-input-main"
|
||||
maxlength="11"
|
||||
v-model="yzmForm.phone"
|
||||
placeholder="请输入手机号"
|
||||
/>
|
||||
</view>
|
||||
<!-- <view class="login-box-input mt40">
|
||||
<input class="login-box-input-main" v-model="yzmForm.imgCode" placeholder="图形验证码" />
|
||||
<view class="login-box-input-img"></view>
|
||||
</view> -->
|
||||
<view class="login-box-input mt40">
|
||||
<input class="login-box-input-main" v-model="yzmForm.code" placeholder="手机验证码" />
|
||||
<input class="login-box-input-main" v-model="yzmForm.code" placeholder="手机验证码" />
|
||||
<view
|
||||
class="ml40"
|
||||
style="font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
|
||||
@@ -28,10 +33,15 @@
|
||||
</template>
|
||||
<template v-else>
|
||||
<view class="login-box-input mt100">
|
||||
<input class="login-box-input-main" v-model="pwdForm.phone" placeholder="请输入账号" />
|
||||
<input class="login-box-input-main" maxlength="11" v-model="pwdForm.phone" placeholder="请输入账号" />
|
||||
</view>
|
||||
<view class="login-box-input mt40">
|
||||
<input type="password" class="login-box-input-main" v-model="pwdForm.pwd" placeholder="请输入密码" />
|
||||
<input
|
||||
type="password"
|
||||
class="login-box-input-main"
|
||||
v-model="pwdForm.pwd"
|
||||
placeholder="请输入密码"
|
||||
/>
|
||||
</view>
|
||||
<!-- <view class="login-box-input mt40">
|
||||
<view class="login-box-input-icon"></view>
|
||||
@@ -59,15 +69,18 @@
|
||||
</Cn-page>
|
||||
</template>
|
||||
<script>
|
||||
import { apiGetYms, apiLogin, apiYsmLogin } from '@/common/api/user'
|
||||
import { apiGetYms, apiPwdLogin, apiYsmLogin, gongkey } from '@/common/api/user'
|
||||
import { sm2, encrypt } from '@/common/js/sm2.js'
|
||||
import { sm3Digest } from '@/common/js/sm3.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
loginType: 'pwd',
|
||||
pwdForm: {
|
||||
phone: '',
|
||||
pwd: '',
|
||||
phone: '13888888888',
|
||||
pwd: 'gwo6H8Kb',
|
||||
imgCode: '',
|
||||
},
|
||||
yzmForm: {
|
||||
@@ -122,15 +135,19 @@ export default {
|
||||
if (!this.pwdForm.phone && !this.pwdForm.pwd) {
|
||||
return this.$util.toast('请填写登录信息！')
|
||||
}
|
||||
apiLogin({
|
||||
phone: this.pwdForm.phone,
|
||||
key: this.pwdForm.pwd,
|
||||
type: 1,
|
||||
}).then((res) => {
|
||||
console.log(res)
|
||||
uni.setStorageSync('userInfo', res.data)
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index',
|
||||
let loginName = encrypt(this.pwdForm.phone)
|
||||
gongkey({ loginName }).then((response) => {
|
||||
let publicKey = response.data
|
||||
let sm3Pwd = sm3Digest(this.pwdForm.pwd)
|
||||
let jiamipassword = sm2(sm3Pwd + '|' + this.pwdForm.pwd, publicKey, 0)
|
||||
apiPwdLogin({
|
||||
username: loginName,
|
||||
password: jiamipassword,
|
||||
imageCode: '',
|
||||
grant_type: 'captcha',
|
||||
verifyCode: 0,
|
||||
}).then((res) => {
|
||||
this.$util.loginSuccess(res.data)
|
||||
})
|
||||
})
|
||||
},
|
||||
@@ -142,21 +159,13 @@ export default {
|
||||
phone: this.yzmForm.phone,
|
||||
smsCode: this.yzmForm.code,
|
||||
}).then((res) => {
|
||||
console.log(res)
|
||||
uni.setStorageSync('access_token', res.data.token_type + ' ' + res.data.access_token)
|
||||
uni.setStorageSync('refresh_token', res.data.refresh_token)
|
||||
let strings = res.data.access_token.split('.') //截取token，获取载体
|
||||
var userInfo = JSON.parse(decodeURIComponent(escape(window.atob(strings[1].replace(/-/g, '+').replace(/_/g, '/')))))
|
||||
userInfo.authorities = userInfo.authorities[0]
|
||||
uni.setStorageSync('userInfo', userInfo)
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index',
|
||||
})
|
||||
this.$util.loginSuccess(res.data)
|
||||
})
|
||||
},
|
||||
},
|
||||
onLoad(o) {
|
||||
uni.removeStorageSync('engineering')
|
||||
// 移除所有的缓存
|
||||
uni.clearStorageSync()
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -140,7 +140,7 @@ export default {
|
||||
// this.step = 2
|
||||
// 直接登录
|
||||
autoLogin(this.formData.phone).then((res) => {
|
||||
this.loginSuccess(res.data)
|
||||
this.$util.loginSuccess(res.data)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user