From 7014dfda1d84b05c6b8fb5a076101840b1b11e73 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Fri, 6 Jun 2025 08:34:19 +0800
Subject: [PATCH 1/3] commission--yt-commit
---
pages/loginModule/register/register.wxml | 3 +++
1 file changed, 3 insertions(+)
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 @@
From 017cb7b0e908b152efd1e384baf43f64bc105ec9 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Fri, 6 Jun 2025 13:16:14 +0800
Subject: [PATCH 2/3] commission--yt-commit
---
pages/loginModule/forgetPwd/forgetPwd.wxml | 2 ++
pages/loginModule/pwdLogin/pwdLogin.js | 4 ++-
pages/loginModule/pwdLogin/pwdLogin.wxml | 6 +++-
pages/loginModule/pwdLogin/pwdLogin.wxss | 29 +++++++++++++++++--
pages/loginModule/register/register.js | 19 ++++++++----
.../personCenter/bindBankCard/bindBankCard.js | 11 +++++++
.../bindBankCard/bindBankCard.wxml | 1 +
.../withdrawalAccount/withdrawalAccount.js | 18 +++++++++++-
.../withdrawalAccount/withdrawalAccount.wxss | 8 ++---
pages/projectModule/applyCode/applyCode.js | 7 +++++
.../projectDetail/projectDetail.js | 15 +++++++---
.../projectDetail/projectDetail.wxml | 4 +--
request.js | 2 +-
13 files changed, 104 insertions(+), 22 deletions(-)
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/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/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}}
-
+
查看推广码
-
+
结算明细
Date: Fri, 6 Jun 2025 13:16:22 +0800
Subject: [PATCH 3/3] commission--yt-commit
---
pages/loginModule/pwdLogin/images/closeeyes.png | Bin 0 -> 2953 bytes
pages/loginModule/pwdLogin/images/openeyes.png | Bin 0 -> 4090 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 pages/loginModule/pwdLogin/images/closeeyes.png
create mode 100644 pages/loginModule/pwdLogin/images/openeyes.png
diff --git a/pages/loginModule/pwdLogin/images/closeeyes.png b/pages/loginModule/pwdLogin/images/closeeyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a2f26676fb1bc69b9a66207aeb28696bc273910
GIT binary patch
literal 2953
zcmeH}**hDE8pcD@5mh5et7?y}wX0>CrnJPG5W6;Zt=-s$9w9WAR7a>KVrxq+MYPs7
zL6HVWwMA=5Gb+?FBh=Q!P)m!LG3T#17jyA_znk}Y-sgF*ewj`VHsU8_P5=M^aWu-(
z<%k3S9O#Fm-{jt0egvUgE;iFKL{5iuJxBT2_
zrO&7hl;?fAR#|6|J6WE(B`b|c+#ii^38z%`K0f~aNrVnXJ&nnFWtHWpNBz7s=Ce1#
zC!)r5)4Ex?u1ebXVak&pL)Nmt`IJ+I|sTha)N*x
zh5d0NDt;+;z2GoqrLizCwSK@w7%YV=_DAB5pTpJJuwQe3|)2Y
zB%YUS40sGUjMKq%kg|RPAX+S;oJ)&8XrL)<^0FKLBoczcgIzTK(MKljPlB+yv*}
zEwcwZqNhS>fg2%fDW8frWqvAdhRKV)oTDEj$Yz
zB(b~gn3h^Vd9MBLBEOjgJ@h71tB$=Lfm%>8ACC)YEf>CM4?K~JO|eKW3)w<6+Yp*^)T6Bm
zANaR!PY)FT2}R>11Ko1D0j%n!uCB8$A_ueCE$8k|V`;uK6&szq+SfGyNi3}0-|aTM
zu(p~|u60jadFW5$n=OrU2MmyssSob3sO7)xWL;gkg_1sg%-Lb9WfZL%HXAEfa5c#Y
z!A~9>cTI*nLc0=WK3=Y!wxOgLnqF~KtH}?9BZG%xzMPI-EUZd?(>m|F6i%_!;j8I>
zpRmp(U24PP!r08Y`Y%OTFTZvCU-8opM9V=IAlvsfrq@pl9s8*#-u!tWI+gfuW}e5sLosblq5dmn{6X*>G0be7c^#_(eU;CA!EYO)ys}{2d1^i@hF^>
zpH58H(>Iy;mEDc+@FeH!^mw$Scp$cExG7SsVgDsNgH4B44Z+P?m`WZQlNPfYMA}p&
zPx>dI4T7%FT)=C~5T&=wrxT5(VGwMJo%|?2$bDqO%UT!nF~6T_%BXl&(zjL;*$S^u
z+~G*tJ1J^1ENPV!?Or~t$HMv5uj$|>%FEs4)x=uZ)N4Fv-`)6f$U@GG+|MT!KPdE0
zuZRNfsqzJrg7hr6ux|N|0=Xrysiyzz_Sm?}R~20uG<7S#h`9BGsoF1f<*R~CP+jm-
zN5jZcw;76_*w#*g1_3{WmUL>y(QpoB=^A=EoVY8G1&4R{4}4e>%|8;(4GugyXhQ4H%?Zoqpmhqs^Zr5$MGU<
zGoL&7;V0|<+L~R3)F3ITpIoWNCW5H~6W*3BTWB<|7?m`VSGm>dOo!0+LuXF4?CUc?
z^9t_0qHXL3N!PQ(OsWQaN_g`^+X>)vuAnl(J9*st4(_4k;jy1^2l{G|{x=@ROiwkE
zW!;0|rieP7Qw4TPB=Kk0$&&1bGtz8ruUyk2bFi$*@Yc^ig$#>(glVxGEh@~wrLbb2
zkC#2Swsnns^3xjE?eb_U>`~>98DVwUhddub_?~U(N2M>p`oyj6dJ&tj7xD2OApKzj
z>g|jL>C)~-ck0TuJN-uQI6h!Y5nb+9z15Qk!7*4tkqmJe$Z}}89<^Ss62QQggtz0x
zUm8TNm%m~=&^i3Yt0d3-?6tfAGKOBL5t217fngkSHcq@ZYA~I{JTGiC!ulb$bEOp9
zlZw!D`k6!Ez8@zVO>u~`uv&x`Pxaho=imrH61x)4zG
zwSCa!k=(Rrvu2%yLC~zyAsWPt93frJtU5}ah8G1L3DKm1b&`cB45c2W`R+(-XhGRK
zze3H(PSbA1M@AI*?krDSEfrSP@l^ZBYX*z;|1JLioBBYkXZ|7Qfo}!p$gKfrD+kMF
I^Bcs!0a+bDcmMzZ
literal 0
HcmV?d00001
diff --git a/pages/loginModule/pwdLogin/images/openeyes.png b/pages/loginModule/pwdLogin/images/openeyes.png
new file mode 100644
index 0000000000000000000000000000000000000000..987dc1b010d651a70b878ec28017e07bc9cd264e
GIT binary patch
literal 4090
zcmdVd`9BkW`~dK6Ota7?a@TC+7DKsB#@uqP5I!+SWTZk-maCB%BKJ*>jog*F3OOQj
z13}$+zUOFEDlydP5
zIBQKJ{qw%c77m6O!u4u0QbDY&LoaACk{C=3fBKJhW>+fljx81lvT7e#xmXMUw%vCv
zM?zr~WR&|AMKA;fVWAZyby-Z3qR++1bo$M$Z>4LleW_s=@0Theb+&b8O{QLtBM)}ft
zT{0iXJ{-w=&Zzr1E_=3n71DKmS(+#GarG~YeS;h3SW!evG}7|-rMCIA<*B?k#PSbo
zm%=P7twkthgCCaS=jLT>f#d9*uT?mYT4vItRT<+gb|R14@A~_4TN?M-mI0CGJMrM#
zHjNiWLwm)72oG)d^K^9RCr)*1R?0Ca(ulAR#MAm9HT
zxY~bn&-bA|Mb@eZhjNaBjAaBw$~NFwSvyG!Z<<{&MQ2_wu7|B4!}rvMGe9DHu)C
z!rZLm#Sr>DW>L*eyW>gzJ|d7nP*^Kmu}JV;U-LKkePwlbeWo
zOnE}3pU?`{^>GPLE$790r$_2oVC|*I4{-6KYJdbwueDW0(c-oj2Bw+_
z58D_X;(A_!Qty&o?loqX@?V7fZZhmxP5NdcSg4b3EE)1Xb-~ew{(cJm$^W0Yl(1I}
zH(rF3D$=~O;}6RCt$kFoaZ;VI%ziiYklgV3(p}k82!Ba?X!g`AUJ}CZ4(+isKcC1V
zDwApM{Orsb_U=0vx*s+(_IXFsk!KTO^dP@IPwW|P=Yc+z
zcv}qqx2e)6{hX0I==X!N5U(~AEcksh^j;z?fxw2a2>U1m?)a-A;|q!oL|(Y79aik{F-J;(lN^|=>^}=b8F|g6
zLDnPmaPI2?ab59HL;}GRd|w%ntrE827i66R@skvr3XT`lA2{X+Cy4#;KrQ5-&GUx&
zXYih4i%#S0sDWBrX&Y_|2+FjTeu
zwMeDP9sFR8?s{pDn_-6m1
zym#vo0)Hw|sCxm6uTt9SQ=f2O$rvF*GvCFZ$50oaWmxqpR4wo?OD+%k4AL^>UDK|(
zr$4Jr3aHAOSM;>j{ov}kOh>ssskrK}|Ce$6&I)!m#hYsrUvIhvmqBF1Qf?;(DrbQy
zu_&s?`9xlrBdV(6R`*6jcorD;g^rqJU59jqa)f88g{owFZ;PhzY>wW>PuFfeIv?7U
zCF207Qhjl=>*bJ|M&rJpiL(-mOIC@)p-Y{Q=C_(1>jHA~;X$v;TEv?|;WUXk8e$ZQ
z{qwYSNi}VVP*>_#TXHn{!?_TluHmDc0@qOU)r*vPxag%|SJx@oX-#_-YV0!o}4jXN0eral`>T
z^T49Z*5R5gi{2mIw%@X8y>yT8>`ysGM^|=M!R@tU)iUhh3U8@!cedF@me#axxyQuG
z$JRx3<0@HHpW6+Pu#)lF(}*p1{EZ?p$!aPxIK$kl2r!2Jx+u2`FP0T~hb&
zCJ*ygGW(mfleg$@)e?{cf<(1D*g|r{{$PSD?)Au+h9Z@#fbS7VEX5e#sob0Bq?H#o
zm-X`bx>L&9Iv}BQw00(7T)PK5^GBOnU{MUsevsR%-74xABD^9?Le$N!@dfxqbW8hR
z^r*(_Cup8!;P|R0R%Z$igREo_`;I)^X0kaebJG%PFI8B&GM(&DgyqKKV|!r2*9
zf*R&<&v*#5G>p=&tLuKaChwg^#r6HrQhV6B@T<>rc&ehW7=rK@jsI)^Bj%WEQt2P+
zqEW5dD~Z)EK`pw2VSDr1Qvet%@1Av7I^(7sArbR=zq-HCFz_(c;t@pc#ctF^;rLcy
zA73zFWA<&DXq5qcafWC}zm4nE^%f9z8F0c}Gepypf?9TcM;a#2pK|w|@UECOB?A_u
zUVTu6Qlu$C&5gm^ne7>C?xwVqkBZzBALoQfE`5x~mk_Llj>g>87L?ZHnm22l=;92S
z$0REcB$mBr*qe*Z$(g<+%`$fQwO!+zrv<wLaTd9E?ZXuZ3aEi-PW3npFI~r&kqkbwJ}c