Merge remote-tracking branch 'origin/dev' into build
This commit is contained in:
		| @@ -4,20 +4,16 @@ | ||||
|       <template slot="title"> | ||||
|         <ai-title title="企微应用配置" :isShowBottomBorder="false" :isShowArea="false"></ai-title> | ||||
|       </template> | ||||
|  | ||||
|       <template slot="content"> | ||||
|         <ai-search-bar> | ||||
|           <template slot="left"> | ||||
|             <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add({}, '添加')">添加</el-button> | ||||
|           </template> | ||||
|          | ||||
|           <template slot="right"> | ||||
|             <el-input v-model="search.title" size="small" placeholder="搜索标题" clearable | ||||
|                       v-throttle="() => {page.current = 1, getList()}" | ||||
|             <el-input v-model="search.title" size="small" placeholder="搜索标题" clearabl v-throttle="() => {page.current = 1, getList()}" | ||||
|               @clear=";(page.current = 1), (search.title = ''), getList()" suffix-icon="iconfont iconSearch"/> | ||||
|           </template> | ||||
|         </ai-search-bar> | ||||
|  | ||||
|         <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current" | ||||
|           :size.sync="page.size" @getList="getList" class="ai-table"> | ||||
|           <el-table-column label="banner封面" align="left" width="150" slot="banner"> | ||||
| @@ -34,7 +30,6 @@ | ||||
|         </ai-table> | ||||
|       </template> | ||||
|     </ai-list> | ||||
|  | ||||
|     <ai-dialog :title="dialog.title" :visible.sync="visible" @onCancel="visible = false" @onConfirm="addConfirm" width="800px"> | ||||
|       <el-form ref="ruleForm" :model="dialogInfo" :rules="formRules" size="small" label-width="120px"> | ||||
|         <el-form-item label="banner封面" prop="banner"> | ||||
| @@ -64,7 +59,6 @@ | ||||
|         </el-table-column> | ||||
|       </ai-table> | ||||
|     </ai-dialog> | ||||
|  | ||||
|     <ai-dialog title="应用" :visible.sync="miniAppDialog" width="800px" @onCancel="miniAppDialog = false" @onConfirm="addMiniAppConfirm" > | ||||
|       <el-form ref="miniApppRuleForm" :model="miniAppInfo" :rules="miniAppFormRules" size="small" label-width="120px"> | ||||
|         <el-form-item label="icon图片" prop="icon"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user