提交 1761136e 作者: 毛细亚

Merge branch '7.2' into release

<template> <template>
<el-drawer title="新增关联账号" :visible="show" size="360px" :append-to-body="true" @close="close"> <el-drawer title="新增关联账号" :visible="show" size="360px" :append-to-body="true" @close="close">
<div class="content-wrapper">
<div class="content"> <div class="content">
<el-form ref="form" :model="form" label-position="top" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" label-position="top" :rules="rules" label-width="120px">
<div class="inputContent"> <div class="inputContent">
...@@ -99,9 +100,10 @@ ...@@ -99,9 +100,10 @@
<page class="pageInfo" :page-info="pageInfo" @requestNextPage="requestNextPage" /> <page class="pageInfo" :page-info="pageInfo" @requestNextPage="requestNextPage" />
<span class="dialog-footer rowFlex"> <span class="dialog-footer rowFlex">
<el-button class="btn" type="primary" size="small" :disabled="!userDetails.id" @click="confirmSubmit"> <el-button class="btn" type="primary" size="small" :disabled="!userDetails.id" @click="confirmSubmit">
</el-button> </el-button>
<el-button class="btn" size="small" @click="close">取 消</el-button> <el-button class="btn" size="small" @click="close">取 消</el-button>
</span> </span>
</div>
</el-drawer> </el-drawer>
</template> </template>
...@@ -168,7 +170,7 @@ ...@@ -168,7 +170,7 @@
username: this.form.username.trim(), username: this.form.username.trim(),
role_name: this.form.role_name.trim(), role_name: this.form.role_name.trim(),
main_game_id: this.form.main_game_id !== '' ? [this.form.main_game_id] : [], main_game_id: this.form.main_game_id !== '' ? [this.form.main_game_id] : [],
zyo_server_id: this.form.server_info !== '' ? [this.form.server_info] : [], zyou_server_id: this.form.server_info !== '' ? [this.form.server_info] : [],
cp_role_id: this.form.cp_role_id.trim() || '', cp_role_id: this.form.cp_role_id.trim() || '',
search_type: 'bind', search_type: 'bind',
...this.pageInfo ...this.pageInfo
...@@ -360,14 +362,16 @@ ...@@ -360,14 +362,16 @@
text-align: left; text-align: left;
margin-bottom: 10px; margin-bottom: 10px;
} }
.content-wrapper {
.content {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
padding-bottom: 200px; padding-bottom: 200px;
padding: 0 10px; }
.content {
width: 100%;
padding: 0 10px;
.inputContent { .inputContent {
width: 100%; width: 100%;
} }
......
const { defineConfig } = require('@vue/cli-service') const { defineConfig } = require('@vue/cli-service')
const path = require('path') const path = require('path')
const fs = require('fs')
// 构建前删除 company_app 文件夹
function removeOutputDir() {
const outputDir = path.join(__dirname, 'company_app')
if (fs.existsSync(outputDir)) {
fs.rmSync(outputDir, { recursive: true, force: true })
console.log('✅ 已删除 company_app 文件夹')
}
}
// 只在构建模式下删除
if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'staging') {
removeOutputDir()
}
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论