.

src/main/pc-space/src/views/CollectionDetail.vue

@@ -400,6 +400,7 @@ export default {
             width: 460px;
             flex-shrink: 0;
         }
+       
         .top-info {
             flex-grow: 1;
             margin-left: 30px;

src/main/pc-space/src/views/Send.vue

@@ -223,6 +223,19 @@ export default {
                 }, 1000);
             }
         },
+        // payWatch() {
+        //     //监控支付状态
+        //     this.payTimeout = setInterval(() => {
+        //         this.$http.get('/order/gift/get/' + this.idOrder).then(res => {
+        //             console.log(res);
+        //             if (res.status === 'FINISH') {
+        //                 clearInterval(this.payTimeout);
+        //                 // this.status = res.status;
+        //                 this.show = false;
+        //             }
+        //         });
+        //     }, 1000);
+        // },
         submit() {
             // if (this.payMethods === 'DCEP') {
             //     this.wait();
@@ -241,8 +254,7 @@ export default {
                             this.initTime(res.id, res.createdAt);
                             this.status = res.status;
                             this.idOrder = res.id;
-                            console.log(this.idOrder);
-                            console.log(this.payUrl);
+                            // this.payWatch();
                             // console.log(res);
                         })
                         .catch(e => {

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

@@ -1,6 +1,7 @@
 <template>
     <div>
         <el-dialog center title="支付订单" :visible.sync="show" width="680px" :before-close="handleClose">
+            <div class="border"></div>
             <div class="page" v-loading="loading">
                 <div v-if="list2">
                     <div class="title">选择兑换券</div>
@@ -45,7 +46,7 @@
                         <el-button type="info" @click="copy" size="mini" plain>复制</el-button>
                     </div>
                 </div>
-
+                <div class="border"></div>
                 <div class="payMethods">
                     <div class="title">选择支付方式</div>
                     <div class="pay-list">
@@ -283,7 +284,6 @@ export default {
         },
         payWatch() {
             //监控支付状态
-            // if (this.status != 'PROCESSING') {
             this.payTimeout = setInterval(() => {
                 this.$http.get('/order/get/' + this.id).then(res => {
                     console.log(res);
@@ -291,10 +291,20 @@ export default {
                         clearInterval(this.payTimeout);
                         // this.status = res.status;
                         this.show = false;
+                        setTimeout(() => {
+                            this.init2();
+                        }, 1000);
                     }
                 });
             }, 1000);
-            // }
+        },
+        init2() {
+            this.$confirm('您购买成功的商品将在柜子中展示', '支付成功', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                customClass: 'myClass',
+                center: true
+            }).then(() => {});
         },
         submit() {
             // console.log(this.$baseUrl);
@@ -366,8 +376,28 @@ export default {
     }
 };
 </script>
-
+<style lang="less">
+.myClass {
+    width: 340px;
+    .el-button {
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        background: #c4c7cc;
+        color: #ffffff;
+        font-size: 13px;
+    }
+}
+</style>
 <style lang="less" scoped>
+.border {
+    height: 1px;
+
+    background: #f2f3f5;
+    border-radius: 1px;
+}
 .info {
     .flex();
     height: 94px;
@@ -425,6 +455,9 @@ export default {
 /deep/.el-loading-mask {
     background-color: #ffffffee;
 }
+/deep/ .el-dialog {
+    border-radius: 8px;
+}
 .list {
     padding: 24px 0 50px;
 }