Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front

src/App.vue

@@ -159,6 +159,7 @@ export default {
         }
     },
     mounted() {
+        this.routeName = this.$route.name;
         // if ('1' !== window.localStorage.getItem('AppSplash')) {
         //     this.showSplash = true;
         //     window.localStorage.setItem('AppSplash', '1');
@@ -168,7 +169,6 @@ export default {
         //     }
         //     this.getCard();
         // }
-        this.routeName = this.$route.name;
     },
     methods: {
         getCard() {

src/components/asset/ownedBuy.vue

@@ -72,7 +72,7 @@ export default {
             return this.dayjs(this.info.createdAt).format('HH:mm');
         },
         endTimes() {
-            let createdAt = this.dayjs(this.info.createdAt).add(2, 'minute');
+            let createdAt = this.dayjs(this.info.createdAt).add(24, 'hour');
             return createdAt.diff(this.dayjs());
         }
     },

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,25 @@ 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;
+                });
+            } 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: '待支付'

src/views/product/Detail.vue

@@ -710,10 +710,10 @@
         <div class="back-content" @click="goBack">
             <img src="@assets/icon_fanhui2.png" alt="" />
         </div>
-        <div class="shopping_cart" v-if="cartNum != 0" @click="$router.push('/shoppingCart')">
+        <!-- <div class="shopping_cart" v-if="cartNum != 0" @click="$router.push('/shoppingCart')">
             <img :src="require('@assets/png-zhiding@3x.png')" alt="" class="shopping_cart_img" />
             <div class="shopping_cart_num">{{ cartNum }}</div>
-        </div>
+        </div> -->
         <!-- <driver /> -->
 
         <!-- <driver /> -->

src/views/product/Tag.vue

@@ -32,15 +32,9 @@
                     </template>
                 </van-tab>
             </van-tabs>
-            <!-- <van-checkbox
-                v-if="isSearch && source == 'TRANSFER' && !title"
-                @change="getData(true)"
-                class="sala"
-                v-model="salable"
-                >仅看在售</van-checkbox
-            > -->
+            <!-- <van-checkbox @change="getData(true)" class="sala" v-model="salable">仅看在售</van-checkbox> -->
 
-            <van-button
+            <!-- <van-button
                 @click="changeSort"
                 v-if="isSearch && source == 'TRANSFER' && !title"
                 class="sala"
@@ -51,7 +45,7 @@
                 icon-position="right"
                 round
                 >{{ salable ? '在售中' : salable === false ? '仅展示' : '综合排序' }}</van-button
-            >
+            > -->
         </van-sticky>
 
         <van-action-sheet
@@ -303,7 +297,7 @@ export default {
                     tagId: Number(this.tagId)
                 },
                 search: this.search,
-                sort: this.sort === 'id,desc' ? this.sortOptions[this.title] || sort : sort
+                sort: 'salable,desc;' + (this.sort === 'id,desc' ? this.sortOptions[this.title] || sort : sort)
             };
         },
         onRefresh() {