From d1229bd4fe82c5303a07cd96476c27f61b1c48b2 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 08 十月 2024 16:23:54 +0800
Subject: [PATCH] updatge 扣款详情
---
pages/login/supplier-login.vue | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 15 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index f7c1619..e72c6bb 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -1,5 +1,5 @@
<template>
- <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
+ <view class="main-container login-container img100 relative" style="margin-top: 0rpx;min-height: 100vh;">
<!-- background-image:url('@/static/images/supplier/login/bg.png') -->
<image class="component-bg"
@@ -22,7 +22,7 @@
</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>
+ <u-input placeholder="请输入账号" :border="false" v-model="userName" @blur="validatePhoneNumber()"></u-input>
</view>
<view class="t-a input form-input" v-if="loginType=='pwd'">
@@ -31,7 +31,7 @@
<view class="t-a input form-input" v-if="loginType=='code'">
- <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
+ <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber" @blur="validatePhoneNumber()">
<template slot="suffix">
<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
{{ getCodeText }}
@@ -45,6 +45,43 @@
<u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
</view>
+
+ <view class="flex flex-wrap-normal" v-if="true">
+ <view :style="{'margin-top': '24rpx','margin-right': '12rpx','font-size':'24rpx'}"
+ @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
+
+ </view>
+ <!-- /pages/help/content?id=新手帮助 -->
+ <!-- 用户协议，隐私政策、卖家入驻协议、合伙人入驻协议 -->
+
+ <!-- #ifdef PUB_PARTNER -->
+ <view class="topic-gray">
+ 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、
+ <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
+ 、<span class="t-red" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">《合伙人入驻协议》</span>
+ 如您同意该指引，请勾选开始使用本小程序
+ </view>
+ <!-- #endif -->
+ <!-- #ifdef PUB_SUPPLIER -->
+ <view class="topic-gray">
+ 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>、
+ <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
+ 、<span class="t-red" @click="goto('/pages/help/content?id=卖家入驻协议',false)">《卖家入驻协议》</span>
+ 如您同意该指引，请勾选开始使用本小程序
+ </view>
+ <!-- #endif -->
+ <!-- #ifdef PUB_CUSTOMER -->
+ <view class="topic-gray">
+ 请仔细阅读<span class="t-red" @click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和
+ <span class="t-red" @click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
+ 如您同意该指引，请勾选开始使用本小程序
+ </view>
+ <!-- #endif -->
+
+ </view>
+
+
+
<button @tap="login()" class="bottom-button">登 录</button>
@@ -105,9 +142,9 @@
}
try {
if (!querydto.partnerUserId) {
- if (options.query && options.query.scene) {
+ if (options.query && options.query.scene || options.scene) {
//说明是特殊小程序二维码扫码跳转的
- var keyvalues = decodeURIComponent(options.query.scene).split("&")
+ var keyvalues = decodeURIComponent(options.query&&options.query.scene || options.scene).split("&")
for (var item of keyvalues) {
var tarr = item.split("=")
querydto[tarr[0]] = tarr[1]
@@ -268,7 +305,7 @@
}
uni.navigateTo({
- url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName||''}`
})
}
} catch (e2) {
@@ -297,7 +334,7 @@
// url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
// })
uni.navigateTo({
- url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName||''}`
})
}
@@ -308,8 +345,8 @@
},
onShareAppMessage() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -319,8 +356,8 @@
},
onShareTimeline() {
let that = this;
- var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -349,6 +386,7 @@
getCodeBtnColor: "#20613D",
getCodeisWaiting: false,
Timer: undefined,
+ protocal:false,
// #ifdef PUB_SUPPLIER
apitype: 'loginSupplier',
// #endif
@@ -362,6 +400,23 @@
};
},
methods: {
+ // 手机号码正则表达式校验
+ validatePhoneNumber() {
+
+ // 手机号码正则表达式，可以根据需要调整
+ const phoneRegex = /^[1][3-9][0-9]{9}$/;
+ if (this.loginType == 'pwd') {
+ if (!phoneRegex.test(this.userName)) {
+ this.$message.showToast('请填写正确手机号码')
+ }
+ }
+ if (this.loginType == 'code') {
+ if (!phoneRegex.test(this.phoneNumber)) {
+ this.$message.showToast('请填写正确手机号码')
+ }
+ }
+
+ },
async getCode() {
console.log('getCode')
uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
@@ -425,7 +480,7 @@
}, 1000)
},
toHome() {
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/home/home'
})
},
@@ -441,7 +496,7 @@
})
// #endif
// #ifdef PUB_SUPPLIER
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/login/supplier-reg'
})
// #endif
@@ -450,7 +505,7 @@
// uni.navigateTo({
// url: '/sub_pages/customer/customer-info/customer-info' + addstr
// })
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/login/supplier-reg'
})
// todo 如果是有分享id的，可能需要提前进行绑定
@@ -462,6 +517,10 @@
this.pcfvalue = e.detail.value[0]
},
async login() {
+ if(!this.protocal){
+ this.$message.showToast('请同意用户协议')
+ return
+ }
uni.showLoading({
title: '登陆中'
});
@@ -527,7 +586,7 @@
// uni.navigateBack();
// }, 1000);
- //todo 登录后可能需要进行绑定
+
} else {
// uni.showToast({
--
Gitblit v1.9.3