App/app-govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 app

Browse Source
This commit is contained in:
GGJ
2024-09-02 09:50:59 +08:00
parent 8214b40495
commit fd55306d1a
30 changed files with 2380 additions and 2091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pages/user/forget.vue
View File

@@ -13,7 +13,12 @@
</uni-forms-item>
<uni-forms-item name="code">
<view class="login-box-input">
<uni-easyinput type="text" v-model="formData.code" placeholder="请输入验证码" maxlength="6" />
<uni-easyinput
type="text"
v-model="formData.code"
placeholder="请输入验证码"
maxlength="6"
/>
<view
class="ml40"
style="
@@ -43,7 +48,7 @@
<!-- <view class="login-box-tips">
<view style="color: #999">点击提交即表示同意</view>
<navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
</view> -->
</view>
</view>
@@ -206,7 +211,7 @@ export default {
}
.login-box-input-btn {
padding:0 40rpx;
padding: 0 40rpx;
margin-left: 40rpx;
background: $uni-theme-color;
color: #fff;

52
pages/user/head.vue
View File

@@ -1,16 +1,29 @@
<template>
<Cn-page :loading="loading">
<view slot="body">
<view class="head">
<image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
<image class="head-img" src="/static/head.png" v-else></image>
<view class="head-setup">
<view class="head-setup-item" @click="take('album')">从相册选一张</view>
<view class="head-setup-item" @click="take('camera')">拍一张照片</view>
<view>
<Cn-page :loading="loading">
<view slot="body">
<view class="head">
<image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
<image class="head-img" src="/static/head.png" v-else></image>
<view class="head-setup">
<view class="head-setup-item" @click="take('album')">从相册选一张</view>
<view class="head-setup-item" @click="take('camera')">拍一张照片</view>
</view>
</view>
</view>
</view>
</Cn-page>
</Cn-page>
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog
type="info"
cancelText="禁止"
confirmText="允许"
title="权限说明"
content='是否允许"灿能物联"使用相机?'
@confirm="handleScon('camera')"
@close="dialogClose"
></uni-popup-dialog>
</uni-popup>
</view>
</template>
<script>
import { uploadImage, getImageUrl } from '@/common/api/basic'
@@ -25,12 +38,27 @@ export default {
},
methods: {
take(type) {
if (type == 'camera') {
if (
plus.os.name == 'Android' &&
plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
) {
//未授权
this.$refs.alertDialog.open()
} else {
this.handleScon(type)
}
} else {
this.handleScon(type)
}
},
handleScon(type) {
uni.chooseImage({
count: 1,
sizeType: ['original', 'compressed'],
sourceType: [type],
success: (res) => {
console.log(res)
uploadImage(res.tempFilePaths[0]).then((res) => {
console.log(res)
let result = JSON.parse(res[1].data)
@@ -47,7 +75,9 @@ export default {
},
})
},
dialogClose() {},
},
onLoad(options) {
this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
},

46
pages/user/login.vue
View File

@@ -2,12 +2,12 @@
<Cn-page :loading="loading">
<view slot="body">
<view class="login">
<view class="login-title" style="font-size: 36rpx;">欢迎登录</view>
<view class="login-title" style="font-size: 36rpx">欢迎登录</view>
<!-- <view class="login-des">灿能物联</view> -->
<view class="login-box">
<!-- <image class="login-box-logo" mode="widthFix" src="/static/logo.png"></image> -->
<image class="login-box-logo" mode="widthFix" src="/static/logo.png"></image>
<view style="font-size: 40rpx;text-align: center;font-weight: 500;" class="mt20">灿能物联</view>
<view style="font-size: 40rpx; text-align: center; font-weight: 500" class="mt20">灿能物联</view>
<template v-if="loginType == 'yzm'">
<view class="login-box-input mt100">
<input
@@ -22,15 +22,19 @@
<view class="login-box-input-img"></view>
</view> -->
<view class="login-box-input mt40">
<input type="text" class="login-box-input-main" v-model="yzmForm.code"
placeholder="手机验证码" maxlength="6"/>
<input
type="text"
class="login-box-input-main"
v-model="yzmForm.code"
placeholder="手机验证码"
maxlength="6"
/>
<view
class="ml40"
style="font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
v-if="waitTime > 0"
>{{ waitTime + 's后重新获取' }}
</view
>
>{{ waitTime + 's后重新获取' }}
</view>
<button class="login-box-input-btn" v-else @click="getCode" size="mini">获取验证码</button>
</view>
</template>
@@ -69,18 +73,12 @@
<navigator url="/pages/user/register" hover-class="none">快速注册</navigator>
</view>
<view class="login-box-tips">
<view style="color: #999"
>
<checkbox
style="transform: scale(0.7)"
:checked="checkbox"
@click="checkbox = !checkbox"
/>
<view style="color: #999">
<checkbox style="transform: scale(0.7)" :checked="checkbox" @click="checkbox = !checkbox" />
我已阅读并同意
</view
>
</view>
<navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
</view>
</view>
</view>
@@ -88,9 +86,9 @@
</Cn-page>
</template>
<script>
import {apiGetYms, apiPwdLogin, apiYsmLogin, gongkey} from '@/common/api/user'
import {sm2, encrypt} from '@/common/js/sm2.js'
import {sm3Digest} from '@/common/js/sm3.js'
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() {
@@ -110,14 +108,14 @@ export default {
waitTime: 0,
tenantId: '',
companyName: '',
inter:null
inter: null,
}
},
components: {},
methods: {
getCode() {
if (!this.checkbox) {
return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
}
if (!this.phone) {
return this.$util.toast('请输入手机号！')
@@ -148,7 +146,7 @@ export default {
},
login() {
if (!this.checkbox) {
return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
}
console.log(this.loginType)
if (this.loginType == 'pwd') {
@@ -164,7 +162,7 @@ export default {
console.log(this.phone)
let loginName = encrypt(this.phone)
console.log(loginName)
gongkey({loginName}).then((response) => {
gongkey({ loginName }).then((response) => {
let publicKey = response.data
let sm3Pwd = sm3Digest(this.pwdForm.pwd)
let jiamipassword = sm2(sm3Pwd + '|' + this.pwdForm.pwd, publicKey, 0)

45
pages/user/register.vue
View File

@@ -5,28 +5,51 @@
<template v-if="step == 1">
<uni-forms ref="form" :rules="rules" :modelValue="formData">
<uni-forms-item name="phone">
<uni-easyinput type="number" v-model="formData.phone" maxlength="11" placeholder="请输入手机号" />
<uni-easyinput
type="number"
v-model="formData.phone"
maxlength="11"
placeholder="请输入手机号"
/>
</uni-forms-item>
<uni-forms-item name="code">
<view class="login-box-input">
<uni-easyinput type="text" v-model="formData.code" placeholder="请输入验证码" maxlength="6" />
<uni-easyinput
type="text"
v-model="formData.code"
placeholder="请输入验证码"
maxlength="6"
/>
<view
class="ml40"
style="margin-left: 40rpx; font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
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>
<button class="login-box-input-btn" v-else @click="getCode" size="mini">
获取验证码
</button>
</view>
</uni-forms-item>
</uni-forms>
<button type="default" class="submit-btn" @click="firstSubmit">注册</button>
<view class="login-box-tips">
<view style="color: #999"
><checkbox style="transform: scale(0.7)" :checked="checkbox" @click="checkbox = !checkbox" /> 我已阅读并同意</view
><checkbox
style="transform: scale(0.7)"
:checked="checkbox"
@click="checkbox = !checkbox"
/>
我已阅读并同意</view
>
<navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
<navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
</view>
</template>
<template v-else>
@@ -54,11 +77,11 @@ export default {
name: 'jiaban',
data() {
return {
checkbox:false,
checkbox: false,
step: 1,
loading: false,
waitTime: 0,
inter:null,
inter: null,
// 表单数据
formData: {
phone: '',
@@ -106,7 +129,7 @@ export default {
methods: {
getCode() {
if (!this.checkbox) {
return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
}
if (!this.formData.phone) {
return this.$util.toast('请输入手机号！')
@@ -137,7 +160,7 @@ export default {
},
firstSubmit() {
if (!this.checkbox) {
return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
}
this.$refs.form.validate().then((valid, errors) => {
apiRegister({
@@ -214,7 +237,7 @@ export default {
}
.login-box-input-btn {
padding:0 40rpx;
padding: 0 40rpx;
margin-left: 40rpx;
background: $uni-theme-color;
color: #fff;