From 0c97fe702041d73abc0ff5dc0394e99a9a3c43f0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 26 Jan 2024 18:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 2 +-
pages.json | 12 +-
pages/newActivity/giftBag/giftBag.vue | 819 ++++++++++++++++++++++++++
pages/redpacket/redpack_type.vue | 30 +-
pages/user/index.vue | 2 +-
pages/users/user_bill/index.vue | 2 +-
pages/users/user_money/index.vue | 12 +-
7 files changed, 866 insertions(+), 13 deletions(-)
create mode 100644 pages/newActivity/giftBag/giftBag.vue
diff --git a/config/app.js b/config/app.js
index 0e16dde..cee47b2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -55,7 +55,6 @@ module.exports = {
HTTP_REQUEST_URL_THREE: httpApiThree,
HTTP_REQUEST_URL_FOUR: httpApiFour,
HTTP_REQUEST_URL_FIVE: httpApiFive,
- OSS_URL: ossUrl,
VUE_APP_WS_URL: `${wsApi}?type=user`,
VUE_APP_WS_URL_ONE:wsApi_one,
// #endif
@@ -72,6 +71,7 @@ module.exports = {
// #endif
openPlantGrass: openPlantGrass,
ENV: env,
+ OSS_URL: ossUrl,
HEADER: {
'content-type': 'application/json',
diff --git a/pages.json b/pages.json
index 7f77c71..a8ba8c6 100644
--- a/pages.json
+++ b/pages.json
@@ -240,7 +240,9 @@
"style" :
{
"navigationBarTitleText" : "红包余额",
- "enablePullDownRefresh" : false
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 300
}
},
{
@@ -280,6 +282,14 @@
"navigationBarTitleText" : "购物车",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/newActivity/giftBag/giftBag",
+ "style" :
+ {
+ "navigationBarTitleText" : "新人礼包",
+ "enablePullDownRefresh" : false
+ }
}
],
"subPackages": [{
diff --git a/pages/newActivity/giftBag/giftBag.vue b/pages/newActivity/giftBag/giftBag.vue
new file mode 100644
index 0000000..943d5d6
--- /dev/null
+++ b/pages/newActivity/giftBag/giftBag.vue
@@ -0,0 +1,819 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ¥ {{item.count}}
+
+
+
+
+
+
+
+ 当前选择面额 ¥{{nowPrice}}
+
+ -
+ {{priceCount}}
+ +
+
+
+
+ 注意事项:
+ 充值后金额不能提现,仅可用于商城商品消费
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/redpacket/redpack_type.vue b/pages/redpacket/redpack_type.vue
index 334d779..cbb8955 100644
--- a/pages/redpacket/redpack_type.vue
+++ b/pages/redpacket/redpack_type.vue
@@ -1,6 +1,8 @@
-
-
+
+
+
+
@@ -70,6 +72,27 @@
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a1b9216..2d1ec79 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -85,7 +85,7 @@
-->
-
+
¥{{userInfo.now_money||"0.00"}}
diff --git a/pages/users/user_bill/index.vue b/pages/users/user_bill/index.vue
index d3c4027..db3a420 100644
--- a/pages/users/user_bill/index.vue
+++ b/pages/users/user_bill/index.vue
@@ -4,7 +4,7 @@
全部
消费
- 充值
+
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 5596e55..354fa1c 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -10,18 +10,18 @@
{{userInfo.now_money || 0}}
- 充值
+
- 充值
+
-
+
@@ -44,12 +44,12 @@
消费记录
-
+