xuqiang %!s(int64=4) %!d(string=hai) anos
pai
achega
820bbccd06

+ 32 - 7
src/main/pc-space/src/views/Send.vue

@@ -76,11 +76,13 @@
                 <div class="qrcode">
                 <div class="qrcode">
                     <vue-qrcode :value="payUrl" :options="{ width: 140, margin: 1 }" class="code"></vue-qrcode>
                     <vue-qrcode :value="payUrl" :options="{ width: 140, margin: 1 }" class="code"></vue-qrcode>
                 </div>
                 </div>
-                <div class="qrcode-text">
-                    二维码有效时常为5分钟,<span v-if="minters < 10">0</span>{{ minters }}分<span v-if="seconds < 10"
+                <h3 class="qrcode-text">
+                    二维码有效时常为5分钟,<span style="color: #939599" v-if="minters < 10">0</span>{{ minters }}分<span
+                        style="color: #939599"
+                        v-if="seconds < 10"
                         >0</span
                         >0</span
                     >{{ seconds }} 请尽快支付
                     >{{ seconds }} 请尽快支付
-                </div>
+                </h3>
             </div>
             </div>
 
 
             <!-- <div class="tips">
             <!-- <div class="tips">
@@ -164,9 +166,14 @@ export default {
         payUrl() {
         payUrl() {
             return resolveUrl(
             return resolveUrl(
                 this.$baseUrl,
                 this.$baseUrl,
-                'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin_pc?id=' +
+                'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/gift/weixin_pc?id=' +
                     this.idOrder
                     this.idOrder
             );
             );
+            // return resolveUrl(
+            //     this.$baseUrl,
+            //     'https://nfttest.9space.vip/wx/redirect?redirectUrl=https://nfttest.9space.vip/payOrder/weixin_pc?id=' +
+            //         this.idOrder
+            // );
         }
         }
     },
     },
     methods: {
     methods: {
@@ -243,6 +250,8 @@ export default {
                             this.initTime(res.id, res.createdAt);
                             this.initTime(res.id, res.createdAt);
                             this.status = res.status;
                             this.status = res.status;
                             this.idOrder = res.id;
                             this.idOrder = res.id;
+                            console.log(this.idOrder);
+                            console.log(this.payUrl);
                             // console.log(res);
                             // console.log(res);
                         })
                         })
                         .catch(e => {
                         .catch(e => {
@@ -303,16 +312,32 @@ export default {
     padding-left: 100px;
     padding-left: 100px;
 }
 }
 .qrcode {
 .qrcode {
-    text-align: center;
-    margin-top: 20px;
+    width: 160px;
+    height: 160px;
+    background: #f5f7fa;
+    border-radius: 11px;
+    margin: 30px auto 10px;
+    padding: 10px;
+    box-sizing: border-box;
+    .code {
+        border-radius: 11px;
+        overflow: hidden;
+    }
 }
 }
 .qrcode-text {
 .qrcode-text {
     font-size: 16px;
     font-size: 16px;
-    font-weight: 400;
     color: #939599;
     color: #939599;
     line-height: 24px;
     line-height: 24px;
+    margin: 0 auto;
     text-align: center;
     text-align: center;
 }
 }
+// .qrcode-text {
+//     font-size: 16px;
+//     font-weight: 400;
+//     color: #939599;
+//     line-height: 24px;
+//     text-align: center;
+// }
 .info {
 .info {
     .flex();
     .flex();
     height: 94px;
     height: 94px;

+ 1 - 1
src/main/pc-space/src/views/Submit.vue

@@ -131,7 +131,7 @@ export default {
             payMethods: 'WEIXIN',
             payMethods: 'WEIXIN',
             minters: 0,
             minters: 0,
             seconds: 0,
             seconds: 0,
-            allTime: 1 * 60 - 1,
+            allTime: 5 * 60 - 1,
             closeTime: '',
             closeTime: '',
             list2: [],
             list2: [],
             list3: [],
             list3: [],