From 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 21 七月 2024 18:13:49 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
pages/login/supplier-login.vue | 82 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 51b358a..5a982d2 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -14,35 +14,35 @@
<view class="title-2">欢迎登录<span class="title-3">花满芜</span></view>
</view>
<view class="t-a input form-input" v-if="loginType=='pwd'">
- <!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
- <u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input>
-
+ <!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
+ <u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input>
+
</view>
<view class="t-a input form-input" v-if="loginType=='pwd'">
- <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
- <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>
+ <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
+ <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>
</view>
<view class="t-a input form-input" v-if="loginType=='code'">
-<!-- <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />
+ <!-- <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />
<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
{{getCodeText}}
- </view> -->
- <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
- <template slot="suffix">
- <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
- {{getCodeText}}
- </view>
- </template>
+ </view> -->
+ <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
+ <template slot="suffix">
+ <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
+ {{getCodeText}}
+ </view>
+ </template>
</u-input>
</view>
<view class="t-a form-input" v-if="loginType=='code'">
- <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->
- <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
-
+ <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->
+ <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
+
</view>
<button @tap="login()" class="bottom-button">登 录</button>
@@ -51,7 +51,7 @@
<view class="topic-font" v-if="loginType=='pwd'" @click="loginType='code'">手机验证码登录</view>
<view class="topic-font" v-if="loginType=='code'" @click="loginType='pwd'">账号密码登录</view>
- <!-- #ifdef PUB_SUPPLIER -->
+ <!-- #ifndef PUB_CUSTOMER -->
<view class="topic-font m-l-a m-r-0" @click="toReg">前往注册</view>
<!-- #endif -->
@@ -106,7 +106,7 @@
};
},
methods: {
- async getCode() {
+ async getCode() {
console.log('getCode')
uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
if (this.getCodeisWaiting) {
@@ -126,7 +126,7 @@
} = await this.$http.request('post', '/api/sms/send/code', {
data: {
tel: this.phoneNumber,
- userType: 'supplier'
+ userType: this.apitype.replace("login", "").toLowerCase() || 'supplier'
}
})
if (code == 0) {
@@ -135,6 +135,10 @@
icon: "none"
});
this.setTimer(); //调用定时器方法
+ } else {
+ this.getCodeText = "获取验证码" //发送验证码
+ this.getCodeisWaiting = false;
+ this.getCodeBtnColor = "#20613D";
}
// setTimeout(() => {
// uni.showToast({
@@ -168,9 +172,19 @@
// uni.switchTab({
// url: '/pages/index/index'
// })
- uni.redirectTo({
- url: '/sub_pages/supplier/supplier-reg/supplier-reg'
+ var addstr = ''
+ // #ifdef PUB_PARTNER
+ addstr = '?source=step'
+ uni.redirectTo({
+ url: '/sub_pages/partner/partner-info/partner-info' + addstr
})
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ uni.redirectTo({
+ url: '/pages/login/supplier-reg'
+ })
+ // #endif
+
},
changeAll(e) {
@@ -198,7 +212,7 @@
}
}
if (this.loginType == 'code') {
- if (!that.tel) {
+ if (!that.phoneNumber) {
uni.showToast({
title: '请输入手机号',
icon: 'none'
@@ -242,10 +256,10 @@
// }, 1000);
} else {
- uni.showToast({
- title: '登录失败！',
- icon: 'none'
- });
+ // uni.showToast({
+ // title: '登录失败！',
+ // icon: 'none'
+ // });
return;
}
@@ -262,17 +276,19 @@
.form-input {
background-color: #f8f7fc;
border-radius: 50rpx;
- margin-bottom: 50rpx;
+ margin-bottom: 50rpx;
border: 1px solid #e9e9e9;
- /deep/ .u-input{
- padding-left: 60rpx !important;
- padding-right: 40rpx !important;
+
+ /deep/ .u-input {
+ padding-left: 60rpx !important;
+ padding-right: 40rpx !important;
}
+
/deep/ input {
height: 70rpx;
- line-height: 70rpx;
-
- }
+ line-height: 70rpx;
+
+ }
}
</style>
--
Gitblit v1.9.3