Merge branch 'dev'

# Conflicts:
#	src/main/vue/src/views/company/CompanyRoomEdit.vue

src/main/vue/src/views/ShowroomEdit.vue

@@ -30,7 +30,7 @@
                         <div class="tip">数字越大排序越靠前，相同数值按创建时间倒序排列</div>
                     </el-form-item> -->
                     <el-form-item prop="maxCollection" label="最多藏品数量">
-                        <el-input-number type="number" v-model="formData.maxCollection"></el-input-number>
+                        <el-input-number type="number" v-model="formData.maxCollection" style="width: 200px"></el-input-number>
                     </el-form-item>
                     <el-form-item prop="userId" label="用户ID">
                         <el-input-number
@@ -40,16 +40,19 @@
                             disabled
                         ></el-input-number>
                     </el-form-item>
-                    <el-form-item prop="nickname" label="昵称">
+                    <el-form-item prop="nickname" label="展厅名称">
                         <el-input v-model="formData.nickname" style="width: 280px" disabled></el-input>
                     </el-form-item>
-                    <el-form-item prop="pic" label="logo">
+                    <el-form-item prop="avatar" label="展厅头像">
+                        <single-upload v-model="formData.avatar" :disabled="true"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="展厅内logo">
                         <single-upload v-model="formData.pic" :disabled="true"></single-upload>
                     </el-form-item>
-                    <el-form-item prop="introduction" label="简介">
+                    <el-form-item prop="introduction" label="展厅简介">
                         <el-input type="textarea" :rows="4" v-model="formData.introduction" disabled></el-input>
                     </el-form-item>
-                    <el-form-item prop="headBg" label="背景">
+                    <el-form-item prop="headBg" label="背景模版">
                         <el-image :src="formData.headBg" style="height: 170px"></el-image>
                         <el-image :src="formData.showroomBg" style="height: 170px"></el-image>
                     </el-form-item>
@@ -68,7 +71,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item> -->
-                    <el-form-item prop="collections" label="藏品">
+                    <el-form-item prop="collections" label="展示藏品">
                         <el-table :data="formData.collections">
                             <el-table-column type="index" label="#"></el-table-column>
                             <el-table-column prop="collectionId" label="ID" width="110">

src/main/vue/src/views/company/CompanyRoomEdit.vue

@@ -25,33 +25,36 @@
                             disabled
                         ></el-input>
                     </el-form-item>
-                    <el-form-item prop="userId" label="用户ID">
+                    <el-form-item prop="maxCollection" label="最多可放藏品数量">
                         <el-input-number
                             type="number"
-                            v-model="formData.userId"
+                            v-model="formData.maxCollection"
                             style="width: 200px"
                             disabled
                         ></el-input-number>
                     </el-form-item>
-                    <el-form-item prop="nickname" label="昵称">
-                        <el-input v-model="formData.nickname" style="width: 280px"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="maxCollection" label="最多可放藏品数量">
+                    <el-form-item prop="userId" label="用户ID">
                         <el-input-number
                             type="number"
-                            v-model="formData.maxCollection"
-                            style="width: 280px"
+                            v-model="formData.userId"
+                            style="width: 200px"
                             disabled
                         ></el-input-number>
                     </el-form-item>
-                    <el-form-item prop="pic" label="logo">
+                    <el-form-item prop="nickname" label="展厅名称">
+                        <el-input v-model="formData.nickname" style="width: 280px"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="avatar" label="展厅头像">
+                        <crop-upload v-model="formData.avatar"></crop-upload>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="展厅内logo">
                         <single-upload v-model="formData.pic"></single-upload>
                     </el-form-item>
-                    <el-form-item prop="introduction" label="简介">
+                    <el-form-item prop="introduction" label="展厅简介">
                         <el-input type="textarea" :rows="4" v-model="formData.introduction"></el-input>
                     </el-form-item>
 
-                    <el-form-item prop="settingId" label="模版">
+                    <el-form-item prop="settingId" label="背景模版">
                         <el-select v-model="formData.settingId" style="width: 280px" @change="changeBg">
                             <el-option
                                 v-for="item in settings"
@@ -66,7 +69,7 @@
                         <el-image :src="formData.headBg" style="height: 170px"></el-image>
                         <el-image :src="formData.showroomBg" style="height: 170px"></el-image>
                     </el-form-item>
-                    <el-form-item prop="collections" label="藏品">
+                    <el-form-item prop="collections" label="展示藏品">
                         <el-table :data="formData.collections">
                             <el-table-column type="index" label="#"></el-table-column>
                             <el-table-column prop="collectionId" label="ID" width="110"></el-table-column>