一口价

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://test.raex.vip/
+VUE_APP_BASE_URL=https://www.raex.vip/
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/components/auction/asset.vue

@@ -1297,7 +1297,7 @@ export default {
             }
         }
         .star + .star {
-            margin-left: 15px;
+            margin-left: 4%;
         }
     }
 }

src/components/auction/records.vue

@@ -11,7 +11,8 @@
                 <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
                     <div class="record-item" v-for="(item, index) in list" :key="index">
                         <span>{{ item.nickname }}</span>
-                        <span>{{ index === 0 ? '领先' : '出局' }}</span>
+                        <span v-if="item.paymentType !== 'FIXED_PRICE'">{{ index === 0 ? '领先' : '出局' }}</span>
+                        <span v-else>一口价</span>
                         <span>¥{{ item.currentPrice || 0 }}</span>
                         <span>{{ showTime(item.createdAt) }}</span>
                     </div>
@@ -52,7 +53,7 @@ export default {
                     tradeAuctionId: this.auctionId,
                     del: false,
                     status: 'FINISH,PASS',
-                    paymentType: 'DEPOSIT,PURCHASE_PRICE'
+                    paymentType: 'DEPOSIT,PURCHASE_PRICE,FIXED_PRICE'
                 },
                 sort: 'createdAt,desc'
             };
@@ -130,24 +131,32 @@ export default {
     color: #939599;
     line-height: 17px;
     margin-top: 10px;
+    overflow: hidden;
 
     span {
         white-space: nowrap;
         &:first-child {
             width: 20%;
+            flex-shrink: 0;
             overflow: hidden; //溢出隐藏
             white-space: nowrap; //禁止换行
             text-overflow: ellipsis;
             display: inline-block;
         }
 
+        &:nth-child(2) {
+            width: 40px;
+            flex-shrink: 0;
+        }
+
         &:nth-child(3) {
-            flex-grow: 1;
+            width: 70px;
+            flex-shrink: 0;
         }
     }
 
     span + span {
-        margin-left: 18px;
+        margin-left: 5px;
     }
 
     &:first-child {

src/mixins/auction.js

@@ -62,7 +62,7 @@ export default {
         },
         showPrice() {
             if (this.info.status == 'FIXED_PRICE_PURCHASED') {
-                return this.info.fixedPrice;
+                return this.info.recommendPrice;
             }
             return this.info.currentPrice || this.info.price || 0;
         },

src/views/auction/Detail.vue

@@ -75,7 +75,8 @@
             <div class="card-content">
                 <div class="record-item" v-for="(item, index) in records" :key="index">
                     <span>{{ item.nickname }}</span>
-                    <span>{{ index === 0 ? '领先' : '出局' }}</span>
+                    <span v-if="item.paymentType !== 'FIXED_PRICE'">{{ index === 0 ? '领先' : '出局' }}</span>
+                    <span v-else>一口价</span>
                     <span>¥{{ item.currentPrice || 0 }}</span>
                     <span>{{ item.createdAt }}</span>
                 </div>
@@ -307,7 +308,7 @@ export default {
                                 del: false,
                                 userId: this.userInfo.id,
                                 status: 'FINISH,PASS',
-                                paymentType: 'DEPOSIT,PURCHASE_PRICE'
+                                paymentType: 'DEPOSIT,PURCHASE_PRICE,FIXED_PRICE'
                             },
                             size: 1,
                             page: 0,
@@ -330,7 +331,7 @@ export default {
                             tradeAuctionId: this.auctionId,
                             del: false,
                             status: 'FINISH,PASS',
-                            paymentType: 'DEPOSIT,PURCHASE_PRICE'
+                            paymentType: 'DEPOSIT,PURCHASE_PRICE,FIXED_PRICE'
                         },
                         size: 2,
                         page: 0,
@@ -748,13 +749,18 @@ export default {
             display: inline-block;
         }
 
+        &:nth-child(2) {
+            width: 40px;
+            flex-shrink: 0;
+        }
+
         &:nth-child(3) {
             flex-grow: 1;
         }
     }
 
     span + span {
-        margin-left: 18px;
+        margin-left: 5%;
     }
 
     &:first-child {

src/views/order/AuctionDetail.vue

@@ -44,6 +44,10 @@
                     <div class="text1 prim">¥{{ info.serviceCharge }}</div>
                 </div>
             </template>
+            <div class="info-item" v-if="info.paymentType === 'FIXED_PRICE'">
+                <div class="text1">一口价</div>
+                <div class="text1 prim">¥{{ info.price }}</div>
+            </div>
             <div class="info-item" v-else>
                 <div class="text1">实付款</div>
                 <div class="text1 prim">¥{{ info.price }}</div>