diff --git a/pages/loginModule/forgetPwd/forgetPwd.wxml b/pages/loginModule/forgetPwd/forgetPwd.wxml
index 4684014..1239fbc 100644
--- a/pages/loginModule/forgetPwd/forgetPwd.wxml
+++ b/pages/loginModule/forgetPwd/forgetPwd.wxml
@@ -14,6 +14,7 @@
class="flex-col justify-start items-start text-wrapper view input"
placeholder="请输入手机号"
maxlength="11"
+ type="number"
model:value="{{phone}}"
bindinput="onPhoneInput"
/>
@@ -26,6 +27,7 @@
class="flex-col justify-start items-start text-wrapper_2 view_2 input_1"
placeholder="请输入验证码"
maxlength="6"
+ type="number"
model:value="{{code}}"
bindinput="onCodeInput"
/>
diff --git a/pages/loginModule/pwdLogin/images/closeeyes.png b/pages/loginModule/pwdLogin/images/closeeyes.png
new file mode 100644
index 0000000..6a2f266
Binary files /dev/null and b/pages/loginModule/pwdLogin/images/closeeyes.png differ
diff --git a/pages/loginModule/pwdLogin/images/openeyes.png b/pages/loginModule/pwdLogin/images/openeyes.png
new file mode 100644
index 0000000..987dc1b
Binary files /dev/null and b/pages/loginModule/pwdLogin/images/openeyes.png differ
diff --git a/pages/loginModule/pwdLogin/pwdLogin.js b/pages/loginModule/pwdLogin/pwdLogin.js
index 0d48b0d..e8b6925 100644
--- a/pages/loginModule/pwdLogin/pwdLogin.js
+++ b/pages/loginModule/pwdLogin/pwdLogin.js
@@ -10,7 +10,9 @@ Page({
isAgree: false, // 用户协议是否勾选
countdown: 0, // 剩余秒数
codeButtonText: '获取验证码',
- _timer: null
+ _timer: null,
+ defaultType: true, //
+ passwordType: true
},
// 切换到“密码登录”，只清空表单字段
diff --git a/pages/loginModule/pwdLogin/pwdLogin.wxml b/pages/loginModule/pwdLogin/pwdLogin.wxml
index 1299ed8..8f95500 100644
--- a/pages/loginModule/pwdLogin/pwdLogin.wxml
+++ b/pages/loginModule/pwdLogin/pwdLogin.wxml
@@ -22,14 +22,18 @@
-
+
+
+
+
diff --git a/pages/loginModule/pwdLogin/pwdLogin.wxss b/pages/loginModule/pwdLogin/pwdLogin.wxss
index 782ca79..5d3f606 100644
--- a/pages/loginModule/pwdLogin/pwdLogin.wxss
+++ b/pages/loginModule/pwdLogin/pwdLogin.wxss
@@ -69,7 +69,7 @@
}
.section_2 {
margin-right: 4.93rpx;
- padding: 20.63rpx 16.88rpx 18.75rpx;
+ padding: 12.63rpx 16.88rpx 9.75rpx;
background-color: #ffffff;
border-radius: 9.38rpx;
box-shadow: 0rpx 3.75rpx 7.5rpx #00000040;
@@ -160,4 +160,29 @@
.checkbox .wx-checkbox-input {
width: 37.5rpx;
height: 37.5rpx;
-}
\ No newline at end of file
+}
+
+.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;
+}
+
diff --git a/pages/loginModule/register/register.js b/pages/loginModule/register/register.js
index 1fe41df..ab51ac4 100644
--- a/pages/loginModule/register/register.js
+++ b/pages/loginModule/register/register.js
@@ -94,11 +94,11 @@ Page({
async onRegister() {
// 调用通用校验，失败时已提示并 return
if (!validate(this.data, {
- nickname: '请输入昵称',
- phone: '请输入手机号',
- captcha: '请输入验证码',
- inviteCode: '请输入邀请码',
- password: '请输入密码'
+ nickname: '昵称不能为空',
+ phone: '手机号不能为空',
+ captcha: '验证码不能为空',
+ inviteCode: '邀请码不能为空',
+ password: '密码不能为空'
})) {
return;
}
@@ -108,6 +108,10 @@ Page({
return;
}
const { nickname, phone, captcha, inviteCode, password } = this.data;
+ wx.showLoading({
+ title: '加载中',
+ mask: true
+ })
const res = await requestAsync({
url: baseUrl + '/userInfo/register',
method: 'POST',
@@ -120,12 +124,14 @@ Page({
userPassword: password
}
});
+ console.log('注册信息---->',res.data);
if (res.data.code === 1) {
wx.showToast({
title: '注册成功',
icon: 'success',
- duration: 1000
+ duration: 1000,
});
+ wx.hideLoading()
setTimeout(() => {
wx.navigateTo({
url: '/pages/loginModule/pwdLogin/pwdLogin',
@@ -139,6 +145,7 @@ Page({
title: res.data.message || '注册失败',
icon: 'none'
});
+ wx.hideLoading()
}
},
diff --git a/pages/loginModule/register/register.wxml b/pages/loginModule/register/register.wxml
index c9e928f..dfcd2f1 100644
--- a/pages/loginModule/register/register.wxml
+++ b/pages/loginModule/register/register.wxml
@@ -20,6 +20,7 @@
class="flex-col justify-start items-start text-wrapper_5 text-wrapper_1 input_1"
placeholder="请输入手机号"
maxlength="11"
+ type="number"
bindinput="onInput" data-field="phone" value="{{phone}}"
/>
@@ -47,6 +48,8 @@
diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js
index 88bfce2..ffd0e51 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.js
+++ b/pages/personCenter/bindBankCard/bindBankCard.js
@@ -122,6 +122,17 @@ Page({
return false;
}
+ // 正则表达式，匹配非汉字字符
+ const reg = /[^\u4e00-\u9fa5]/;
+ // 判断输入的值是否含有非汉字字符
+ if (reg.test(cardHolder)) {
+ wx.showToast({
+ title: '姓名必须为汉字',
+ icon: 'none',
+ });
+ return false;
+ }
+
// 检查手机号是否为 11 位且只包含数字
const phonePattern = /^[0-9]{11}$/;
if (!phonePattern.test(phoneNumber)) {
diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxml b/pages/personCenter/bindBankCard/bindBankCard.wxml
index 43b7169..7297381 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.wxml
+++ b/pages/personCenter/bindBankCard/bindBankCard.wxml
@@ -73,6 +73,7 @@
placeholder="请输入开户银行"
data-field="bankName"
bindinput="handleInputChange"
+ type="number"
value="{{ bankName }}"
/>
diff --git a/pages/personCenter/withdrawalAccount/withdrawalAccount.js b/pages/personCenter/withdrawalAccount/withdrawalAccount.js
index f30401b..fb8c05a 100644
--- a/pages/personCenter/withdrawalAccount/withdrawalAccount.js
+++ b/pages/personCenter/withdrawalAccount/withdrawalAccount.js
@@ -25,6 +25,22 @@ Page({
success: (res) => {
console.log('当前账户是---->',res.data);
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({
cardHolder: res.data.data.cardHolder,
idCardNumber: res.data.data.idCardNumber,
@@ -72,7 +88,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ this.getAccountInfo()
},
/**
diff --git a/pages/personCenter/withdrawalAccount/withdrawalAccount.wxss b/pages/personCenter/withdrawalAccount/withdrawalAccount.wxss
index 7ef9fd0..8596a1c 100644
--- a/pages/personCenter/withdrawalAccount/withdrawalAccount.wxss
+++ b/pages/personCenter/withdrawalAccount/withdrawalAccount.wxss
@@ -1,5 +1,5 @@
.mt-27 {
- margin-top: 50.63rpx;
+ margin-top: 32.63rpx;
}
.page {
padding: 65.63rpx 37.5rpx 701.25rpx 58.13rpx;
@@ -17,7 +17,7 @@
margin-top: 82.5rpx;
}
.group_2 {
- padding-bottom: 41.25rpx;
+ padding-bottom: 29.25rpx;
border-bottom: solid 1.88rpx #d1d1d1;
}
.font {
@@ -48,11 +48,11 @@
line-height: 22.76rpx;
}
.group_3 {
- padding-bottom: 41.25rpx;
+ padding-bottom: 29.25rpx;
}
.group_4 {
margin-right: 11.25rpx;
- padding: 30rpx 0;
+ padding: 25rpx 0;
border-top: solid 1.88rpx #d1d1d1;
border-bottom: solid 1.88rpx #d1d1d1;
}
diff --git a/pages/projectModule/applyCode/applyCode.js b/pages/projectModule/applyCode/applyCode.js
index 0e32038..c35ff83 100644
--- a/pages/projectModule/applyCode/applyCode.js
+++ b/pages/projectModule/applyCode/applyCode.js
@@ -53,6 +53,11 @@ Page({
return;
}
+ wx.showLoading({
+ title: '申请中',
+ mask: true
+ })
+
const token = wx.getStorageSync('token');
wx.request({
url: baseUrl + '/promoCodeApply/apply',
@@ -73,6 +78,7 @@ Page({
icon: 'success',
duration: 1000
});
+ wx.hideLoading()
setTimeout(() => {
wx.navigateBack();
}, 1000);
@@ -81,6 +87,7 @@ Page({
title: res.data.message || '申请失败',
icon: 'none'
});
+ wx.hideLoading()
}
},
fail: () => {
diff --git a/pages/projectModule/projectDetail/projectDetail.js b/pages/projectModule/projectDetail/projectDetail.js
index 3d48f82..e427870 100644
--- a/pages/projectModule/projectDetail/projectDetail.js
+++ b/pages/projectModule/projectDetail/projectDetail.js
@@ -41,6 +41,7 @@ Page({
id
},
success: (res) => {
+ console.log('项目详细---->',res.data.data);
if (res.data.code === 1) {
const detail = res.data.data || {};
this.setData({
@@ -85,13 +86,19 @@ Page({
});
},
- // “结算明细”跳转
- goToSettlementDetail() {
+ // 跳转结算明细
+ gotoSubSettlement(e) {
+
+ const projectId = e.currentTarget.dataset.id;
+ const url = e.currentTarget.dataset.url;
+ const name = e.currentTarget.dataset.name;
+
wx.navigateTo({
- url: '/pages/projectModule/subSettlement/subSettlement' // 替换为你的页面路径
- });
+ url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`,
+ })
},
+
// 推广码-查看资料
goToPromoMaterial(e) {
const id = e.currentTarget.dataset.id; // 项目id
diff --git a/pages/projectModule/projectDetail/projectDetail.wxml b/pages/projectModule/projectDetail/projectDetail.wxml
index fe1a06c..a5bdce2 100644
--- a/pages/projectModule/projectDetail/projectDetail.wxml
+++ b/pages/projectModule/projectDetail/projectDetail.wxml
@@ -9,7 +9,7 @@
{{projectDetail.projectName}}
{{projectDetail.projectDescription}}
-
+
查看推广码
-
+
结算明细