Sfoglia il codice sorgente

Merge branch 'feature/dd-1733-style' into feature/0726-push-online

root 3 anni fa
parent
commit
0552ea4435

+ 8 - 0
backendApi/modules/v1/controllers/FinanceController.php

@@ -452,6 +452,14 @@ class FinanceController extends BaseController {
             'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
         ]);
+        if (isset($filter['request']['filterStatus'])) {
+            $status = explode(',',$filter['request']['filterStatus']);
+            $status = end($status);
+            if (is_numeric($status)) {
+                 $filter['condition'] .= " AND W.AUDIT_STATUS = $status";
+            }
+        }
+           
         $form = new FinanceExportForm();
         $result = $form->run($filter, '提现申请');
         if (!$result) {

+ 7 - 1
frontendEle/src/views/shop/order.vue

@@ -167,6 +167,8 @@
                 this.submitButtonStat = true
                 // let path = 'sure-order'
                 this.$prompt('请输入支付密码', '提示', {
+                    center:true,
+                    customClass:'myclass',
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     inputType: 'password',
@@ -263,7 +265,6 @@
         }
     }
 </script>
-
 <style scoped>
 .address{
     /* height: 3rem; */
@@ -294,3 +295,8 @@
     margin-right: 1rem;
 }
 </style>
+<style>
+.myclass {
+    width:260px;
+}
+</style>