💄 update upload avatar & setting

nicejade · Feb 16, 2021 · f6b5eec · f6b5eec
1 parent 05fdcb2
commit f6b5eec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss
@@ -42,7 +42,7 @@ $zindex-subhead: 100;
 $zindex-mobile-search: 1000;
 $zindex-header-mobile: 2000;
 $zindex-side-nav: 2000;
-$zindex-upload-avatar: 10000;
+$zindex-upload-avatar: 100000;
 $zindex-quickapp-btn: 99999;
 
 //--------------------- width height ----------------------

diff --git a/src/components/UploadAvatar.vue b/src/components/UploadAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="vue-image-crop-upload" v-show="value">
+  <div class="vue-image-crop-upload" v-if="value">
     <div class="vicp-wrap">
       <div class="vicp-close" @click="off">
         <i class="vicp-icon4"></i>

diff --git a/src/components/dialog/EditDialog.vue b/src/components/dialog/EditDialog.vue
@@ -133,7 +133,7 @@
           </div>
 
           <div class="form-group">
-            <label class="col-sm-3 control-label"> {{ this.$t('isAlive') }} ：</label>
+            <label class="control-label"> {{ this.$t('isAlive') }} ：</label>
             <el-switch
               :on-text="$t('yes')"
               :off-text="$t('no')"

diff --git a/src/views/Setting.vue b/src/views/Setting.vue
@@ -64,14 +64,12 @@
               <hr />
 
               <div class="form-group">
-                <div class="col-sm-12">
-                  <div class="update-avatar-area">
-                    <img class="preview-avatar" :src="imgDataUrl" :alt="$t('niceLinksStr')" />
-                    <br />
-                    <el-button :loading="isLoading" type="text" @click="onUpdateAvatarClick">
-                      {{ $t('updateAvatar') }}
-                    </el-button>
-                  </div>
+                <div class="update-avatar-area">
+                  <img class="preview-avatar" :src="imgDataUrl" :alt="$t('niceLinksStr')" />
+                  <br />
+                  <el-button :loading="isLoading" type="text" @click="onUpdateAvatarClick">
+                    {{ $t('updateAvatar') }}
+                  </el-button>
                 </div>
               </div>
             </el-card>
@@ -256,6 +254,7 @@ export default {
       this.imgDataUrl = `/api/avatar/${imgPath}`
       // ReUpdate UserInfo
       this.$getUserInfo()
+      this.isShowUploadAvatar = false
     },
   },
 
@@ -272,10 +271,13 @@ export default {
 
 <style lang="scss">
 .update-avatar-area {
-  width: 221px;
+  width: 100%;
   text-align: center;
   margin: auto;
+  margin-top: 25px;
   .preview-avatar {
+    width: 100px;
+    height: 100px;
     border: 1px solid #d1dbe5;
     border-radius: 50%;
   }