发售预告

src/views/Home.vue

@@ -84,8 +84,10 @@
                             <div class="collection_list_con_month">
                                 {{ item.dateTime.slice(5, 7) }}月{{ item.dateTime.slice(8, 10) }}日
                             </div>
-                            <div class="collection_list_con_time_con">{{ item.dateTime.slice(11, 16) }}开售</div>
-                            <RecentSale v-model:arr="item.collectionDTOS"></RecentSale>
+                            <div v-for="(item,index) in item.subscribeMapDto" :key="index">
+                                <div class="collection_list_con_time_con">{{ item.localTime.slice(0, 5) }}</div>
+                                 <RecentSale v-model:arr="item.collectionDTOS"></RecentSale>
+                            </div>
                         </div>
                     </van-list>
                     <div v-if="saleList.length == 0" class="empty_two">暂无近期发售计划</div>

src/views/asset/Detail.vue

@@ -307,10 +307,10 @@
                     <div class="public_display" @click="Exhibition">
                         {{ info.publicShow ? '取消展示' : '公开展示' }}
                     </div>
-                    <div class="purchase_transaction_button_deposit">
+                    <!-- <div class="purchase_transaction_button_deposit">
                         <div class="purchase_transaction_button_deposit_one">寄售倒计时</div>
                         <div class="purchase_transaction_button_deposit_two">{{ startTime }}</div>
-                    </div>
+                    </div> -->
                     <!-- <div class="purchase_transaction_button_deposit_consignment" v-else @click="Consignment">
                         {{ info.consignment ? '取消寄售' : '寄售上架' }}
                     </div> -->
@@ -2100,13 +2100,15 @@ export default {
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         .purchase_transaction_button_con {
+            width: 100%;
             display: flex;
             padding: 9px 15px;
             box-sizing: border-box;
+            justify-content: space-between;
             // justify-content: center;
         }
         .purchase_transaction_button_give {
-            width: 80px;
+           width: calc(42vw);
             height: 44px;
             border-radius: 8px;
             background: #313641;
@@ -2148,18 +2150,18 @@ export default {
             margin-right: 16px;
         }
         .purchase_transaction_button_right {
-            display: flex;
-            width: calc(100vw - 124px);
+            // display: flex;
+            // width: calc(100vw - 124px);
         }
         .public_display {
-            width: 50%;
+           width: calc(42vw);
             height: 44px;
             border-radius: 8px;
             background: #f9ddb3;
             color: #725837;
             line-height: 44px;
             text-align: center;
-            margin-right: 16px;
+            // margin-right: 16px;
             // border-width: 0px;
         }
         .purchase_transaction_button_deposit {

src/views/product/Detail.vue

@@ -614,10 +614,13 @@
                 </div>
                 <div v-else-if="info.subscribeStatus == 'ANNOUNCING' && info.hasSubscribe && !isSolded && !isSold">
                     <!-- v-if="!isAppointment && info.state == 'PUBLISH'" class="button_three" -->
-                    <div class="buy_now" v-if="info.purchaseQualifications">
+                    <div class="buy_now" v-if="info.purchaseQualifications && this.isLogin">
                         <div class="buy_now_con_two">已获取购买资格</div>
                     </div>
-                    <div class="sold_out" v-else>未获取购买资格</div>
+                    <div class="sold_out" v-else-if="!info.purchaseQualifications && this.isLogin">未获取购买资格</div>
+                    <div class="buy_now" v-else @click="collectionSoldOut">
+                        <div class="buy_now_con_two">登录后查看预约状态</div>
+                    </div>
                 </div>
                 <div v-else-if="info.subscribeStatus == 'ON_SALE' && info.hasSubscribe && !isSolded && !isSold">
                     <!-- v-if="!isAppointment && info.state == 'PURCHASE'" -->