活动

src/main/comos/src/components/order/OrderOpen.vue

@@ -15,7 +15,7 @@
                 <img class="productImg" :src="imgSrc" />
             </div>
 
-            <div class="text1" v-if="!showProduct">点击打开盲盒</div>
+            <div class="text1" v-if="!showProduct && id">点击打开盲盒</div>
 
             <div class="text" v-else>藏品正在生成中<br />约1~3分钟，完成后会出现在你的藏品室</div>
 
@@ -44,7 +44,9 @@ export default {
     },
     methods: {
         open() {
-            this.$http.post('/order/open?id=' + this.id);
+            if (this.id) {
+                this.$http.post('/order/open?id=' + this.id);
+            }
             this.addClass('img2', 'animate__rollOut', false)
                 .then(() => {
                     return this.addClass('img3', 'animate__bounceOutUp', false);

src/main/comos/src/views/activity/List1.vue

@@ -20,11 +20,11 @@
                         <van-button
                             size="small"
                             @click="getActivity(item, index)"
-                            :disabled="!canGet(item)"
+                            :disabled="!canGet(item) || item.stock === 0"
                             type="primary"
                             round
                             block
-                            >领取</van-button
+                            >{{ item.stock ? '领取' : '无库存' }}</van-button
                         >
                     </div>
 
@@ -34,19 +34,24 @@
 
             <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_png_wusousuo.png')" />
         </van-list>
+
+        <order-open ref="box" :imgSrc="getImg(orderInfo.pic)"></order-open>
     </div>
 </template>
 
 <script>
+import OrderOpen from '../../components/order/OrderOpen.vue';
 import list from '../../mixins/list';
 export default {
+    components: { OrderOpen },
     name: 'Search',
     mixins: [list],
     data() {
         return {
             list: [],
             empty: false,
-            url: '/activityCollection/all'
+            url: '/activityCollection/all',
+            orderInfo: {}
         };
     },
     methods: {
@@ -89,10 +94,30 @@ export default {
                 });
         },
         getActivity(info, index) {
-            this.$dialog.confirm({
-                title: '提示',
-                message: `确认要使用${info.num}张${info.collectionName}兑换一张${info.awardCollectionName}吗?`,
-                confirmButtonText: '立即兑换'
+            this.$dialog
+                .confirm({
+                    title: '提示',
+                    message: `确认要使用${info.num}张${info.collectionName}兑换一张${info.awardCollectionName}吗?`,
+                    confirmButtonText: '立即兑换'
+                })
+                .then(res => {
+                    return this.$http.post('/activityOrder/create?mintActivityId=' + info.id);
+                })
+                .then(res => {
+                    this.getData(true);
+                    this.orderInfo = res;
+                    this.show();
+                })
+                .catch(e => {
+                    if (e && e.error) {
+                        this.$toast(e.error);
+                    }
+                });
+        },
+        show() {
+            this.$refs.box.show = true;
+            this.$nextTick(() => {
+                this.$refs.box.open();
             });
         }
     }