Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

This commit is contained in:
zzyuan 2025-06-16 15:58:12 +08:00
commit 4ac1ac9647
3 changed files with 4 additions and 4 deletions

View File

@ -82,7 +82,7 @@ export default {
[{ color: [] }, { background: [] }], //
[{ align: [] }], //
["clean"], //
["link", "image", "video"] //
// ["link", "image", "video"] //
],
},
placeholder: "请输入内容",

View File

@ -121,8 +121,8 @@
<tr >
<td class="table-label"><i class="text-red">*</i> <span >所属组织</span></td>
<td class="table-content"><span >{{form.orgFullName}}</span></td>
<td class="table-label"><span >用户类别</span></td>
<td class="table-content"><span >{{form.userType}}</span></td>
<td class="table-label"><span >用户类别2</span></td>
<td class="table-content"><span >{{form.userType==1?'其它':'系统'}}</span></td>
</tr>
<tr >
<td class="table-label"><span >用户手机号</span></td>

View File

@ -161,7 +161,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="内容" prop="articleContent">
<editor v-model="form.articleContent" :min-height="192"/>
<editor v-model="form.articleContent" :min-height="192" />
</el-form-item>
</el-col>
</el-row>