Compare commits

..

No commits in common. "01af5c52d40327e8b057f83e4905800bdb01a558" and "dfd14fe57620016b3cd4977ddcb16fa49bd4aca0" have entirely different histories.

15 changed files with 21 additions and 106 deletions

View File

@ -14,7 +14,6 @@
class="flex-col justify-start items-start text-wrapper view input" class="flex-col justify-start items-start text-wrapper view input"
placeholder="请输入手机号" placeholder="请输入手机号"
maxlength="11" maxlength="11"
type="number"
model:value="{{phone}}" model:value="{{phone}}"
bindinput="onPhoneInput" bindinput="onPhoneInput"
/> />
@ -27,7 +26,6 @@
class="flex-col justify-start items-start text-wrapper_2 view_2 input_1" class="flex-col justify-start items-start text-wrapper_2 view_2 input_1"
placeholder="请输入验证码" placeholder="请输入验证码"
maxlength="6" maxlength="6"
type="number"
model:value="{{code}}" model:value="{{code}}"
bindinput="onCodeInput" bindinput="onCodeInput"
/> />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -10,9 +10,7 @@ Page({
isAgree: false, // 用户协议是否勾选 isAgree: false, // 用户协议是否勾选
countdown: 0, // 剩余秒数 countdown: 0, // 剩余秒数
codeButtonText: '获取验证码', codeButtonText: '获取验证码',
_timer: null, _timer: null
defaultType: true, //
passwordType: true
}, },
// 切换到“密码登录”,只清空表单字段 // 切换到“密码登录”,只清空表单字段

View File

@ -22,18 +22,14 @@
<!-- 手机号输入 --> <!-- 手机号输入 -->
<view class="flex-col self-stretch"> <view class="flex-col self-stretch">
<view class="flex-col justify-start relative section parentstyle "> <view class="flex-col justify-start relative section">
<view class='centerStyle'>
<input <input
class="flex-col justify-start items-start text-wrapper view input" class="flex-col justify-start items-start text-wrapper view input"
placeholder="请输入手机号" placeholder="请输入手机号"
maxlength="11" maxlength="11"
type="number"
model:value="{{phone}}" model:value="{{phone}}"
bindinput="onPhoneInput" bindinput="onPhoneInput"
/> />
<image src='{{defaultType? "": ""}}' class='imageStyle' bindtap='eyeStatus'></image>
</view>
</view> </view>
<!-- 密码 / 验证码 输入 + 获取验证码按钮 --> <!-- 密码 / 验证码 输入 + 获取验证码按钮 -->

View File

@ -69,7 +69,7 @@
} }
.section_2 { .section_2 {
margin-right: 4.93rpx; margin-right: 4.93rpx;
padding: 12.63rpx 16.88rpx 9.75rpx; padding: 20.63rpx 16.88rpx 18.75rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 9.38rpx; border-radius: 9.38rpx;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040; box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
@ -161,28 +161,3 @@
width: 37.5rpx; width: 37.5rpx;
height: 37.5rpx; height: 37.5rpx;
} }
.parentstyle {
/* display: flex; */
/* align-items: center; */
/* border: 1rpx solid #e0e0e0; */
border-radius: 10rpx;
/* box-shadow: 0 0 5rpx #e0e0e0; */
/* margin: 30rpx 38px; */
/* padding: 20rpx; */
}
.parentstyle .imageStyle {
width: 41rpx;
height: 41rpx;
margin-right: 20rpx;
}
.parentstyle .centerStyle {
display: flex;
flex: 1;
align-items: center;
justify-content: space-between;
font-size: 28rpx;
}

View File

