Merge branch 'dev' of xiongzhu/raex_front into master

src/views/DomainName.vue

@@ -321,7 +321,7 @@
                     </div>
                 </div>
                 <div class="meta_domain_name_list_con_right">
-                    <!-- <div
+                    <div
                         class="meta_domain_name_list_con_right_one"
                         v-if="item.sold && item.canAsk && !item.collectionId"
                         @click="offerShow(index)"
@@ -341,7 +341,7 @@
                         @click="consignment(index)"
                     >
                         仅展示
-                    </div> -->
+                    </div>
                     <div class="meta_domain_name_list_con_right_one" @click="buy(index)">
                         {{ item.sold ? '超链' : '购买' }}
                     </div>
@@ -446,6 +446,7 @@
 <script>
 import { mapState } from 'vuex';
 import superLink from '@/mixins/superLink';
+import { Dialog } from 'vant';
 export default {
     name: 'domainName',
     inject: ['bar', 'setKeeps', 'scrollWrapper', 'changeScroll', 'bodyScroll'],
@@ -606,13 +607,32 @@ export default {
                 this.$toast('请输入价格');
                 return;
             }
-            this.$router.push({
-                path: '/offerPriceSubmit',
-                query: {
-                    domainPrice: this.price,
-                    id: this.collectionId
-                }
-            });
+            console.log('aftgadfa', this.price);
+            if (this.price < 29.9) {
+                Dialog.confirm({
+                    title: '提示',
+                    message: '出价的价格不能低于当前市场的均价',
+                    showCancelButton: false,
+                    confirmButtonColor: '#626366'
+                }).then(() => {
+                    this.price = 29.9;
+                    this.$router.push({
+                        path: '/offerPriceSubmit',
+                        query: {
+                            domainPrice: this.price,
+                            id: this.collectionId
+                        }
+                    });
+                });
+            } else {
+                this.$router.push({
+                    path: '/offerPriceSubmit',
+                    query: {
+                        domainPrice: this.price,
+                        id: this.collectionId
+                    }
+                });
+            }
         },
         buy(index) {
             if (!this.list[index].sold) {

src/views/Store.vue

@@ -343,15 +343,15 @@ export default {
                 {
                     name: '审核中',
                     type: 'underReview'
+                },
+                {
+                    name: '我的出价',
+                    type: 'myBid'
+                },
+                {
+                    name: '收到的报价',
+                    type: 'receiveQuotation'
                 }
-                // {
-                //     name: '我的出价',
-                //     type: 'myBid'
-                // },
-                // {
-                //     name: '收到的报价',
-                //     type: 'receiveQuotation'
-                // }
             ],
             typeOptionLike: [
                 {
@@ -1068,7 +1068,7 @@ export default {
 .metadomainName_list {
     padding: 16px 15px 20px 16px;
     display: flex;
-    // justify-content: space-between;
+    justify-content: space-between;
     background: #0f0f0f;
 
     .metadomainName_list_cons {
@@ -1081,7 +1081,7 @@ export default {
         font-size: 12px;
         font-weight: 400;
         color: rgba(147, 149, 153, 0.6);
-        margin-right: 30px;
+        // margin-right: 30px;
     }
 
     .metadomainName_list_con {
@@ -1092,7 +1092,7 @@ export default {
         color: #00fe1e;
         background: #0f0f0f;
         line-height: 28px;
-        margin-right: 30px;
+        // margin-right: 30px;
     }
 }
 

src/views/order/Orders.vue

@@ -199,10 +199,10 @@ export default {
                     status: 'PENDING',
                     name: '审核中'
                 },
-                // {
-                //     status: 'BID_ORDER',
-                //     name: '出价订单'
-                // },
+                {
+                    status: 'BID_ORDER',
+                    name: '出价订单'
+                },
                 {
                     status: 'NOT_PAID',
                     name: '待支付'