From 27da067243b78340dac4f75c5131059617594037 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期六, 22 六月 2024 16:01:45 +0800
Subject: [PATCH] 页面调整注册页面添加
---
/dev/null | 0
api/auth.js | 4 ++++
policy/policyApply/policyApply.vue | 7 ++++---
policy/translate/translate.vue | 11 +++++++----
policy/components/popup.vue | 2 +-
policy/scodePage/scodePage.vue | 3 ---
policy/policyApply/perPage.vue | 26 +++++++++++++++++++-------
pages/registerCompany/registerCompany.vue | 6 ++++--
8 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/api/auth.js b/api/auth.js
index db38798..b1ab4c9 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -28,4 +28,8 @@
// 鏌ヨ鎯犱紒鏀跨瓥
export function docList(data) {
return http.get(`/system/doc/list`, {params: data});
+}
+// 鏂版敞鍐岃幏鍙栭獙璇佺爜 /verify/getNew
+export function getNewVerify(data) {
+ return http.get(`/verify/getNew`, {params: data});
}
\ No newline at end of file
diff --git a/pages/registerCompany/registerCompany.vue b/pages/registerCompany/registerCompany.vue
index 8efc6a1..aef62fc 100644
--- a/pages/registerCompany/registerCompany.vue
+++ b/pages/registerCompany/registerCompany.vue
@@ -83,7 +83,7 @@
</template>
<script>
- import { registerCompany, checkCode, getCode } from '@/api/auth.js'
+ import { registerCompany, checkCode, getNewVerify } from '@/api/auth.js'
import { upload } from '@/common/upload'
import { config } from '@/common/config.js'
export default {
@@ -137,11 +137,13 @@
uni.showLoading({
title: '姝ｅ湪鑾峰彇楠岃瘉鐮�'
})
- getCode({phone: this.form.companyPhone }).then(val => {
+ getNewVerify({phone: this.form.companyPhone }).then(val => {
+ if(val.data.code == 200) {
this.startCountdown()
uni.hideLoading();
this.tips = `${this.countdownTime}s鍚庨噸鏂拌幏鍙朻
uni.$u.toast('楠岃瘉鐮佸凡鍙戦��');
+ }
})
} else {
uni.$u.toast('鍊掕鏃剁粨鏉熷悗鍐嶅彂閫�');
diff --git a/policy/components/popup.vue b/policy/components/popup.vue
index f4114b8..f352f42 100644
--- a/policy/components/popup.vue
+++ b/policy/components/popup.vue
@@ -1,5 +1,5 @@
<template>
- <u-popup :show="show" @close="close" @open="open" mode="bottom" round="10" closeable>
+ <u-popup :show="show" @close="close" @open="open" :safeAreaInsetBottom="false" mode="bottom" round="10" closeable>
<view class="page-box">
<view class="title">
鎵ф硶鐢宠瀹℃壒
diff --git a/policy/policyApply/perPage.vue b/policy/policyApply/perPage.vue
index a05d340..e9f7cca 100644
--- a/policy/policyApply/perPage.vue
+++ b/policy/policyApply/perPage.vue
@@ -2,12 +2,14 @@
<u-popup mode="button" :safeAreaInsetBottom="false" :show="show" @close="close" @open="open" z-index="8000" bgColor="#fff">
<view class="bg-box">
<view class="title">閫夋嫨闅忚浜哄憳</view>
- <u-checkbox-group iconPlacement="right" v-model="checkboxValue1" placement="column" @change="checkboxChange">
- <u-checkbox :customStyle="{marginBottom: '40rpx', }" v-for="(item, index) in checkboxList1" :key="index"
- :name="item.userId" :label="`${item.dept.deptName}--${item.nickName}`">
- </u-checkbox>
- </u-checkbox-group>
- <view class="set-flex set-flex-content-between">
+ <scroll-view scroll-y="true" style="height: 600rpx;">
+ <u-checkbox-group iconPlacement="right" v-model="checkboxValue1" placement="column" @change="checkboxChange">
+ <u-checkbox :customStyle="{marginBottom: '40rpx', }" v-for="(item, index) in checkboxList1" :key="index"
+ :name="item.userId" :label="`${item.dept.deptName}--${item.nickName}`">
+ </u-checkbox>
+ </u-checkbox-group>
+ </scroll-view>
+ <view class="set-flex set-flex-content-between down-options">
<view class="button-per">
<u-button @click="close">鍙栨秷</u-button>
</view>
@@ -71,10 +73,12 @@
bottom: 0;
background-color: white;
border-radius: 20rpx 20rpx 0 0;
- padding: 20rpx 32rpx;
+ padding: 20rpx 32rpx 240rpx;
z-index: 1000000;
width: 100%;
box-sizing: border-box;
+ min-height: 400rpx;
+ max-height: 800rpx;
}
.title{
font-size: 36rpx;
@@ -84,4 +88,12 @@
.button-per{
width: 48%;
}
+ .down-options{
+ position: fixed;
+ bottom: 40rpx;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 0 32rpx;
+ left: 0;
+ }
</style>
\ No newline at end of file
diff --git a/policy/policyApply/policyApply.vue b/policy/policyApply/policyApply.vue
index 2144073..461a758 100644
--- a/policy/policyApply/policyApply.vue
+++ b/policy/policyApply/policyApply.vue
@@ -166,10 +166,11 @@
applyDeptName: '',
enforceType: 1,
isNoticeCompany: 0,
- regionReason: 0,
+ // regionReason: 0,
planTimeStr: '',
peers: [],
- orderStatus: 1
+ orderStatus: 1,
+ enforceContent: ""
},
show: false,
columns: [],
@@ -244,7 +245,7 @@
if(!this.form.enforceTypeName){
return '璇烽�夋嫨鎵ф硶绫诲瀷'
}
- if(!this.form.regionReason) {
+ if(!this.form.enforceContent) {
return '璇峰～鍐欐墽娉曞唴瀹�'
}
if(!this.form.peers.length){
diff --git a/policy/scodePage/scodePage.vue b/policy/scodePage/scodePage.vue
index 813ed64..4c861d8 100644
--- a/policy/scodePage/scodePage.vue
+++ b/policy/scodePage/scodePage.vue
@@ -103,9 +103,6 @@
this.getInfo()
},
- onShow() {
-
- },
methods: {
getScanList(companyCode){
getScanList({companyCode}).then(val => {
diff --git a/policy/translate/translate.vue b/policy/translate/translate.vue
index 6058099..c6a2547 100644
--- a/policy/translate/translate.vue
+++ b/policy/translate/translate.vue
@@ -29,7 +29,7 @@
<text>鐢宠鏃堕棿锛�</text>{{item.applyTime}}
</view>
</view>
- <view class="button" v-if="!isJudege" @click="goStartJudeg(item.orderId)">
+ <view class="button" v-if="!isJudege" @click="goStartJudeg([item.orderId])">
瀹℃壒
</view>
</view>
@@ -119,12 +119,15 @@
this.list[index].isSelect = !this.list[index].isSelect
},
allSelect() {
- this.list.map(item => item.isSelect = !this.isAllSelect)
+ const value = this.isAllSelect
+ this.list.map(item => item.isSelect = !value)
},
moreStart() {
const value = this.list.some(item => item.isSelect)
if(value) {
- this.goStartJudeg()
+ const valueData = this.list.filter(item => item.isSelect).map(item => item.orderId)
+ // console.log(valueData)
+ this.goStartJudeg(valueData)
} else {
uni.showToast({
title: '璇烽�夋嫨瀹℃壒',
@@ -134,7 +137,7 @@
},
entery(form) {
// 1浼佷笟瀹℃壒锛�2鎵ф硶鍗曞鎵�
- checkUpd({...form, id: this.recordList, checkType: 2}).then(val => {
+ checkUpd({...form, ids: this.recordList, checkType: 2}).then(val => {
if(val.data.code == 200) {
uni.showToast({
title: '瀹℃壒鎴愬姛',
diff --git a/static/policy/loginHeaer1.png b/static/policy/loginHeaer1.png
deleted file mode 100644
index e3cd20f..0000000
--- a/static/policy/loginHeaer1.png
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1