li.shaoyi 2 年 前
コミット
475fefe6c1

+ 21 - 15
package-lock.json

@@ -25,7 +25,7 @@
         "qrcode": "^1.5.1",
         "sortablejs": "^1.15.0",
         "uuid": "^8.3.2",
-        "vant": "^4.0.3",
+        "vant": "^4.6.3",
         "vue": "^3.2.13",
         "vue-class-component": "^8.0.0-0",
         "vue-i18n": "^9.2.2",
@@ -2623,9 +2623,12 @@
       "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
     },
     "node_modules/@vant/use": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.4.3.tgz",
-      "integrity": "sha512-rSnETN7P9qT1WbItMpQxBqe3cHeK2ZFYp1sCxWUXaTeI71TqA8sOdzC36ledZ36NQgFNTch9fsRPYOkrCgZfQA=="
+      "version": "1.5.2",
+      "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.5.2.tgz",
+      "integrity": "sha512-CBK61iT568dCHUwFFsErGbW6/5tmrPnZJKGtcSy7Tjcrmws8Ku+YZo7IUFD9Xkj9MfSJ4pfhQ7pU2KouP5Cojg==",
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
     },
     "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.2.1",
@@ -11835,12 +11838,13 @@
       }
     },
     "node_modules/vant": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/vant/-/vant-4.0.3.tgz",
-      "integrity": "sha512-rBQCSdMyYxO9I3weQmdTxY28OkVLM7MSIjMx3qwMTsFONek6bodVGEYXF0+mzh/5EBMVXjqtHj6CvD6QphKkCg==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmmirror.com/vant/-/vant-4.6.3.tgz",
+      "integrity": "sha512-hkiBzM1dhEj9EWSjRnyB7gd6SiVa3/+qthNZtlJdj42C+pXIN+oq0UhKz5PRHWi8fHyPfycnqRzyvEJxouT+zw==",
       "dependencies": {
         "@vant/popperjs": "^1.3.0",
-        "@vant/use": "^1.4.3"
+        "@vant/use": "^1.5.1",
+        "@vue/shared": "^3.0.0"
       },
       "peerDependencies": {
         "vue": "^3.0.0"
@@ -14828,9 +14832,10 @@
       "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
     },
     "@vant/use": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.4.3.tgz",
-      "integrity": "sha512-rSnETN7P9qT1WbItMpQxBqe3cHeK2ZFYp1sCxWUXaTeI71TqA8sOdzC36ledZ36NQgFNTch9fsRPYOkrCgZfQA=="
+      "version": "1.5.2",
+      "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.5.2.tgz",
+      "integrity": "sha512-CBK61iT568dCHUwFFsErGbW6/5tmrPnZJKGtcSy7Tjcrmws8Ku+YZo7IUFD9Xkj9MfSJ4pfhQ7pU2KouP5Cojg==",
+      "requires": {}
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.2.1",
@@ -21707,12 +21712,13 @@
       }
     },
     "vant": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/vant/-/vant-4.0.3.tgz",
-      "integrity": "sha512-rBQCSdMyYxO9I3weQmdTxY28OkVLM7MSIjMx3qwMTsFONek6bodVGEYXF0+mzh/5EBMVXjqtHj6CvD6QphKkCg==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmmirror.com/vant/-/vant-4.6.3.tgz",
+      "integrity": "sha512-hkiBzM1dhEj9EWSjRnyB7gd6SiVa3/+qthNZtlJdj42C+pXIN+oq0UhKz5PRHWi8fHyPfycnqRzyvEJxouT+zw==",
       "requires": {
         "@vant/popperjs": "^1.3.0",
-        "@vant/use": "^1.4.3"
+        "@vant/use": "^1.5.1",
+        "@vue/shared": "^3.0.0"
       }
     },
     "vary": {

+ 1 - 1
package.json

@@ -27,7 +27,7 @@
     "qrcode": "^1.5.1",
     "sortablejs": "^1.15.0",
     "uuid": "^8.3.2",
-    "vant": "^4.0.3",
+    "vant": "^4.6.3",
     "vue": "^3.2.13",
     "vue-class-component": "^8.0.0-0",
     "vue-i18n": "^9.2.2",

+ 10 - 0
src/packages/mobile/views/mine/main/index.less

@@ -1,3 +1,5 @@
+@import '@mobile/assets/themes/base/mixin.less';
+
 .mine {
     @backgroundImage: linear-gradient(var(--navbar-background), var(--navbar-background) 3rem, transparent 3rem);
 
@@ -41,12 +43,20 @@
 
                 &__info {
                     flex: 1;
+                    padding-right: .32rem;
 
                     .top {
+                        display: flex;
+                        align-items: center;
                         font-size: .24rem;
                         color: #A1B1C5;
 
+                        span {
+                            .mixin-text-overflow()
+                        }
+
                         .van-icon {
+                            line-height: normal;
                             margin-left: .04rem;
                         }
                     }

+ 2 - 2
src/packages/mobile/views/mine/main/index.vue

@@ -11,8 +11,8 @@
               <img class="g-image--avatar" :src="userAvatar" />
             </div>
             <div class="profile-user__info">
-              <div class="top" v-if="accountInfo?.accountname">
-                <span>{{ accountInfo.accountname }}</span>
+              <div class="top">
+                <span>{{ userStore.accountName }}</span>
                 <Icon name="checked" color="var(--van-tag-success-color)" v-if="authStatus" />
                 <Icon name="warning" color="var(--van-tag-warning-color)" v-else />
               </div>