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

.env.app

@@ -2,6 +2,6 @@ VUE_APP_BASE_URL=https://www.raex.vip
 NODE_ENV=production
 VUE_APP_PUBLIC_PATH=./
 ASSETS_PATH=raex
-TITLE=RAEX宇宙
+TITLE=RAEX绿洲
 VUE_APP_CORDOVA=true
 VUE_APP_PAGE_TYPE=raex

.env.app_test

@@ -2,6 +2,6 @@ VUE_APP_BASE_URL=https://www.raex.vip
 NODE_ENV=production
 VUE_APP_PUBLIC_PATH=./
 ASSETS_PATH=raex
-TITLE=RAEX宇宙
+TITLE=RAEX绿洲
 VUE_APP_CORDOVA=true
 VUE_APP_PAGE_TYPE=raex

.env.development

@@ -1,6 +1,6 @@
-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
-TITLE=RAEX宇宙
+TITLE=RAEX绿洲
 VUE_APP_PAGE_TYPE=raex

.env.production

@@ -2,5 +2,5 @@ VUE_APP_BASE_URL=/
 NODE_ENV=production
 VUE_APP_PUBLIC_PATH=/9th/
 ASSETS_PATH=raex
-TITLE=RAEX宇宙
+TITLE=RAEX绿洲
 VUE_APP_PAGE_TYPE=raex

src/components/PageBar.vue

@@ -2,7 +2,7 @@
     <div class="bar">
         <div>
             <div class="text1">
-                <slot>RAEX宇宙</slot>
+                <slot>RAEX绿洲</slot>
             </div>
             <div class="text2">
                 <span> <slot name="sub"></slot></span>

src/main.js

@@ -138,6 +138,7 @@ store.commit('setFrom', 'scanCode');
 if (query.inviteCode) {
     store.commit('setInviteCode', query.inviteCode);
 }
+console.log('review', query.review === 'true' || query.review === true);
 if (query.review === 'true' || query.review === true) {
     store.commit('setReview', true);
 }

src/views/Discover.vue