@ -94,11 +94,11 @@ Page({
async onRegister() { async onRegister() {
// 调用通用校验,失败时已提示并 return // 调用通用校验,失败时已提示并 return
if (!validate(this.data, { if (!validate(this.data, {
nickname: '昵称不能为空', nickname: '请输入昵称',
phone: '手机号不能为空', phone: '请输入手机号',
captcha: '验证码不能为空', captcha: '请输入验证码',
inviteCode: '邀请码不能为空', inviteCode: '请输入邀请码',
password: '密码不能为空' password: '请输入密码'
})) { })) {
return; return;
} }
@ -108,10 +108,6 @@ Page({
return; return;
} }
const { nickname, phone, captcha, inviteCode, password } = this.data; const { nickname, phone, captcha, inviteCode, password } = this.data;
wx.showLoading({
title: '加载中',
mask: true
})
const res = await requestAsync({ const res = await requestAsync({
url: baseUrl + '/userInfo/register', url: baseUrl + '/userInfo/register',
method: 'POST', method: 'POST',
@ -124,14 +120,12 @@ Page({
userPassword: password userPassword: password
} }
}); });
console.log('注册信息---->',res.data);
if (res.data.code === 1) { if (res.data.code === 1) {
wx.showToast({ wx.showToast({
title: '注册成功', title: '注册成功',
icon: 'success', icon: 'success',
duration: 1000, duration: 1000
}); });
wx.hideLoading()
setTimeout(() => { setTimeout(() => {
wx.navigateTo({ wx.navigateTo({
url: '/pages/loginModule/pwdLogin/pwdLogin', url: '/pages/loginModule/pwdLogin/pwdLogin',
@ -145,7 +139,6 @@ Page({
title: res.data.message || '注册失败', title: res.data.message || '注册失败',
icon: 'none' icon: 'none'
}); });
wx.hideLoading()
} }
}, },

View File

@ -20,7 +20,6 @@
class="flex-col justify-start items-start text-wrapper_5 text-wrapper_1 input_1" class="flex-col justify-start items-start text-wrapper_5 text-wrapper_1 input_1"
placeholder="请输入手机号" placeholder="请输入手机号"
maxlength="11" maxlength="11"
type="number"
bindinput="onInput" data-field="phone" value="{{phone}}" bindinput="onInput" data-field="phone" value="{{phone}}"
/> />
</view> </view>
@ -48,8 +47,6 @@
<view class="flex-col justify-start section_2 mt-22"> <view class="flex-col justify-start section_2 mt-22">
<input class="flex-col justify-start items-start text-wrapper_5 view_3 input_4" <input class="flex-col justify-start items-start text-wrapper_5 view_3 input_4"
placeholder="请输入密码" placeholder="请输入密码"
password="true"
maxlength="11"
bindinput="onInput" data-field="password" value="{{password}}" bindinput="onInput" data-field="password" value="{{password}}"
/> />
</view> </view>

View File

@ -122,17 +122,6 @@ Page({
return false; return false;
} }
// 正则表达式,匹配非汉字字符
const reg = /[^\u4e00-\u9fa5]/;
// 判断输入的值是否含有非汉字字符
if (reg.test(cardHolder)) {
wx.showToast({
title: '姓名必须为汉字',
icon: 'none',
});
return false;
}
// 检查手机号是否为 11 位且只包含数字 // 检查手机号是否为 11 位且只包含数字
const phonePattern = /^[0-9]{11}$/; const phonePattern = /^[0-9]{11}$/;
if (!phonePattern.test(phoneNumber)) { if (!phonePattern.test(phoneNumber)) {

View File

@ -73,7 +73,6 @@
placeholder="请输入开户银行" placeholder="请输入开户银行"
data-field="bankName" data-field="bankName"
bindinput="handleInputChange" bindinput="handleInputChange"
type="number"
value="{{ bankName }}" value="{{ bankName }}"
/> />
</view> </view>

View File

@ -25,22 +25,6 @@ Page({
success: (res) => { success: (res) => {
console.log('当前账户是---->',res.data); console.log('当前账户是---->',res.data);
if (res.data.code === 1) { if (res.data.code === 1) {
if (res.data.data === null ) {
wx.showModal({
title: '提示',
content: '当前无账户,请添加',
complete: (res) => {
if (res.cancel) {
wx.navigateBack()
} else if (res.confirm) {
wx.navigateTo({
url: '/pages/personCenter/bindBankCard/bindBankCard',
})
}
}
})
return;
}
this.setData({ this.setData({
cardHolder: res.data.data.cardHolder, cardHolder: res.data.data.cardHolder,
idCardNumber: res.data.data.idCardNumber, idCardNumber: res.data.data.idCardNumber,
@ -88,7 +72,7 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
this.getAccountInfo()
}, },
/** /**

View File

@ -1,5 +1,5 @@
.mt-27 { .mt-27 {
margin-top: 32.63rpx; margin-top: 50.63rpx;
} }
.page { .page {
padding: 65.63rpx 37.5rpx 701.25rpx 58.13rpx; padding: 65.63rpx 37.5rpx 701.25rpx 58.13rpx;
@ -17,7 +17,7 @@
margin-top: 82.5rpx; margin-top: 82.5rpx;
} }
.group_2 { .group_2 {
padding-bottom: 29.25rpx; padding-bottom: 41.25rpx;
border-bottom: solid 1.88rpx #d1d1d1; border-bottom: solid 1.88rpx #d1d1d1;
} }
.font { .font {
@ -48,11 +48,11 @@
line-height: 22.76rpx; line-height: 22.76rpx;
} }
.group_3 { .group_3 {
padding-bottom: 29.25rpx; padding-bottom: 41.25rpx;
} }
.group_4 { .group_4 {
margin-right: 11.25rpx; margin-right: 11.25rpx;
padding: 25rpx 0; padding: 30rpx 0;
border-top: solid 1.88rpx #d1d1d1; border-top: solid 1.88rpx #d1d1d1;
border-bottom: solid 1.88rpx #d1d1d1; border-bottom: solid 1.88rpx #d1d1d1;
} }

View File

@ -53,11 +53,6 @@ Page({
return; return;
} }
wx.showLoading({
title: '申请中',
mask: true
})
const token = wx.getStorageSync('token'); const token = wx.getStorageSync('token');
wx.request({ wx.request({
url: baseUrl + '/promoCodeApply/apply', url: baseUrl + '/promoCodeApply/apply',
@ -78,7 +73,6 @@ Page({
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}); });
wx.hideLoading()
setTimeout(() => { setTimeout(() => {
wx.navigateBack(); wx.navigateBack();
}, 1000); }, 1000);
@ -87,7 +81,6 @@ Page({
title: res.data.message || '申请失败', title: res.data.message || '申请失败',
icon: 'none' icon: 'none'
}); });
wx.hideLoading()
} }
}, },
fail: () => { fail: () => {

View File

@ -41,7 +41,6 @@ Page({
id id
}, },
success: (res) => { success: (res) => {
console.log('项目详细---->',res.data.data);
if (res.data.code === 1) { if (res.data.code === 1) {
const detail = res.data.data || {}; const detail = res.data.data || {};
this.setData({ this.setData({
@ -86,19 +85,13 @@ Page({
}); });
}, },
// 跳转结算明细 // “结算明细”跳转
gotoSubSettlement(e) { goToSettlementDetail() {
const projectId = e.currentTarget.dataset.id;
const url = e.currentTarget.dataset.url;
const name = e.currentTarget.dataset.name;
wx.navigateTo({ wx.navigateTo({
url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`, url: '/pages/projectModule/subSettlement/subSettlement' // 替换为你的页面路径
}) });
}, },
// 推广码-查看资料 // 推广码-查看资料
goToPromoMaterial(e) { goToPromoMaterial(e) {
const id = e.currentTarget.dataset.id; // 项目id const id = e.currentTarget.dataset.id; // 项目id

View File

@ -9,7 +9,7 @@
<text class="self-start font text">{{projectDetail.projectName}}</text> <text class="self-start font text">{{projectDetail.projectName}}</text>
<view class="flex-row items-center self-stretch mt-7"> <view class="flex-row items-center self-stretch mt-7">
<text class="flex-1 font_2 text_2">{{projectDetail.projectDescription}}</text> <text class="flex-1 font_2 text_2">{{projectDetail.projectDescription}}</text>
<view class="flex-row items-center shrink-0 section ml-13" bindtap="gotoSubSettlement" data-id="{{ projectDetail.id }}" data-url="{{ projectDetail.projectImage }}" data-name="{{ projectDetail.projectName }}"> <view class="flex-row items-center shrink-0 section ml-13" bindtap="goToSettlementDetail">
<image <image
class="shrink-0 image_2" class="shrink-0 image_2"
src="./images/jsmx.png" src="./images/jsmx.png"
@ -149,7 +149,7 @@
data-link="{{item.promoCodeLink}}" data-link="{{item.promoCodeLink}}"
>查看推广码</text> >查看推广码</text>
<view class="flex-row self-stretch group_12"> <view class="flex-row self-stretch group_12">
<view class="flex-col justify-start items-center text-wrapper_3" > <view class="flex-col justify-start items-center text-wrapper_3" bindtap="goToSettlementDetail">
<text class="font_14 text_21">结算明细</text> <text class="font_14 text_21">结算明细</text>
</view> </view>
<view class="flex-col justify-start items-center text-wrapper_4 ml-12" bindtap="goToPromoMaterial" data-id="{{item.projectId}}" <view class="flex-col justify-start items-center text-wrapper_4 ml-12" bindtap="goToPromoMaterial" data-id="{{item.projectId}}"