xuqiang 4 anos atrás
pai
commit
17245590a2

+ 6 - 14
src/main/pc-space/src/components/PageHeader.vue

@@ -53,42 +53,34 @@ export default {
     },
     data() {
         return {
-            // tabs: ['铸造者', '收藏探索', '数字盲盒', '我的NFT', '了解更多'],
             active: '',
             show: false,
             activeName: '',
             lists: '',
-            // url: '/identityAuth/all',
             menus: [
                 {
                     label: '铸造者',
-                    value: '/casting',
-                    id: 1
+                    value: '/casting'
                 },
                 {
                     label: '收藏探索',
-                    value: '/collection',
-                    id: 2
+                    value: '/collection'
                 },
                 {
                     label: '数字盲盒',
-                    value: '/collection?type=BLIND_BOX',
-                    id: 3
+                    value: '/collection?type=BLIND_BOX'
                 },
                 {
                     label: '铸造商店',
-                    value: 'wait',
-                    id: 4
+                    value: 'wait'
                 },
                 {
                     label: '我的藏品',
-                    value: '/my',
-                    id: 5
+                    value: '/my'
                 },
                 {
                     label: '了解更多',
-                    value: 'wait',
-                    id: 6
+                    value: 'wait'
                 }
             ]
         };

+ 17 - 7
src/main/pc-space/src/views/Submit.vue

@@ -187,18 +187,19 @@ export default {
             gas: 0,
             id: 0,
             status: '',
+            payUrl: '',
             payUrl2: ''
         };
     },
     computed: {
         // 微信
-        payUrl() {
-            return resolveUrl(
-                this.$baseUrl,
-                'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin_pc?id=' +
-                    this.id
-            );
-        },
+        // payUrl() {
+        // return resolveUrl(
+        //     this.$baseUrl,
+        //     'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin?id=' +
+        //         this.id
+        // );
+        // },
         money() {
             let money = 0;
             if (this.info.price && !this.couponInfo) {
@@ -360,6 +361,15 @@ export default {
                             this.$router.replace('/collectionorder');
                         }, 1000);
                     }
+                    if (this.payMethods === 'WEIXIN') {
+                        this.$http
+                            .get('/payOrder/weixin', {
+                                id: res.id
+                            })
+                            .then(res => {
+                                this.payUrl = res.wx_h5_pay_url;
+                            });
+                    }
                     if (this.payMethods === 'ALIPAY') {
                         this.$http
                             .get('/payOrder/alipay_qr', {

+ 16 - 2
src/main/pc-space/src/views/user/Personal.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container center-content">
-        <!-- <div class="title">个人中心</div> -->
         <div class="content">
+            <!-- :default-active="NavActive" -->
             <el-menu
                 :default-openeds="openeds"
                 :collapse-transition="false"
@@ -49,9 +49,23 @@ export default {
         return {
             openeds: ['2'],
             uniqueOpened: false
+            // NavActive: ''
         };
     },
-    methods: {}
+    methods: {
+        handleSelect(index) {
+            this.NavActive = index;
+            console.log(this.NavActive);
+        }
+    }
+    // watch: {
+    //     $route(index) {
+    //         console.log(index);
+    //         let path = index.path;
+    //         // let path = index.path.substr(1);
+    //         this.handleSelect(path);
+    //     }
+    // }
 };
 </script>
 <style lang="less" scoped>