Browse Source

fix(资金管理): 统一资金类型参数为moneyType并修复相关页面跳转

- 将type参数统一改为moneyType以保持一致性
- 修复提现和流水明细页面的资金类型传递问题
- 调整钱包页面跳转逻辑,正确传递资金类型参数
master
前端-胡立永 2 weeks ago
parent
commit
0401612bad
4 changed files with 41 additions and 12 deletions
  1. +4
    -4
      otherPages/binding/withdrawal/index.vue
  2. +8
    -3
      otherPages/myOrdersManage/transaction/index.vue
  3. +27
    -3
      otherPages/workbenchManage/myWallet/index.vue
  4. +2
    -2
      pages/userManage/index.vue

+ 4
- 4
otherPages/binding/withdrawal/index.vue View File

@ -64,11 +64,11 @@
const fullName = ref('') const fullName = ref('')
const inputDialogRef = ref(null) const inputDialogRef = ref(null)
const inputClose = ref(null) const inputClose = ref(null)
const type = ref(null)
const moneyType = ref(0)
onLoad((options) => { onLoad((options) => {
console.log('options', options); console.log('options', options);
type.value = options.type || 0;
moneyType.value = options.moneyType || 0;
}); });
@ -121,7 +121,7 @@
userId: store.state.user.userInfo.userId, userId: store.state.user.userInfo.userId,
amount: num.value, amount: num.value,
nameValue: val, nameValue: val,
moneyType: type.value,
moneyType: moneyType.value,
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
store.dispatch("getUserInfo") store.dispatch("getUserInfo")
@ -137,7 +137,7 @@
success() { success() {
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: '/otherPages/myOrdersManage/transaction/index?type=1'
url: `/otherPages/myOrdersManage/transaction/index?type=1&moneyType=${type.value}`
}) })
}, 1500) }, 1500)
} }


+ 8
- 3
otherPages/myOrdersManage/transaction/index.vue View File

@ -20,9 +20,9 @@
<view class="text2"> <view class="text2">
{{ item.title }} {{ item.title }}
<!-- 金额类型标签 --> <!-- 金额类型标签 -->
<text v-if="item.moneyType !== undefined" class="money-type-tag" :class="getMoneyTypeClass(item.moneyType)">
<!-- <text v-if="item.moneyType !== undefined" class="money-type-tag" :class="getMoneyTypeClass(item.moneyType)">
{{ getMoneyTypeText(item.moneyType) }} {{ getMoneyTypeText(item.moneyType) }}
</text>
</text> -->
</view> </view>
<view> <view>
{{ item.createTime }} {{ item.createTime }}
@ -70,10 +70,14 @@
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
onLoad((options) => { onLoad((options) => {
console.log(options);
// typetab // typetab
if (options.type) { if (options.type) {
type.value = parseInt(options.type) type.value = parseInt(options.type)
} }
if (options.moneyType) {
moneyType.value = parseInt(options.moneyType)
}
}) })
onShow(() => { onShow(() => {
@ -83,12 +87,13 @@
const store = useStore() const store = useStore()
const list = ref([]); const list = ref([]);
const type = ref(0); const type = ref(0);
const moneyType = ref(1);
// //
const getRunningWater = async () => { const getRunningWater = async () => {
let response = await amountLogList({ let response = await amountLogList({
type: type.value, type: type.value,
moneyType:1,
moneyType : moneyType.value,
userId: store.state.user.userInfo.userId userId: store.state.user.userInfo.userId
}); });
if (response.code == 200) { if (response.code == 200) {


+ 27
- 3
otherPages/workbenchManage/myWallet/index.vue View File

@ -107,7 +107,7 @@
binBaseInfo, binBaseInfo,
bindCode bindCode
} from "@/api/home.js" } from "@/api/home.js"
import { onShow } from '@dcloudio/uni-app'
import { onShow } from '@dcloudio/uni-app'
const mounthName = ref('本月数据') const mounthName = ref('本月数据')
const totalName = ref('累计数据') const totalName = ref('累计数据')
@ -115,13 +115,37 @@ import { onShow } from '@dcloudio/uni-app'
const handleGoto = (val) => { const handleGoto = (val) => {
switch (val) { switch (val) {
case 'detail': case 'detail':
tab.navigateTo('/otherPages/binding/partner/index')
uni.navigateTo({
url: "/otherPages/myOrdersManage/transaction/index?moneyType=0"
})
// tab.navigateTo('/otherPages/binding/partner/index?moneyType=0')
// tab.navigateTo('/otherPages/workbenchManage/bindUser/index') // tab.navigateTo('/otherPages/workbenchManage/bindUser/index')
break; break;
case 'cash': case 'cash':
tab.navigateTo('/otherPages/binding/withdrawal/index')
uni.navigateTo({
url: "/otherPages/binding/withdrawal/index?moneyType=0"
})
// tab.navigateTo('/otherPages/binding/withdrawal/index?moneyType=0')
break; break;
} }
/*
//
const handleRunningWater = () => {
if (!checkLoginAndRedirect()) return
uni.navigateTo({
url: "/otherPages/myOrdersManage/transaction/index?moneyType=1"
})
}
//
const handleWithdraw = () => {
if (!checkLoginAndRedirect()) return
uni.navigateTo({
url: "/otherPages/binding/withdrawal/index?moneyType=1"
})
}
*/
} }
const state = reactive({ const state = reactive({


+ 2
- 2
pages/userManage/index.vue View File

@ -303,7 +303,7 @@
const handleRunningWater = () => { const handleRunningWater = () => {
if (!checkLoginAndRedirect()) return if (!checkLoginAndRedirect()) return
uni.navigateTo({ uni.navigateTo({
url: "/otherPages/myOrdersManage/transaction/index"
url: "/otherPages/myOrdersManage/transaction/index?moneyType=1"
}) })
} }
@ -311,7 +311,7 @@
const handleWithdraw = () => { const handleWithdraw = () => {
if (!checkLoginAndRedirect()) return if (!checkLoginAndRedirect()) return
uni.navigateTo({ uni.navigateTo({
url: "/otherPages/binding/withdrawal/index?type=1"
url: "/otherPages/binding/withdrawal/index?moneyType=1"
}) })
} }


Loading…
Cancel
Save