From 69273c1c63c195289e281772e92fa10a2c93a46e Mon Sep 17 00:00:00 2001
From: 346149741 <346149741@qq.com>
Date: 星期六, 22 六月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
pages/companyLogin/companyLogin.vue | 21 ++++--
api/index.js | 8 +-
pages/index/index.vue | 8 +-
pages/registerCompany/registerCompany.vue | 115 +++++++++++++++++++++++++++++++++-----
4 files changed, 121 insertions(+), 31 deletions(-)
diff --git a/api/index.js b/api/index.js
index ced9d46..48a308b 100644
--- a/api/index.js
+++ b/api/index.js
@@ -11,9 +11,9 @@
}
// 鎯犱紒鏀跨瓥璇︽儏
export function doc(id){
- return http.get('/system/doc/'+id, { custom: { loading: true }});
+ return http.get('/system/doc/'+id, {params: data}, { custom: { loading: true }});
}
-// 淇℃伅鍏ず璇︽儏
-export function order(id){
- return http.get('/enforce/order/'+id, { custom: { loading: true }});
+// 浼佷笟娉ㄥ唽
+export function companyRegister(data) {
+ return http.post('/system/company/add', {params: data}, { custom: { loading: true }});
}
\ No newline at end of file
diff --git a/pages/companyLogin/companyLogin.vue b/pages/companyLogin/companyLogin.vue
index 3188d7d..609a084 100644
--- a/pages/companyLogin/companyLogin.vue
+++ b/pages/companyLogin/companyLogin.vue
@@ -1,8 +1,13 @@
<!-- 浼佷笟鐧诲綍 -->
<template>
<view class="companylogin">
+ <u-navbar title="" :autoBack="true" bgColor="transparent">
+ <template slot="center">
+
+ </template>
+ </u-navbar>
<view class="image-box">
- <image src="https://picsum.photos/760/345" mode="aspectFit" ></image>
+ <image src="/static/policy/loginHeader.png" mode="widthFix" ></image>
</view>
<view class="content-box">
<!-- <u-form label-width="60" labelAlign="right" >
@@ -43,8 +48,7 @@
<view style="margin-top: 56rpx;">
<view class="per-button" @click="loging">鐧诲綍</view>
</view>
- <!-- v-if="form.userType == '02'" -->
- <view @click="goRegister" class="company-register">
+ <view @click="goRegister" class="company-register" v-if="form.userType == '02'">
浼佷笟娉ㄥ唽
</view>
<!-- <u--text text="浼佷笟娉ㄥ唽" type="primary" @click="goRegister"></u--text> -->
@@ -105,6 +109,7 @@
getCode({phone: this.form.phone }).then(val => {
this.startCountdown()
uni.hideLoading();
+ this.tips = `${this.countdownTime}s鍚庨噸鏂拌幏鍙朻
uni.$u.toast('楠岃瘉鐮佸凡鍙戦��');
})
} else {
@@ -139,14 +144,16 @@
},
getInfo() {
getInfo().then(val => {
- console.log(val)
uni.setStorageSync('userInfo', val.data.data)
-
if(this.form.userType == '02') {
uni.redirectTo({
- url:`/pages/companyIndex/companyIndex`
+ url:`/qiye/qiyeIndex/qiyeIndex`
})
} else if(this.form.userType == '01'){
+ uni.redirectTo({
+ url:`/policy/policyIndex/policyIndex`
+ })
+ } else {
uni.redirectTo({
url:`/policy/policyIndex/policyIndex`
})
@@ -178,7 +185,7 @@
border-radius: 40rpx 40rpx 0 0;
padding: 40rpx 32rpx;
position: relative;
- top: -40rpx;
+ top: 80rpx;
background-color: white;
.form {
.form-item{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 095bc2d..6cd2b5b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,10 +12,10 @@
<img src="/static/i06.png" class="more" @click="more1()" alt="" />
</view>
<view class="btnbox">
- <img src="/static/i01.png" class="more" alt="" style="margin-right: 18rpx;" />
- <img src="/static/i02.png" class="more" alt="" />
- <img src="/static/i03.png" class="more" alt="" style="margin-right: 18rpx;" />
- <img src="/static/i04.png" class="more" alt="" />
+ <img src="/static/i01.png" class="more" alt="" style="margin-right: 18rpx;" @click="goMyCompany('01')"/>
+ <img src="/static/i02.png" class="more" alt="" @click="goMyCompany('02')"/>
+ <img src="/static/i03.png" class="more" alt="" style="margin-right: 18rpx;" @click="goMyCompany('01')"/>
+ <img src="/static/i04.png" class="more" alt="" @click="goMyCompany('00')"/>
<!-- <u-button @click="goMyCompany('01')">鎴戞槸鎵ф硶浜哄憳</u-button>
<u-button @click="goMyCompany('02')">鎴戞槸浼佷笟</u-button>
<u-button @click="goMyCompany('00')">杩愯惀绠＄悊</u-button> -->
diff --git a/pages/registerCompany/registerCompany.vue b/pages/registerCompany/registerCompany.vue
index be5a83f..8efc6a1 100644
--- a/pages/registerCompany/registerCompany.vue
+++ b/pages/registerCompany/registerCompany.vue
@@ -4,16 +4,16 @@
<view class="form">
<view class="form-item">
<text class="label require">濮撳悕</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
+ <input type="text" placeholder="璇疯緭鍏�" v-model="form.companyUser"/>
</view>
<view class="form-item">
<text class="label require">鎵嬫満鍙�</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
+ <input type="number" placeholder="璇疯緭鍏�" v-model="form.companyPhone"/>
</view>
<view class="form-item">
<text class="label require">楠岃瘉鐮�</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
- <text>鑾峰彇楠岃瘉鐮�</text>
+ <input type="text" placeholder="璇疯緭鍏�" v-model="form.code"/>
+ <text @click="getCode">{{tips}}</text>
</view>
</view>
</view>
@@ -21,21 +21,27 @@
<view class="form">
<view class="form-item">
<text class="label require">浼佷笟鍚嶇О</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
+ <input type="text" placeholder="璇疯緭鍏�" v-model="form.companyName"/>
</view>
<view class="form-item">
<text class="label require">缁熶竴绀句細淇＄敤浠ｇ爜</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
+ <input type="text" placeholder="璇疯緭鍏�" v-model="form.companyCode"/>
+ </view>
+ <view class="form-item">
+ <text class="label require">浼佷笟鍦板潃</text>
+ <input type="text" placeholder="璇疯緭鍏�" v-model="form.companyAddress"/>
</view>
<view class="form-item">
<text class="label require">钀ヤ笟鎵х収</text>
-
+
</view>
-
+
</view>
- <view style="text-align: center;">
- <img src="/static/i07.png" alt="" class="sc"/>
+ <view style="text-align: center;" @click="startUpload">
+ <img src="/static/i07.png" v-if="!form.companyImg" alt="" class="sc" />
+ <image :src="config + form.companyImg" mode="widthFix" class="sc" v-else></image>
</view>
+
</view>
<!-- <view class="form">
<view class="form-item">
@@ -77,16 +83,86 @@
</template>
<script>
- import { registerCompany, checkCode } from '@/api/auth.js'
+ import { registerCompany, checkCode, getCode } from '@/api/auth.js'
+ import { upload } from '@/common/upload'
+ import { config } from '@/common/config.js'
export default {
data() {
return {
form: {
-
- }
+ companyImg: ''
+ },
+ config: config.baseUrl,
+ isSendCode: false,
+ countdownTime: 20,
+ timer: null,
+ tips: '鑾峰彇楠岃瘉鐮�',
}
},
methods: {
+ startCountdown() {
+ if(this.timer) {
+ clearTimeout(this.timer)
+ this.timer = null
+ }
+ if(this.countdownTime <= 0) {
+ this.tips = "閲嶆柊鑾峰彇"
+ this.isSendCode = false
+ this.countdownTime = 20
+ return
+ }
+ this.timer = setTimeout(() => {
+ this.countdownTime--
+ this.tips = `${this.countdownTime}s鍚庨噸鏂拌幏鍙朻
+ this.startCountdown()
+ }, 1000)
+ },
+ getCode() {
+ if(!this.form.companyPhone){
+ uni.showToast({
+ title: '璇疯緭鍏ユ墜鏈哄彿',
+ icon: 'none'
+ })
+ return
+ }
+ if(!this.$u.test.mobile(this.form.companyPhone)){
+ uni.showToast({
+ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙�',
+ icon: 'none'
+ })
+ return
+ }
+ if (!this.isSendCode) {
+ this.isSendCode = true
+ uni.showLoading({
+ title: '姝ｅ湪鑾峰彇楠岃瘉鐮�'
+ })
+ getCode({phone: this.form.companyPhone }).then(val => {
+ this.startCountdown()
+ uni.hideLoading();
+ this.tips = `${this.countdownTime}s鍚庨噸鏂拌幏鍙朻
+ uni.$u.toast('楠岃瘉鐮佸凡鍙戦��');
+ })
+ } else {
+ uni.$u.toast('鍊掕鏃剁粨鏉熷悗鍐嶅彂閫�');
+ }
+ },
+ uploadImage(file) {
+ upload(file).then(val => {
+ // console.log(val.fileName)
+ this.form.companyImg = val.fileName
+ })
+ },
+ // 鍥剧墖涓婁紶鎺ュ彛
+ startUpload() {
+ uni.chooseImage({
+ count: 1,
+ success: val => {
+ // console.log(val.tempFilePaths[0])
+ this.uploadImage(val.tempFilePaths[0])
+ }
+ })
+ },
// 鏍￠獙瀛楁
authField(){
@@ -94,14 +170,20 @@
// 鏍￠獙code
async checkCode() {
try {
- const { code, data } = await checkCode({ code: this.form.code, phone: this.form.companyPhone, userType: '02' })
- if(code == 200) {
+ const { data } = await checkCode({ code: this.form.code, phone: this.form.companyPhone, userType: '02' })
+ console.log(data.data)
+ if(data.code == 200 && data.data != false) {
return Promise.resolve()
} else {
+ uni.showToast({
+ title: '楠岃瘉鐮侀敊璇�',
+ icon: 'none'
+ })
+ throw "鏍￠獙澶辫触"
return Promise.refject()
}
}catch(err){
-
+ throw "鏍￠獙澶辫触"
}
},
// 娉ㄥ唽鎺ュ彛
@@ -203,5 +285,6 @@
width: 90%;
height: 346rpx;
margin-bottom: 20rpx;
+ border-radius: 20rpx;
}
</style>
--
Gitblit v1.9.1