ljc 2 месяцев назад
Родитель
Сommit
a339f39434
4 измененных файлов с 39 добавлено и 17 удалено
  1. 1 1
      pages/ib/customer.vue
  2. 11 6
      pages/ib/openAccount.vue
  3. 18 5
      pages/ib/openPammManager.vue
  4. 9 5
      pages/ib/settingPammManager.vue

+ 1 - 1
pages/ib/customer.vue

@@ -256,7 +256,7 @@
     getStatistics()
     // docVisible.value =true
     // pointVisible.value =true
-    applyVisible.value =true
+    // applyVisible.value =true
   })
 
   const closeDoc = () => {

+ 11 - 6
pages/ib/openAccount.vue

@@ -108,7 +108,15 @@
     </view>
 
     <!-- 提交结果弹窗 -->
-    <cwg-popup :visible="dialogCheck" :showClose="false" :showFooters="false">
+    <cwg-popup 
+      :visible="dialogCheck" 
+      :showClose="false" 
+      :showFooters="true"
+      :confirmText="t('Btn.Confirm')"
+      :cancelText="t('Btn.Cancel')"
+      @confirm="closeDia"
+      @close="closeDia"
+    >
       <view class="result-dialog">
         <view v-if="dialogVisible" class="icon-wrap">
           <cwg-icon name="icon_success" :size="50" color="#67C23A" />
@@ -119,10 +127,6 @@
           <cwg-icon name="icon_warning" :size="50" color="#E6A23C" />
           <view class="result-text">{{ RES }}</view>
         </view>
-        <view class="dialog-footer">
-          <button type="primary" @click="closeDia">{{ t('Btn.Confirm') }}</button>
-          <button @click="closeDia">{{ t('Btn.Cancel') }}</button>
-        </view>
       </view>
     </cwg-popup>
 
@@ -271,7 +275,8 @@ const newAccount = async () => {
 // 关闭弹窗
 const closeDia = () => {
   formRef.value?.clearValidate()
-  // 也可以选择重置表单: Object.assign(params, { currency: '', commission: '', leverage: '', accountType: '', platform: '' })
+  // 也可以选择重置表单:
+  Object.assign(params, { currency: '', commission: '', leverage: '', accountType: '', platform: '' })
   dialogCheck.value = false
   dialogVisible.value = false
 }

+ 18 - 5
pages/ib/openPammManager.vue

@@ -59,7 +59,15 @@
     </view>
 
     <!-- 提交结果弹窗 -->
-    <cwg-popup :visible="dialogCheck" :showClose="false" :showFooters="false">
+    <cwg-popup 
+      :visible="dialogCheck" 
+      :showClose="false" 
+      :showFooters="true"
+      :confirmText="t('Btn.Confirm')"
+      :cancelText="t('Btn.Cancel')"
+      @confirm="handleDialogAction"
+      @close="handleDialogAction"
+    >
       <view class="result-dialog">
         <view v-if="dialogVisible" class="icon-wrap">
           <cwg-icon name="icon_success" :size="50" color="#67C23A" />
@@ -72,10 +80,6 @@
           <view class="result-text" style="color: #e6a23c; margin: 10px 0;">{{ RES }}</view>
           <view class="result-sub-text">{{ t('ApplicationDialog.Des45') }}</view>
         </view>
-        <view class="dialog-footer">
-          <button type="primary" @click="dialogVisible ? backIndex() : closeDia()">{{ t('Btn.Confirm') }}</button>
-          <button @click="dialogVisible ? backIndex() : closeDia()">{{ t('Btn.Cancel') }}</button>
-        </view>
       </view>
     </cwg-popup>
 
@@ -216,6 +220,15 @@ const backIndex = () => {
   uni.navigateBack({ delta: 1 })
 }
 
+// 统一处理弹窗操作
+const handleDialogAction = () => {
+  if (dialogVisible.value) {
+    backIndex()
+  } else {
+    closeDia()
+  }
+}
+
 onLoad((options: any) => {
   if (options && options.type) {
     params.type = Number(options.type)

+ 9 - 5
pages/ib/settingPammManager.vue

@@ -82,7 +82,15 @@
     </view>
 
     <!-- 提交结果弹窗 -->
-    <cwg-popup :visible="dialogCheck" :showClose="false" :showFooters="false">
+    <cwg-popup 
+      :visible="dialogCheck" 
+      :showClose="false" 
+      :showFooters="true"
+      :confirmText="t('Btn.Confirm')"
+      :cancelText="t('Btn.Cancel')"
+      @confirm="closeDia"
+      @close="closeDia"
+    >
       <view class="result-dialog">
         <view v-if="dialogVisible" class="icon-wrap">
           <cwg-icon name="icon_success" :size="50" color="#67C23A" />
@@ -92,10 +100,6 @@
           <cwg-icon name="icon_warning" :size="50" color="#E6A23C" />
           <view class="result-text">{{ RES }}</view>
         </view>
-        <view class="dialog-footer">
-          <button type="primary" @click="closeDia">{{ t('Btn.Confirm') }}</button>
-          <button @click="closeDia">{{ t('Btn.Cancel') }}</button>
-        </view>
       </view>
     </cwg-popup>
   </cwg-page-wrapper>