xuqiang 4 лет назад
Родитель
Сommit
0fd42b593d

+ 27 - 0
src/main/pc-space/package-lock.json

@@ -4525,6 +4525,14 @@
         }
       }
     },
+    "dom7": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
+      "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
+      "requires": {
+        "ssr-window": "^2.0.0"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -10197,6 +10205,11 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "ssr-window": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz",
+      "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
+    },
     "ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -10466,6 +10479,15 @@
         "util.promisify": "~1.0.0"
       }
     },
+    "swiper": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz",
+      "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
+      "requires": {
+        "dom7": "^2.1.5",
+        "ssr-window": "^2.0.0"
+      }
+    },
     "table": {
       "version": "5.4.6",
       "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
@@ -11143,6 +11165,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
       "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
     },
+    "vue-awesome-swiper": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz",
+      "integrity": "sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ=="
+    },
     "vue-cli-plugin-style-resources-loader": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/vue-cli-plugin-style-resources-loader/-/vue-cli-plugin-style-resources-loader-0.1.5.tgz",

+ 28 - 2
src/main/pc-space/src/components/PageHeader.vue

@@ -15,7 +15,26 @@
                         <div class="slip" :class="{ active: item === active }"></div>
                     </div>
                 </div>
-                <div class="login" @click="show = true">[登录]</div>
+                <div class="btn-list" v-if="!isLogin">
+                    <el-dropdown @command="onCommand" style="margin-left: 20px" trigger="click">
+                        <span class="el-dropdown-link">
+                            <img
+                                style="display: block"
+                                src="https://zhirongip.oss-cn-hangzhou.aliyuncs.com/image/2021-07-06-10-38-11oGTyzHPI.png"
+                            /><i class="el-icon-arrow-down el-icon--right"></i>
+                        </span>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item command="nickname" style="word-break: keep-all"> </el-dropdown-item>
+                            <div class="border1"></div>
+                            <el-dropdown-item command="edit" style="word-break: keep-all">编辑资料 </el-dropdown-item>
+                            <el-dropdown-item command="supply" style="word-break: keep-all">我的供给 </el-dropdown-item>
+                            <el-dropdown-item command="demand" style="word-break: keep-all">我的需求 </el-dropdown-item>
+                            <div class="border1"></div>
+                            <el-dropdown-item command="logout">退出登录 </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                </div>
+                <div v-else class="login" @click="show = true">[登录]</div>
                 <div class="login login1">中文</div>
             </div>
         </div>
@@ -24,6 +43,7 @@
 </template>
 <script>
 import LoginInfo from '../components/LoginInfo.vue';
+import { mapState } from 'vuex';
 export default {
     components: { LoginInfo },
     data() {
@@ -33,10 +53,13 @@ export default {
             show: false
         };
     },
+    computed: { ...mapState(['userInfo']) },
     methods: {
         tab(item) {
             this.active = item;
             if (item === '铸造者') {
+                console.log(this.userInfo);
+                console.log(this.isLogin);
                 this.$router.push('/casting');
             } else if (item === '收藏探索') {
                 this.$router.push('/collection');
@@ -45,7 +68,10 @@ export default {
             } else if (item === '我的NFT') {
                 this.$router.push('/my');
             }
-        }
+        },
+        onCommands() {},
+        batchRead() {},
+        onCommand() {}
     }
 };
 </script>

+ 1 - 1
src/main/pc-space/src/store/index.js

@@ -30,8 +30,8 @@ export default new Vuex.Store({
     actions: {
         getUserInfo(context) {
             return http.http.get('/user/my').then(res => {
-                console.log(res);
                 context.commit('updateUserInfo', res);
+                console.log(res);
             });
         }
     }