From ce17cb4060e8f60dee7b203dc75331bfa9e2f38a Mon Sep 17 00:00:00 2001
From: cebgcontract <99630598+cebgcontract@users.noreply.github.com>
Date: Thu, 7 Apr 2022 13:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=AE=98=E6=96=B9=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/market/mall/OneBox.vue | 14 +++++-
 src/views/desktop/Mall.vue            | 64 ++++-----------------------
 src/views/desktop/Presale.vue         |  8 ++--
 3 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/src/components/market/mall/OneBox.vue b/src/components/market/mall/OneBox.vue
index 2310d3f..48945d1 100644
--- a/src/components/market/mall/OneBox.vue
+++ b/src/components/market/mall/OneBox.vue
@@ -61,6 +61,9 @@ import { UserModule } from '@/store/modules/user'
 import ChainManager from '@/chain/ChainManager'
 import { EventBus, PRESALE_BEGIN, PRESALE_ERROR, PRESALE_ORDER_GET } from '@/utils/event-bus'
 import { buyBox } from '@/api/Mall'
+import { buyShopBox } from '@/api/Market'
+
+export const TMP_SHOP_ORDER_ID = 'tmp_presale_order_id'
 
 export interface IBoxData{
   level: string
@@ -79,6 +82,8 @@ export interface IBoxData{
 })
 export default class OneBox extends Vue {
   @Prop() private boxData: IBoxData
+  @Prop() private preSale: boolean
+
   chainManger = new ChainManager()
 
   formatPriceShow(price: number|string, decimals?: number, fixed = 2) {
@@ -134,9 +139,14 @@ export default class OneBox extends Vue {
         signature
       }
       await this.chainManger.bc.increaseAllowance(priceData.contract_address, price)
-      const res: any = await buyBox(buyData)
+      let res: any
+      if (this.preSale) {
+        res = await buyBox(buyData)
+      } else {
+        res = await buyShopBox(buyData)
+      }
       const orderId = res.order_id
-      localStorage.setItem('tmp_presale_order_id', orderId)
+      localStorage.setItem(TMP_SHOP_ORDER_ID, orderId)
       EventBus.$emit(PRESALE_ORDER_GET, orderId)
     } catch (err) {
       console.log('buy error: ', err)
diff --git a/src/views/desktop/Mall.vue b/src/views/desktop/Mall.vue
index 6485c4c..e2cfb56 100644
--- a/src/views/desktop/Mall.vue
+++ b/src/views/desktop/Mall.vue
@@ -26,7 +26,7 @@
 
         </div>
         <div class="box-list">
-          <one-box v-for="data in boxDatas" :key="data.id" :box-data="data"></one-box>
+          <one-box v-for="data in boxDatas" :key="data.id" :pre-sale="false" :box-data="data"></one-box>
         </div>
         <pagination
           v-if="totalPage>1"
@@ -49,16 +49,16 @@
 import { Component, Vue, Watch } from 'vue-property-decorator'
 import TopMenu from '@/components/market/TopMenu.vue'
 import BaseFooter from '@/components/layout/BaseFooter.vue'
-import OneBox, { IBoxData } from '@/components/market/mall/OneBox.vue'
+import OneBox, { IBoxData, TMP_SHOP_ORDER_ID } from '@/components/market/mall/OneBox.vue'
 import { UserModule } from '@/store/modules/user'
 import { AppModule } from '@/store/modules/app'
 import ChainManager from '@/chain/ChainManager'
 import { EventBus, PRESALE_BEGIN, PRESALE_ERROR, PRESALE_ORDER_GET, PRESALE_SUCCESS } from '@/utils/event-bus'
 import { secs2str } from '@/utils/time.util'
-import { queryOrder, queryPresaleStatus, searchBox } from '@/api/Mall'
 import { ElLoadingComponent } from 'element-ui/types/loading'
 import TimeLoader from '@/components/main/TimeLoader.vue'
 import Pagination from '@/components/market/Pagination.vue'
+import { queryShopList, queryShopOrder } from '@/api/Market'
 
 @Component({
   components: {
@@ -105,7 +105,6 @@ export default class Official extends Vue {
   @Watch('isLogin')
   private accountChange() {
     if (this.accountId) {
-      this.getPresaleInfo()
       this.checkOrderHistory()
     }
   }
@@ -133,11 +132,10 @@ export default class Official extends Vue {
 
   async fetchData() {
     await this.queryPresaleList()
-    await this.getPresaleInfo()
   }
 
   checkOrderHistory() {
-    const historyOrderId = localStorage.getItem('tmp_presale_order_id')
+    const historyOrderId = localStorage.getItem(TMP_SHOP_ORDER_ID)
     if (historyOrderId && this.accountId) {
       this.beginTraceOrderStatus(historyOrderId)
     }
@@ -180,7 +178,6 @@ export default class Official extends Vue {
     this.resetTmpOrderId()
     this.showOrderStatus = false
     this.$alert('Congratulations', 'Buy Success', { type: 'success', confirmButtonText: 'OK' })
-    await this.getPresaleInfo()
   }
 
   beginTraceOrderStatus(orderId: string) {
@@ -196,13 +193,13 @@ export default class Official extends Vue {
       clearInterval(this.orderTimer)
       this.orderTimer = null
     }
-    localStorage.removeItem('tmp_presale_order_id')
+    localStorage.removeItem(TMP_SHOP_ORDER_ID)
     this.loadingInstance?.close()
   }
 
   async getOrderStatus(orderId: string) {
     try {
-      const res: any = await queryOrder({ account: this.accountId, order_id: orderId })
+      const res: any = await queryShopOrder({ account: this.accountId, order_id: orderId })
       if (res.state === 1) {
         EventBus.$emit(PRESALE_SUCCESS, {})
       } else if (res.state === 3) {
@@ -233,58 +230,13 @@ export default class Official extends Vue {
     this.timer = null
   }
 
-  async getPresaleInfo() {
-    const reqData = {
-      account: this.accountId
-    }
-    const res: any = await queryPresaleStatus(reqData)
-    if (res.presale_info) {
-      this.numberTotal = res.presale_info.total_num || 0
-      this.numberRest = this.numberTotal - (res.presale_info.sold_num || 0)
-      this.numberRest = this.numberRest < 0 ? 0 : this.numberRest
-      this.hint = res.presale_info.hint.replace(/\\n/g, '<br/>')
-      // this.buyed = !!res.presale_info.buyed
-      this.presaleStatus = res.presale_info.state || 0
-      this.presaleTitle = res.presale_info.title
-      this.countdown = res.presale_info.countdown
-      if (this.presaleStatus === 1 && this.countdown > 0) {
-        this.beginCountdown()
-      }
-      AppModule.updatePresaleStat(this.presaleStatus)
-
-      const buySet: Set<string> = new Set()
-      if (res.presale_info.buyable_list) {
-        for (const sub of res.presale_info.buyable_list) {
-          buySet.add(sub.box_id)
-        }
-      }
-      AppModule.updateCanBuy(this.presaleStatus === 2 &&
-        this.numberRest > 0 && buySet.size > 0
-      )
-      for (let i = 0, l = this.boxDatas.length; i < l; i++) {
-        const data = this.boxDatas[i]
-        if (!buySet.has(data.id)) {
-          data.open = 0
-          data.title = 'UNAVAILABLE'
-          data.desc = 'ALREADY BOUGHT'
-        } else {
-          data.open = 1
-        }
-        Vue.set(this.boxDatas, i, data)
-      }
-      // for (const data of this.boxDatas) {
-      //   Vue.set(data, 'open', buySet.has(data.id) ? 0 : 1)
-      // }
-    }
-  }
-
   async queryPresaleList(pageNo = 0) {
     const reqData = {
-      account: '',
+      account: this.accountId,
       page: pageNo
     }
     this.boxDatas.length = 0
-    const res: any = await searchBox(reqData)
+    const res: any = await queryShopList(reqData)
     if (res.page) {
       this.currentPage = (parseInt(res.page.current_page || 0)) + 1
       this.totalPage = res.page.total_pages || 1
diff --git a/src/views/desktop/Presale.vue b/src/views/desktop/Presale.vue
index 874590a..a02b1f9 100644
--- a/src/views/desktop/Presale.vue
+++ b/src/views/desktop/Presale.vue
@@ -26,7 +26,7 @@
 
         </div>
         <div class="box-list">
-          <one-box v-for="data in boxDatas" :key="data.id" :box-data="data"></one-box>
+          <one-box v-for="data in boxDatas" :key="data.id" :pre-sale="true" :box-data="data"></one-box>
         </div>
         <pagination
           v-if="totalPage>1"
@@ -49,7 +49,7 @@
 import { Component, Vue, Watch } from 'vue-property-decorator'
 import TopMenu from '@/components/market/TopMenu.vue'
 import BaseFooter from '@/components/layout/BaseFooter.vue'
-import OneBox, { IBoxData } from '@/components/market/mall/OneBox.vue'
+import OneBox, { IBoxData, TMP_SHOP_ORDER_ID } from '@/components/market/mall/OneBox.vue'
 import { UserModule } from '@/store/modules/user'
 import { AppModule } from '@/store/modules/app'
 import ChainManager from '@/chain/ChainManager'
@@ -137,7 +137,7 @@ export default class Presale extends Vue {
   }
 
   checkOrderHistory() {
-    const historyOrderId = localStorage.getItem('tmp_presale_order_id')
+    const historyOrderId = localStorage.getItem(TMP_SHOP_ORDER_ID)
     if (historyOrderId && this.accountId) {
       this.beginTraceOrderStatus(historyOrderId)
     }
@@ -196,7 +196,7 @@ export default class Presale extends Vue {
       clearInterval(this.orderTimer)
       this.orderTimer = null
     }
-    localStorage.removeItem('tmp_presale_order_id')
+    localStorage.removeItem(TMP_SHOP_ORDER_ID)
     this.loadingInstance?.close()
   }