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

.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/AppBar.vue

@@ -11,6 +11,7 @@
         id="navBar"
         :class="{ dark: tabColor }"
         ref="navBar"
+        :style="{ backgroundColor: tabColor }"
     >
         <template #left>
             <div class="back">
@@ -128,6 +129,7 @@ export default {
             }
         },
         getColor(color = '') {
+            console.log('2777171');
             if (this.$route.meta.tabColor) {
                 if (window.cordova && StatusBar && StatusBar.isVisible) {
                     StatusBar.styleLightContent();
@@ -189,6 +191,9 @@ export default {
     .van-nav-bar {
         line-height: initial !important;
     }
+    .van-nav-bar {
+        --van-nav-bar-background-color: transparent;
+    }
 }
 .back {
     padding-right: 12px;

src/main.js

@@ -144,7 +144,7 @@ if (query.invitor) {
 if (query.from) {
     store.commit('setFrom', query.from);
 }
-store.commit('setFrom', 'scanCode');
+// store.commit('setFrom', 'scanCode');
 if (query.inviteCode) {
     store.commit('setInviteCode', query.inviteCode);
 }

src/router/index.js

@@ -193,7 +193,8 @@ const routes = [{
         meta: {
             pageType: Page.Login,
             title: '登录',
-            tabColor: '#181818'
+            tabColor: '#181818',
+            menuPage: false
         }
     },
     {

src/views/product/Detail.vue

@@ -141,7 +141,7 @@
                                 </div>
                             </div>
                         </van-collapse-item>
-                        <van-collapse-item name="1" class="goods-info" v-if="info.minterId !== info.ownerId">
+                        <van-collapse-item name="1" class="goods-info">
                             <template #title>
                                 <div class="page-title">
                                     <img src="@assets/fenxiang-icon.png" alt="" />
@@ -174,7 +174,6 @@
                                     </template>
                                 </van-cell>
                                 <van-cell
-                                    v-if="info.ownerId !== info.minterId"
                                     class="creator"
                                     :to="{
                                         path: '/creatorDetail',
@@ -729,7 +728,9 @@ export default {
     name: 'productDetail',
     watch: {
         '$route.params'() {
-            this.getInit();
+            if (this.$route.params.id) {
+                this.getInit();
+            }
         }
     },
     data() {
@@ -905,6 +906,7 @@ export default {
             return this.$http
                 .get('/collection/get/' + this.collectionId)
                 .then(res => {
+                    console.log('1828');
                     if (this.$store.state.from === 'scanCode') {
                         res.onShelf = true;
                         this.checkLogin();
@@ -1133,7 +1135,7 @@ export default {
             });
         },
         goBack() {
-            if (!fromRoute || !fromRoute.name) {
+            if (!fromRoute || !fromRoute.name || fromRoute.meta.pageType === 1) {
                 this.$router.replace('/home');
             } else {
                 this.$router.replace('/home');
@@ -2350,6 +2352,6 @@ export default {
     position: fixed;
     left: 16px;
     top: calc(var(--safe-top) + 16px);
-    z-index: 20;
+    z-index: 90;
 }
 </style>

src/views/product/MetaDomain.vue

@@ -58,8 +58,8 @@
                     <div class="domain_price_con" @click="priceOrder">
                         <div>价格排序</div>
                         <div class="tab">
-                            <van-icon size="8" name="arrow-up" :class="source ? 'tab_text' : ''" />
-                            <van-icon size="8" name="arrow-down" :class="source ? '' : 'tab_text'" />
+                            <van-icon size="8" name="arrow-up" :class="source ? '' : 'tab_text'" />
+                            <van-icon size="8" name="arrow-down" :class="source ? 'tab_text' : ''" />
                         </div>
                     </div>
                 </div>
@@ -262,14 +262,18 @@ export default {
     data() {
         return {
             domainWidth: '0px',
-            domainNameType: 'LIKE',
+            domainNameType: 'SELL',
             scrollTop: 0,
             rarityType: '',
             characteristicType: '',
             show: false,
-            domainPrice: false,
+            domainPrice: true,
             source: true,
             domainNameList: [
+                {
+                    name: '寄售中',
+                    type: 'SELL'
+                },
                 {
                     name: '热度排行',
                     type: 'LIKE'
@@ -278,10 +282,6 @@ export default {
                     name: '最新发布',
                     type: 'RELEASE'
                 },
-                {
-                    name: '寄售中',
-                    type: 'SELL'
-                },
                 {
                     name: '仅展示',
                     type: 'SEE'
@@ -314,6 +314,10 @@ export default {
                 }
             ],
             characteristicList: [
+                {
+                    name: '二位数字',
+                    type: 'RIDN2'
+                },
                 {
                     name: '三位数字',
                     type: 'RIDN3'
@@ -361,6 +365,7 @@ export default {
         },
         priceOrder() {
             this.source = !this.source;
+            this.dressing = true;
             this.getList(true);
         },
         showStatus() {
@@ -392,10 +397,10 @@ export default {
             }
         },
         refreash() {
-            (this.domainNameType = 'LIKE'), (this.rarityType = '');
+            (this.domainNameType = 'SELL'), (this.rarityType = '');
             this.characteristicType = '';
-            this.dressing = false;
-            this.domainPrice = false;
+            this.dressing = true;
+            this.domainPrice = true;
             this.getList(true);
         },
         submit() {
@@ -425,7 +430,7 @@ export default {
             let query = {
                 type: 'DOMAIN'
             };
-            let sort = 'likes,desc';
+            let sort = 'price,desc';
             if (this.dressing) {
                 if (this.rarityType != '') {
                     query = {
@@ -455,6 +460,7 @@ export default {
                         ...query,
                         salable: false
                     };
+                    sort = 'likes,desc';
                 }
                 if (this.domainNameType == 'RELEASE') {
                     query = {
@@ -462,6 +468,12 @@ export default {
                     };
                     sort = 'createdAt,desc';
                 }
+                if (this.domainNameType == 'LIKE') {
+                    query = {
+                        ...query
+                    };
+                    sort = 'likes,desc';
+                }
             }
             let url = 'collection/all';
             return this.$http