panhui 3 лет назад
Родитель
Сommit
c26775129f

+ 1 - 1
.env.development

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

+ 1 - 1
src/components/product/SaleInfo.vue

@@ -19,7 +19,7 @@
                     <div class="user">
                         <van-image width="24" height="24" radius="24" :src="item.ownerAvatar" fit="cover" />
                         <span>{{ item.owner }}</span>
-                        <span class="status out" v-if="item.soldOut">支付中</span>
+                        <span class="status out" v-if="item.inPaying">支付中</span>
                         <span class="status prim" v-else>寄售</span>
                     </div>
                     <div class="price">¥{{ item.price }}</div>

+ 1 - 1
src/components/product/productInfo.vue

@@ -34,7 +34,7 @@
                 <span>{{ startTime || time }}</span>
             </div>
             <div class="sold" v-if="isSolded">已售罄</div>
-            <div class="sold zhifu" v-else-if="isSold && info.source === 'TRANSFER'">
+            <div class="sold zhifu" v-else-if="info.inPaying">
                 <img src="@assets/zhi_fu_zhong.png" alt="" />
                 <span>支付中</span>
             </div>

+ 10 - 0
src/views/Discover.vue

@@ -232,6 +232,16 @@ export default {
             .then(() => {
                 this.getList();
             });
+
+        this.emitter.on('updateList', info => {
+            let list = [...this.list];
+            list.forEach((item, index) => {
+                if (info.id === item.id) {
+                    list[index] = info;
+                }
+            });
+            this.list = list;
+        });
     },
     methods: {
         getInit() {

+ 3 - 3
src/views/product/Detail.vue

@@ -322,6 +322,9 @@
                 <van-button type="primary" @click="showSale" block round>我想要</van-button>
             </div>
         </div>
+        <div class="btn van-safe-area-bottom" v-else-if="info.inPaying">
+            <div class="status-text">支付中</div>
+        </div>
         <div class="btn van-safe-area-bottom" ref="btn" v-else-if="info.onShelf && info.salable">
             <div class="btn-list">
                 <!-- <div class="price-content">
@@ -419,9 +422,6 @@
                 </div>
             </div>
         </div>
-        <div class="btn van-safe-area-bottom" v-else-if="info.soldOut && info.source === 'TRANSFER'">
-            <div class="status-text">支付中</div>
-        </div>
 
         <div class="btn van-safe-area-bottom" v-else>
             <div class="status-text">仅展示</div>