@@ -198,7 +198,7 @@ export default {
                     value: 'collection'
                 },
                 {
-                    label: '艺术机构',
+                    label: '机构专区',
                     value: 'creator'
                 },
                 {
@@ -426,18 +426,19 @@ export default {
                 });
         },
         goAuction() {
-            this.$http
-                .get('/sysConfig/get/auction_show')
-                .then(res => {
-                    if (res.value === true || res.value === '1') {
-                        this.$router.push('/auction');
-                    } else {
-                        return Promise.reject();
-                    }
-                })
-                .catch(() => {
-                    this.wait();
-                });
+            this.$toast('升级改版中');
+            // this.$http
+            //     .get('/sysConfig/get/auction_show')
+            //     .then(res => {
+            //         if (res.value === true || res.value === '1') {
+            //             this.$router.push('/auction');
+            //         } else {
+            //             return Promise.reject();
+            //         }
+            //     })
+            //     .catch(() => {
+            //         this.wait();
+            //     });
         }
     },
     activated() {

src/views/Home.vue

@@ -284,7 +284,7 @@ export default {
                     ? Promise.resolve()
                     : this.$dialog
                           .confirm({
-                              title: 'RAEX宇宙服务协议和隐私政策',
+                              title: 'RAEX绿洲服务协议和隐私政策',
                               message: `在您使用我的各项服务之前，请务必审慎阅读、充分理解<a href="javascript:void(0)" onclick="goFetch('/agreement?page=service')" >《用户隐私协议》</a>、<a href="javascript:void(0)" onclick="goFetch('/agreement')" >《隐私政策》</a>的条款。并且我们会申请获取您的设备信息，以向您提供安全风控服务。同时您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的条款。如您已详细阅读并同意RAEX宇宙用户协议、隐私政策，请点击【同意并继续】开始使用我们的服务。`,
                               confirmButtonText: '同意并继续',
                               cancelButtonText: '不同意',
@@ -315,7 +315,7 @@ export default {
             } else if (!window.localStorage.getItem('AppTips') && !inIos && inApp) {
                 this.$dialog
                     .confirm({
-                        title: 'RAEX宇宙服务协议和隐私政策',
+                        title: 'RAEX绿洲服务协议和隐私政策',
                         message: `在您使用我的各项服务之前，请务必审慎阅读、充分理解<a href="javascript:void(0)" onclick="goFetch('/agreement?page=service')" >《用户隐私协议》</a>、<a href="javascript:void(0)" onclick="goFetch('/agreement')" >《隐私政策》</a>的条款。并且我们会申请获取您的设备信息，以向您提供安全风控服务。同时您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的条款。如您已详细阅读并同意RAEX宇宙用户协议、隐私政策，请点击【同意并继续】开始使用我们的服务。`,
                         confirmButtonText: '同意并继续',
                         cancelButtonText: '不同意',

src/views/Mine.vue

@@ -133,7 +133,11 @@
                 <img src="@assets/info_icon_zhuzaodingdan.png" alt="" />
                 <span>铸造订单</span>
             </div>
-            <div class="order-info" @click="$router.push('/auctionOrders')">
+            <!-- <div class="order-info" @click="$router.push('/auctionOrders')">
+                <img src="@assets/info_icon_paimaidingdan.png" alt="" />
+                <span>拍卖订单</span>
+            </div> -->
+            <div class="order-info" @click="this.$toast('升级改版中')">
                 <img src="@assets/info_icon_paimaidingdan.png" alt="" />
                 <span>拍卖订单</span>
             </div>

src/views/Store.vue

@@ -530,7 +530,8 @@ export default {
                         query: {
                             userId: this.$store.state.userInfo.id,
                             status: this.status,
-                            prefixName: this.moreTitle
+                            prefixName: this.moreTitle,
+                            type: 'DEFAULT,BLIND_BOX'
                         },
                         sort: 'id,desc'
                     },
@@ -568,7 +569,8 @@ export default {
                 sort: this.sort === 'price' ? this.sort + this.sortDes : this.sort,
                 query: {
                     userId: this.$store.state.userInfo.id,
-                    ...this.beforeQuery()
+                    ...this.beforeQuery(),
+                    companyId: 1
                 }
             };
             if (this.type === 'xingtu') {

src/views/asset/Agreement.vue

@@ -2,7 +2,7 @@
     <van-overlay :show="show" @click="show = false" :lock-scroll="false" z-index="99">
         <div class="content" ref="content" @click.stop="">
             <div>
-                <div class="align-center">RAEX宇宙华储艺术品中心委托拍卖协议</div>
+                <div class="align-center">RAEX绿洲华储艺术品中心委托拍卖协议</div>
                 <h4>委托方（以下简称“甲方”）：{{ identityAuthInfo.realName }}</h4>
                 <h3>身份证号：{{ identityAuthInfo.idNo }}</h3>
                 <h3>联系电话：{{ identityAuthInfo.phone }}</h3>

src/views/asset/Detail.vue

@@ -749,18 +749,19 @@ export default {
                 });
         },
         publish() {
-            this.checkAuth()
-                .then(() => {
-                    return this.checkBank();
-                })
-                .then(() => {
-                    Dialog.confirm({
-                        title: '拍卖上架',
-                        message: '确定拍卖上架吗？'
-                    }).then(() => {
-                        this.$router.push('/auctionPublish?id=' + this.info.id);
-                    });
-                });
+            this.$toast('升级改版中');
+            // this.checkAuth()
+            //     .then(() => {
+            //         return this.checkBank();
+            //     })
+            //     .then(() => {
+            //         Dialog.confirm({
+            //             title: '拍卖上架',
+            //             message: '确定拍卖上架吗？'
+            //         }).then(() => {
+            //             this.$router.push('/auctionPublish?id=' + this.info.id);
+            //         });
+            //     });
         },
         Add() {
             if (this.userInfo.authStatus === 'PENDING' || this.userInfo.authStatus === 'FAIL') {

src/views/product/NewsDetail.vue

@@ -2,7 +2,7 @@
     <div class="news newsB">
         <van-sticky>
             <van-notice-bar
-                text="RAEX宇宙，立即下载"
+                text="RAEX绿洲，立即下载"
                 @click="download"
                 background="#3ab20010"
                 color="#3ab200"

src/views/product/SearchCorpse.vue

@@ -330,7 +330,9 @@ export default {
                 })
                 .catch(() => {});
             this.$http
-                .get('/collection/count/' + search)
+                .get('/collection/count', {
+                    search: search
+                })
                 .then(res => {
                     this.displayInformation = res;
                 })

src/views/product/Tasks.vue

@@ -2,7 +2,7 @@
     <div class="tasks" :class="{ isMine: isMine }">
         <van-sticky v-if="!isMine && !inApp">
             <van-notice-bar
-                text="RAEX宇宙，立即下载"
+                text="RAEX绿洲，立即下载"
                 @click="download"
                 background="#3ab20010"
                 color="#3ab200"

src/views/user/Level.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="level">
         <div class="level-title">
-            <div class="text1">RAEX宇宙元力等级系统</div>
+            <div class="text1">RAEX绿洲元力等级系统</div>
             <div class="text2">
                 在RAEX宇宙中使用绿洲石，绿洲石将会产生元力，元力是绿洲藏家晋升之路的基础。元力越高，境界与头衔越高。
             </div>