.

.gitignore

@@ -12,7 +12,7 @@ target/
 .settings
 .springBeans
 .sts4-cache
-
+.DS_Store
 ### IntelliJ IDEA ###
 .idea
 *.iws

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = zparty管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://localhost:9801'
-VUE_APP_BASE_API = 'http://localhost:9801'
-# VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://localhost:9801'
+# VUE_APP_BASE_API = 'http://localhost:9801'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
 # VUE_APP_BASE_API = 'http://192.168.98.9:9801/'
 

admin-ui/src/components/payStatusPopup/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="payStatusPopup">
-        <el-dialog :visible.sync="show" width="30%" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+        <el-dialog :visible.sync="show" width="30%" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" append-to-body custom-class="popup_box">
             <!-- 支付成功打印小票 -->
             <div v-if="type === 1">
                 <div class="icon">
@@ -390,7 +390,7 @@ export default {
 }
 </script>
 <style>
-.payStatusPopup .el-dialog__body {
+.popup_box .el-dialog__body {
     padding: 0;
 }
 </style>

admin-ui/src/router/index.js

@@ -167,20 +167,20 @@ export const dynamicRoutes = [
       }
     ]
   },
-  {
-    path: '/tool/gen-form',
-    component: Layout,
-    hidden: true,
-    permissions: ['tool:gen:edit'],
-    children: [
-      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/build/index'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  },
+  // {
+  //   path: '/tool/gen-form',
+  //   component: Layout,
+  //   hidden: true,
+  //   permissions: ['tool:gen:edit'],
+  //   children: [
+  //     {
+  //       path: 'index/:tableId(\\d+)',
+  //       component: () => import('@/views/tool/build/index'),
+  //       name: 'GenEdit',
+  //       meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+  //     }
+  //   ]
+  // },
   {
     path: '/cloth',
     component: Layout,

admin-ui/src/views/workbench/workRecharge/index.vue

@@ -152,7 +152,7 @@
                 </el-card>
             </el-col>
         </el-row>
-        <el-dialog title="确认充值" :visible.sync="openWelfareRecharge" width="400px">
+        <el-dialog title="确认充值" :visible.sync="openWelfareRecharge" width="400px" append-to-body>
             <el-form ref="payFrom" :model="rechargeInfo" label-width="100px" style="margin-top: 20px" @submit.native.prevent>
                 <el-form-item label="充值金额：">
                     <span style="font-size: 16px; font-weight: bold">￥{{ rechargeInfo.welfareAmount }}</span>
@@ -164,7 +164,7 @@
             <el-button type="primary" @click="submitSettlement" style="margin: 20px 80px 0; width: 200px; height: 40px">确认</el-button>
         </el-dialog>
         <!-- 支付方式 -->
-        <el-dialog :title="rechargeTitle" :visible.sync="openRecharge" width="800px" :close-on-click-modal="false" class="cashier-dialog" :before-close="checkClosePay">
+        <el-dialog :title="rechargeTitle" :visible.sync="openRecharge" width="800px" :close-on-click-modal="false" class="cashier-dialog" :before-close="checkClosePay" append-to-body>
             <!-- 订单信息 -->
             <div class="order-info">
                 <div class="amount-section">