liujq 4 vuotta sitten
vanhempi
commit
b7c4ff33ac

+ 11 - 1
src/layout/components/Navbar.vue

@@ -6,6 +6,7 @@
 
     <div class="right-menu">
       <div class="xl-form" style="padding-right: 20px;">
+        <span class="scoped-user">{{sysUser.nickname}}</span>
         <el-button icon="el-icon-user" class="xl-form-btn t4 xs" @click="logout">退出</el-button>
       </div>
       <!-- <el-dropdown class="avatar-container" trigger="click">
@@ -47,7 +48,8 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'sysUser',
     ])
   },
   methods: {
@@ -144,4 +146,12 @@ export default {
     }
   }
 }
+
+.scoped-user {
+  display: inline-block;
+  vertical-align: middle;
+  color: #666;
+  padding-right: 10px;
+  font-weight: bold;
+}
 </style>

+ 2 - 2
src/views/house/components/popup/IndexEdit.vue

@@ -11,7 +11,7 @@
       custom-class="xl-drawer"
       direction="rtl"
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[17,21]">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[17,18]">
         <div slot="OI17" class="scoped-product">
           <div class="sp-item" v-for="(product, one) in productData" :key="one">
             <div class="sp-title">{{product.product_type_name}}</div>
@@ -63,7 +63,7 @@
             </div>
           </div>
         </div>
-        <div slot="OI21" class="scoped-other-form">
+        <div slot="OI18" class="scoped-other-form">
           <el-form-item label="点位坐标" class="scoped-item-two item">
             纬度N<el-input v-model="cObj.latitude" disabled />
             经度E<el-input v-model="cObj.longitude" disabled />