叫价

src/components/asset/ownedBuy.vue

@@ -35,10 +35,10 @@
             </div>
         </div>
         <div class="product_bottom" v-if="info.status == 'ASKING'">
-            <!-- <div class="product_bottom_cons" v-if="endTimes">
+            <div class="product_bottom_cons" v-if="endTimes >= 0">
                 <van-count-down @finish="finish" :time="endTimes" format="HH:mm:ss" />后可取消出价
-            </div> -->
-            <div class="product_bottom_con" @click="btn()">不想买了</div>
+            </div>
+            <div class="product_bottom_con" @click="btn()" v-else>不想买了</div>
         </div>
     </div>
 </template>
@@ -77,6 +77,9 @@ export default {
         }
     },
     methods: {
+        finish() {
+            this.$emit('fatherMethods');
+        },
         btn() {
             Dialog.confirm({
                 title: '确认不想买该藏品了',

src/components/order/BidOrderInfo.vue

@@ -35,10 +35,10 @@
             </div>
         </div>
         <div class="orderInfo_btn" v-if="info.status == 'ASKING'">
-            <!-- <div class="orderInfo_btn_one">
+            <div class="orderInfo_btn_one" v-if="endTimes >= 0">
                 <van-count-down @finish="finish" :time="endTimes" format="HH:mm:ss" />后可取消出价
-            </div> -->
-            <div class="orderInfo_btn_two" @click="btn()">不想买了</div>
+            </div>
+            <div class="orderInfo_btn_two" @click="btn()" v-else>不想买了</div>
         </div>
         <!-- 
         <div class="btns">
@@ -85,11 +85,14 @@ export default {
             return newEndTime;
         },
         endTimes() {
-            let createdAt = this.dayjs(this.info.createdAt).add(24, 'hour');
+            let createdAt = this.dayjs(this.info.createdAt).add(2, 'minute');
             return createdAt.diff(this.dayjs());
         }
     },
     methods: {
+        finish() {
+            this.$emit('fatherMethods');
+        },
         btn() {
             Dialog.confirm({
                 title: '确认不想买该藏品了',

src/views/Store.vue

@@ -566,6 +566,9 @@ export default {
         if (this.$route.query.type) {
             this.type = this.$route.query.type;
         }
+        if (this.$route.query.goBack) {
+            // this.type = 'metadomainName';
+        }
         if (window.cordova && StatusBar && StatusBar.isVisible) {
             StatusBar.styleLightContent();
         }
@@ -694,7 +697,6 @@ export default {
             this.getList().then(() => {
                 this.isLoading = false;
             });
-            console.log('agfgatgaydh我被调用');
         },
         showMore(asset) {
             console.log(asset);

src/views/order/Orders.vue

@@ -259,7 +259,6 @@ export default {
             this.getData(true).then(() => {
                 this.isLoading = false;
             });
-            console.log('agfgatgaydh我被调用');
         },
         beforeData() {
             if (this.type == 'METANAME') {

src/views/product/QuotationRecord.vue

@@ -7,7 +7,7 @@
                         :src="require('@assets/icon-back@3x.png')"
                         alt=""
                         class="product_top_one_img"
-                        @click="$router.back()"
+                        @click="goBack"
                     />
                     收到报价
                 </div>
@@ -123,10 +123,12 @@
 <script>
 import asset from '../../mixins/asset';
 import product from '../../mixins/product';
+let fromRoute = null;
 export default {
     mixins: [asset, product],
     data() {
         return {
+            fromRoute: null,
             assetId: 0,
             domainOrderId: 0,
             highestBid: 0,
@@ -163,6 +165,12 @@ export default {
             this.domainOrderId = this.$route.query.domainOrderId;
             this.getDomain();
         }
+        this.emitter.on('updateFrom', from => {
+            fromRoute = from;
+        });
+    },
+    beforeRouteEnter(to, from) {
+        fromRoute = from;
     },
     methods: {
         acceptOffer(index) {
@@ -273,6 +281,14 @@ export default {
                     this.show = false;
                 });
         },
+        goBack() {
+            this.$router.push({
+                path: '/store',
+                query: {
+                    goBack: true
+                }
+            });
+        },
         onRefresh() {
             this.getList(true).then(() => {
                 this.isLoading = false;