From 06340ad137084f465e8425c224f83a3380b01c78 Mon Sep 17 00:00:00 2001
From: liuyuan <582976274@qq.com>
Date: Thu, 12 Jun 2025 17:09:19 +0800
Subject: [PATCH] =?UTF-8?q?618=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/baseUrl.js | 2 +-
manifest.json | 4 +-
pages/wallet/account.vue | 8 +-
pages/wallet/recharge.vue | 152 +++++++++++++++++++++++++++++++++++---
4 files changed, 152 insertions(+), 14 deletions(-)
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 2dff17b..66edf5c 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -39,7 +39,7 @@ const orderRegular = /[0-9]\d{31}$/;
//手机号验证正则表达式
// (中国大陆)
// const phoneRegular = /^1\d{10}$/;
-const phoneRegular = /^1([358][0-9]|4[579]|66|7[0135678]|9[89])\d{8}$/;
+const phoneRegular = /^1(3[0-9]|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$/;
// 手机号码验证 支持港澳台 大陆
// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
diff --git a/manifest.json b/manifest.json
index c740fb1..04d22bd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "心灵空间",
"appid" : "__UNI__BBBDFD2",
"description" : "心灵空间",
- "versionName" : "1.0.27",
- "versionCode" : 1027,
+ "versionName" : "1.0.28",
+ "versionCode" : 1028,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/wallet/account.vue b/pages/wallet/account.vue
index 5c9377f..3b306f3 100644
--- a/pages/wallet/account.vue
+++ b/pages/wallet/account.vue
@@ -46,6 +46,7 @@
{{slotProps.row.remark}}
+ 说明：{{slotProps.row.note}}
{{ slotProps.row.createTime }}
@@ -247,10 +248,13 @@ export default {
margin-top: 20rpx;
color: #888;
}
-
+ .AC_note {
+ color: #888;
+ font-size: 26rpx;
+ }
.AC_time {
color: #bababa;
- font-size: 28rpx;
+ font-size: 26rpx;
}
}
}
diff --git a/pages/wallet/recharge.vue b/pages/wallet/recharge.vue
index 72d59e8..04f5430 100644
--- a/pages/wallet/recharge.vue
+++ b/pages/wallet/recharge.vue
@@ -12,11 +12,19 @@
: 'cj_price'
">
￥{{ item.realMoney }}
- {{ item.money }} 天医币
- 限时特惠
+ {{ item.money }}天医币（赠{{ item.givejf }}积分）
+ {{item.description}}
+
+ 其他金额
+
+
+
+ 说明 : 天医币属于虚拟产品，一经购买概不退还
+
+
支付方式
@@ -113,6 +121,8 @@ export default {
urlList: {
list: "common/bookBuyConfig/getBookBuyConfigList",
},
+ limitVal: '',
+ activityContent: {}
};
},
//第一次加载
@@ -126,6 +136,7 @@ export default {
}
this.chargeOrderSn = options.orderSn;
this.getDevName();
+ this.getActivity();
},
//页面显示
onShow() {
@@ -415,6 +426,7 @@ export default {
// 点击充值金额
chosPric(e) {
this.stepsCj = e;
+ this.limitVal = '';
},
// 选择支付方式1
@@ -422,6 +434,29 @@ export default {
let that = this;
that.payType = e;
},
+
+ //获取活动文案
+ getActivity(){
+ $http.request({
+ url: "common/bookBuyConfig/getRechargeActivity",
+ method: "POST",
+ data: {},
+ header: {
+ "Content-Type": "application/json",
+ },
+ })
+ .then((data) => {
+ if(data.code==0){
+ if(data.res&&data.res.length>0){
+ this.activityContent = data.res[0];
+ }
+ }
+ })
+ },
+ //输入金额
+ input(val){
+ this.stepsCj = {};
+ },
// 充值
goToPay() {
this.kaiChar();
@@ -435,6 +470,31 @@ export default {
});
return false;
}
+ if(!this.stepsCj.priceTypeId&&!this.limitVal){
+ uni.showToast({
+ title: "请选择充值商品",
+ icon: "none",
+ });
+ return false;
+ }
+
+ const regex = /^[1-9]\d*$/;
+ //如果输入其他金额
+ if(this.limitVal){
+ if(!regex.test(this.limitVal)){
+ uni.showToast({
+ title: "充值金额必须为正整数",
+ icon: "none",
+ });
+ return false;
+ }
+ //设置充值金额和id
+ this.stepsCj = {
+ money: this.limitVal,
+ priceTypeId: 0
+ }
+ }
+
//常规充值
if (this.radioValue == "1") {
uni.showLoading({
@@ -677,29 +737,43 @@ export default {
width: 47%;
margin: 0 5% 30rpx 0;
text-align: center;
- padding: 20rpx;
+ padding: 30rpx 0 0;
border-radius: 15rpx;
position: relative;
color: #2d2d2d;
+ height: 160rpx;
.pr_jg {
font-size: 45rpx;
- margin: 20rpx 0 10rpx 0;
font-weight: bold;
}
.pr_yl {
+ padding-top: 10rpx;
font-size: 26rpx;
color: #575555;
+
+ text{
+ width: 100%;
+ text-align: center;
+ line-height: 40rpx;
+ position: absolute;
+ left: 0;
+ bottom: 10rpx;
+ color: red;
+ display: block;
+ font-size: 24rpx;
+ }
}
.pr_lj {
- background-image: linear-gradient(180deg, #7dc1f0 0%, #a7defc 100%);
+ background-image: linear-gradient(180deg, #7dc1f0 20%, #7dc1f0 100%);
color: #fff;
position: absolute;
- top: -30rpx;
- right: -20rpx;
+ top: -22rpx;
+ right: -22rpx;
font-size: 24rpx;
+ line-height: 20px;
padding: 5rpx 10rpx;
border-top-left-radius: 20rpx;
border-bottom-right-radius: 20rpx;
@@ -762,10 +836,12 @@ export default {
}
.char_btn {
+ width: 100%;
+ background: #fff;
+ padding: 20rpx 0;
position: fixed;
- left: 0;
right: 0;
- bottom: 30rpx;
+ bottom: 0;
view {
background: linear-gradient(90deg, #294a97 0%, #7dc1f0 90%);
@@ -793,4 +869,62 @@ export default {
.commonPageBox {
background-color: #fff !important;
}
+
+.limitBlock{
+ display: flex;
+ align-items: center;
+ margin-bottom: 10rpx;
+
+ text{
+ font-size: 28rpx;
+ }
+
+ input{
+ display: inline-block;
+ margin-left: 20rpx;
+ width: 300rpx;
+ height: 70rpx;
+ border: 1rpx solid #ededed;
+ border-radius: 10rpx;
+ line-height: 40rpx;
+ padding: 20rpx;
+ font-size: 28rpx;
+ color: #666;
+ }
+}
+
+.limit-placeholder{
+ font-size: 25rpx;
+ color: #8b8c90 !important;
+}
+
+.active_block{
+ width: 100%;
+ background-color: rgba(125, 193, 240, 0.3);
+ border-radius: 10rpx;
+ padding: 10rpx 20rpx;
+ font-size: 28rpx;
+ line-height: 42rpx;
+ margin-top: 15rpx;
+ color: #333;
+}
+
+/deep/.active_block span{
+ color: red;
+ font-size: 32rpx;
+ font-weight: bold;
+ padding: 0 5rpx;
+}
+/deep/.active_block span:first-child{
+ padding: 0 5rpx 0 0;
+}
+/deep/.active_block p{
+ padding-top: 10rpx;
+ color: #666;
+ font-size: 24rpx;
+ line-height: 34rpx;
+}
+/deep/.active_block p span{
+ padding: 0 5rpx !important;
+}
\ No newline at end of file