diff --git a/App.vue b/App.vue
index 2bc4f75..94b1bf7 100644
--- a/App.vue
+++ b/App.vue
@@ -4,8 +4,8 @@
import { useAuthUser } from './composables/useAuthUser'
import { useUserStore } from './stores/user'
- import { TUIChatKit } from './TUIKit';
-TUIChatKit.init();
+ // import { TUIChatKit } from './TUIKit'
+ // TUIChatKit.init()
const { token } = useAuthUser()
const { loginTencentIM } = useUserStore()
diff --git a/api/my-index.js b/api/my-index.js
index 4bbfce9..0bd95be 100644
--- a/api/my-index.js
+++ b/api/my-index.js
@@ -53,9 +53,9 @@ export const getUserPayPwd = () => {
/**
* 添加/修改支付密码
- * @param {*} data
- * @param {*} method post 添加 put 修改
- * @returns
+ * @param {*} data
+ * @param {*} method post 添加 put 修改
+ * @returns
*/
export const updateUserPayPwd = (data, method = 'post') => {
return http({
@@ -125,6 +125,14 @@ export const getUserThirdPay = id => {
})
}
+/** 获取第三方支付列表 */
+export const getUserThirdPayList = () => {
+ return http({
+ url: '/api/service/userPayment/list',
+ method: 'get'
+ })
+}
+
/** 获取身份证信息 */
export const getUserIdCard = () => {
return http({
@@ -141,3 +149,28 @@ export const addUserIdCard = data => {
data
})
}
+
+/** 获取提现配置详细信息 */
+export const getUserWithdrawConfig = id => {
+ return http({
+ url: `/api/service/appWithdrawalConfig/${id}`,
+ method: 'get'
+ })
+}
+
+/** 获取用户积分详细信息 */
+export const getUserIntegral = () => {
+ return http({
+ url: `/api/system/userPoints/details`,
+ method: 'get'
+ })
+}
+
+/** 添加提现 */
+export const addUserWithdraw = data => {
+ return http({
+ url: '/api/service/SerAppUserWithdrawal',
+ method: 'post',
+ data
+ })
+}
diff --git a/components/bottom-view/bottom-view.vue b/components/bottom-view/bottom-view.vue
index 2fd2e23..f0031ab 100644
--- a/components/bottom-view/bottom-view.vue
+++ b/components/bottom-view/bottom-view.vue
@@ -17,6 +17,6 @@
padding: 16rpx 24rpx calc(env(safe-area-inset-bottom) + 20rpx); /* 关键:适配 iPhone 等安全区域 */
background: #fff;
box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
- z-index: 100;
+ z-index: 99;
}
diff --git a/pages.json b/pages.json
index ad8915f..76d653d 100644
--- a/pages.json
+++ b/pages.json
@@ -121,6 +121,20 @@
"backgroundColor": "#f7f7f7"
}
},
+ {
+ "path": "pages/my-index/withdraw",
+ "style": {
+ "navigationBarTitleText": "提现",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/my-index/recharge",
+ "style": {
+ "navigationBarTitleText": "充值",
+ "backgroundColor": "#f7f7f7"
+ }
+ },
{
"path": "pages/my-index/personal-center/index",
"style": {
@@ -335,4 +349,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/pages/discover/punch.vue b/pages/discover/punch.vue
index 8f6b802..d0fed43 100644
--- a/pages/discover/punch.vue
+++ b/pages/discover/punch.vue
@@ -157,6 +157,10 @@
}
onLoad(() => {
+ const now = new Date()
+ currentYear.value = now.getFullYear()
+ currentMonth.value = now.getMonth() + 1
+
getData()
})
diff --git a/pages/my-index/my-index.vue b/pages/my-index/my-index.vue
index b6db31a..bec1fe5 100644
--- a/pages/my-index/my-index.vue
+++ b/pages/my-index/my-index.vue
@@ -2,6 +2,7 @@
import { useAuthUser } from '@/composables/useAuthUser'
import { onLoad } from '@dcloudio/uni-app'
import { navigateTo } from '@/utils/router'
+ import { useUI } from '@/utils/use-ui'
const bottomList = [
{
@@ -36,6 +37,8 @@
url: '/pages/my-index/set-up/index'
}
]
+
+ const { showDialog } = useUI()
const { userInfo } = useAuthUser()
onLoad(() => {
@@ -77,8 +80,16 @@
{{ userInfo?.totalPoints }}
-
-
+
+
diff --git a/pages/my-index/recharge.vue b/pages/my-index/recharge.vue
new file mode 100644
index 0000000..3c9ebf8
--- /dev/null
+++ b/pages/my-index/recharge.vue
@@ -0,0 +1,9 @@
+
+
+
+ 充值页面
+
+
+
diff --git a/pages/my-index/wallet/index.vue b/pages/my-index/wallet/index.vue
index 11a8ae1..be35118 100644
--- a/pages/my-index/wallet/index.vue
+++ b/pages/my-index/wallet/index.vue
@@ -4,8 +4,10 @@
import { onShow } from '@dcloudio/uni-app'
import { getUserPayPwd } from '@/api/my-index'
import { useAuthUser } from '@/composables/useAuthUser'
+ import { useUI } from '@/utils/use-ui'
const { userInfo } = useAuthUser()
+ const { showDialog } = useUI()
const itemList = ref([])
@@ -49,8 +51,14 @@
{{ userInfo?.totalPoints }}
-
-
+
+
diff --git a/pages/my-index/withdraw.vue b/pages/my-index/withdraw.vue
new file mode 100644
index 0000000..6df8ccf
--- /dev/null
+++ b/pages/my-index/withdraw.vue
@@ -0,0 +1,397 @@
+
+
+
+
+
+
+
+
+
+ 到账方式
+
+
+ {{ topData.withdrawalType === 2 ? '微信' : '支付宝' }}
+
+ {{ topData.name }}
+
+
+
+ 去添加
+
+
+
+
+
+
+ 提现积分
+
+
+
+
+
+
+
+
+ 全部提现
+
+ 可用积分{{ withdrawData.availablePoints }}
+
+
+
+
+ 最低提取积分
+ {{ withdrawData.minAmount }}
+
+
+ 到账积分
+ {{ formData.nuber }}
+
+
+ 服务积分
+ {{ serviceFee }}
+
+
+
+
+
+
+
+
+ 提现
+
+
+
+
+
+
+ {
+ topData = item
+ formData.paymentAccountId = item.id
+ popup.close()
+ getData()
+ }
+ "
+ >
+
+ {{ item.withdrawalType === 2 ? '微信' : '支付宝' }}
+
+ {{ item.name }}
+
+
+ {
+ popup.close()
+ navigateTo('/pages/my-index/wallet/bank-card/index')
+ }
+ "
+ >
+ 添加提现方式
+
+
+
+
+
+
+
+
diff --git a/utils/use-ui.js b/utils/use-ui.js
index baa543c..b083086 100644
--- a/utils/use-ui.js
+++ b/utils/use-ui.js
@@ -49,11 +49,12 @@ const showToast = (message, type = 'none', duration = 1800) => {
}
/** 对话框带确认取消按钮 */
-const showDialog = (title, content) => {
+const showDialog = (title, content, showCancel = true) => {
return new Promise(resolve => {
uni.showModal({
title,
content,
+ showCancel,
confirmText: '确定',
cancelText: '取消',
success: res => resolve(res.confirm)