zhb 2 달 전
부모
커밋
c8a141799f
2개의 변경된 파일42개의 추가작업 그리고 31개의 파일을 삭제
  1. 26 20
      pages/customer/transfer.vue
  2. 16 11
      pages/ib/agent-transfer.vue

+ 26 - 20
pages/customer/transfer.vue

@@ -139,7 +139,7 @@ const Session = proxy?.Session
 const $pigeon = proxy?.$pigeon
 
 // 响应式数据
-const loginValue = ref('')
+const loginValue = ref(null)
 const flag = ref(false)
 const responseMessage = ref('') // 弹窗响应信息
 const loginOptions = ref([])
@@ -277,7 +277,7 @@ function groupTypeName(type) {
 const closeDia = () => {
     formRef.value?.clearValidate()
     step2.value = false
-    loginValue.value = ''
+    loginValue.value = null
     form.depositLogin = null
     form.withdrawLogin = null
     form.amount = ''
@@ -350,7 +350,7 @@ const toTransfer = async () => {
 
 const cancle = () => {
     step2.value = false
-    loginValue.value = ''
+    loginValue.value = null
     transferType.value = 'internal'
 }
 // 转出账户列表 
@@ -400,6 +400,9 @@ const getDateList = async () => {
     let res = await customApi.CustomDropdown({ platform: '' })
     if (res.code == Code.StatusOK) {
         loginOptions.value = res.data
+        nextTick(() => {
+            handleRouteParams()
+        })
     } else {
         $pigeon?.MessageError(res.msg)
     }
@@ -438,31 +441,32 @@ const getTransferSystemDropdown = async () => {
 // 生命周期
 onLoad((options) => {
     pageQuery.value = options
-    if (options.login) {
-        handleRouteParams(options)
-    }
 })
 // 更新转出账户选项
 function updateToOptions() {
     toOptions.value = []
-    form.depositLogin = null
     if (transferType.value === 'internal') {
         loginOptions.value.forEach(item => {
-            if (item.login != form.withdrawLogin) {
+            if (form.withdrawLogin != null || item.login != form.withdrawLogin) {
                 toOptions.value.push(item)
             }
         })
     } else if (transferType.value === 'agent') {
         getAgentList()
     } else if (transferType.value === 'system') {
-        toOptions.value = accountList.value.filter(item => item.login != form.withdrawLogin)
+        toOptions.value = accountList.value.filter(item => form.withdrawLogin != null || item.login != form.withdrawLogin)
     }
 }
 // 处理路由参数
-function handleRouteParams(options) {
-    form.withdrawLogin = Number(options.login)
-    step2.value = true
-    loginValue.value = options.login
+function handleRouteParams() {
+    nextTick(() => {
+        const loginNum = Number(pageQuery.value.login)
+        form.withdrawLogin = loginNum
+        step2.value = true
+        loginValue.value = loginNum
+        console.log(loginValue.value, form.withdrawLogin, withdrawDisplayList.value);
+    })
+
     updateToOptions()
 }
 onMounted(() => {
@@ -472,22 +476,24 @@ onMounted(() => {
 })
 const resetForm = async () => {
     await nextTick();
-    formRef.value?.clearValidate();   // 再次清除可能因数据重置产生的新错误
+    formRef.value?.clearValidate();
     form.customBankCode = ""
-    form.depositLogin = ""
-    form.withdrawLogin = ""
+    form.depositLogin = null
+    form.withdrawLogin = null
     form.amount = ""
     amountErrorMessage.value = ""
     submitting.value = false;
     flag.value = false;
-
+    loginValue.value = null
 }
 // 侦听器
 watch(loginValue, (newVal) => {
-    if (newVal) {
+    if (newVal != null) {
         step2.value = true
-        resetForm()
-        form.withdrawLogin = Number(loginValue.value)
+        form.withdrawLogin = Number(newVal)
+        form.depositLogin = null
+        form.amount = ''
+        amountErrorMessage.value = ''
         toOptions.value = []
         if (transferType.value === 'internal') {
             // 内部转账逻辑

+ 16 - 11
pages/ib/agent-transfer.vue

@@ -200,7 +200,7 @@ const { proxy } = getCurrentInstance()
 const $pigeon = proxy?.$pigeon
 
 // 响应式数据
-const loginValue = ref('')
+const loginValue = ref(null)
 const flag = ref(false)
 const responseMessage = ref('') // 弹窗响应信息
 const giveLoginJoin = ref('')
@@ -225,9 +225,9 @@ const resetForm = async () => {
     await nextTick();
     formRef.value?.clearValidate();   // 再次清除可能因数据重置产生的新错误
     form.customBankCode = ""
-    form.depositLogin = ""
-    form.depositLogin1 = ""
-    form.withdrawLogin = ""
+    form.depositLogin = null
+    form.depositLogin1 = null
+    form.withdrawLogin = null
     form.amount = ""
     form.agree5 = false
     form.agree6 = false
@@ -408,7 +408,7 @@ function closeDia() {
     resetForm()
     formRef.value?.resetFields?.()
     step2.value = false
-    loginValue.value = ''
+    loginValue.value = null
     dialogCheck.value = false
     dialogVisible.value = false
     tableData4TwoFlag.value = false
@@ -475,7 +475,7 @@ async function transferConfig() {
 // 取消
 function cancle() {
     step2.value = false
-    loginValue.value = ''
+    loginValue.value = null
 }
 // 获取账户信息
 async function getDateList() {
@@ -568,10 +568,15 @@ async function getActivityExtensionGiveLoginJoin() {
 
 // 监听 loginValue 变化
 watch(loginValue, (newVal) => {
-    if (newVal) {
+    if (newVal != null) {
         step2.value = true
-        form.withdrawLogin = newVal
-        resetForm()
+        form.withdrawLogin = Number(newVal)
+        form.depositLogin = null
+        form.depositLogin1 = null
+        form.amount = ''
+        form.agree5 = false
+        form.agree6 = false
+        amountErrorMessage.value = ''
     }
 })
 // 监听 loginValue 变化
@@ -655,9 +660,9 @@ onMounted(() => {
 
 onLoad((options) => {
     if (options?.login) {
-        loginValue.value = options.login
+        loginValue.value = Number(options.login)
         step2.value = true
-        form.withdrawLogin = options.login
+        form.withdrawLogin = Number(options.login)
     }
 })
 </script>