panhui 4 gadi atpakaļ
vecāks
revīzija
1e041a3281

+ 1 - 1
src/main/nine-space/.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=http://localhost:8080/
+VUE_APP_BASE_URL=https://nfttest.9space.vip/
 NODE_ENV=development
 PUBLIC_PATH=/
 ASSETS_PATH=9th

+ 45 - 3
src/main/nine-space/src/components/order/OrderOpen.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-overlay :show="show" z-index="99" @click="show = false">
+    <van-overlay :show="show" z-index="99">
         <div class="content" @click.stop="open">
             <img class="bg" ref="bg" src="@assets/open1.png" alt="" />
 
@@ -19,7 +19,21 @@
 
             <div class="text" v-else>藏品正在生成中<br />约1~3分钟,完成后会出现在你的藏品室</div>
 
-            <img src="@assets/icon_fenxiang_close.png" @click="show = false" alt="" class="close" />
+            <div class="btn-list" v-if="showProduct">
+                <van-button class="btn1" @click="show = false" type="primary" size="small" plain round
+                    >查看订单</van-button
+                >
+                <van-button
+                    class="prim"
+                    @click="$router.push('/productDetail?id=' + collectionId)"
+                    type="primary"
+                    size="small"
+                    round
+                    >再开一个</van-button
+                >
+            </div>
+
+            <!-- <img src="@assets/icon_fenxiang_close.png" @click="show = false" alt="" class="close" /> -->
         </div>
     </van-overlay>
 </template>
@@ -30,6 +44,10 @@ export default {
         imgSrc: {
             type: String,
             defalut: ''
+        },
+        collectionId: {
+            type: Number,
+            defalut: 0
         }
     },
     data() {
@@ -108,7 +126,7 @@ export default {
         position: absolute;
         left: 50%;
         transform: translateX(-50%);
-        bottom: 100px;
+        bottom: 30px;
         z-index: 3;
     }
 
@@ -176,6 +194,30 @@ export default {
     }
 }
 
+.btn-list {
+    .flex();
+    margin-top: 42px;
+
+    .van-button {
+        width: 132px;
+        height: 38px;
+        line-height: 38px;
+        font-size: 16px;
+    }
+
+    .van-button + .van-button {
+        margin-left: 20px;
+    }
+
+    .prim {
+        background: linear-gradient(135deg, @prim 0%, @warn 100%);
+    }
+
+    .btn1 {
+        border: 1px solid @prim;
+    }
+}
+
 .animate__rollOut {
     animation: rollOut ease-in-out 0.8s;
 }

+ 5 - 1
src/main/nine-space/src/views/order/Detail.vue

@@ -75,7 +75,11 @@
                 </div>
             </div>
         </div>
-        <order-open ref="box" :imgSrc="getImg(changeImgs(collection.pic))"></order-open>
+        <order-open
+            ref="box"
+            :collectionId="info.collectionId"
+            :imgSrc="getImg(changeImgs(collection.pic))"
+        ></order-open>
     </div>
 </template>