.

src/components/PassCard.vue

@@ -6,7 +6,7 @@
         </div>
         <div class="balance" v-if="balance">
             <span>{{ info.price }}</span>
-            <span>个绿洲石</span>
+            <span>个绿洲核</span>
         </div>
         <div class="price" v-else>
             <span>¥</span>

src/components/product/productInfo.vue

@@ -6,7 +6,7 @@
             <div class="text1">{{ info.name }}</div>
             <div class="text2">
                 <span>{{ info.price }}</span>
-                <span>个绿洲石</span>
+                <span>个绿洲核</span>
             </div>
             <div class="text3">已兑{{ info.sale }}次</div>
         </div>

src/components/room/description.vue

@@ -7,7 +7,7 @@
             <div>1. 房主选英雄及地图，报名成功即同意</div>
             <div>2. 网络干扰属于个人原因，不接受退赛退票处理</div>
             <div>3. 队友挂机或者无响应，一律流局处理，违规者不反悔门票</div>
-            <div>4. 违规者门票将用于补偿所以玩家</div>
+            <div>4. 违规者门票将用于补偿所有玩家</div>
         </div>
     </van-dialog>
 </template>

src/mixins/search.js

@@ -39,7 +39,7 @@ export default {
         getSearch(search) {
             this.isSearch = true;
             this.search = search;
-            this.addHistory(search);
+            console.log(search);
             this.getData(true);
         },
         onCancel() {

src/router/index.js

@@ -100,6 +100,15 @@ const routes = [
             title: '创建房间'
         }
     },
+    {
+        path: '/search',
+        name: 'search',
+        component: () => import('../views/Search.vue'),
+        meta: {
+            pageType: Page.Every,
+            menuPage: true
+        }
+    },
     {
         path: '/room',
         name: 'room',
@@ -147,7 +156,7 @@ const routes = [
         name: 'userPoint',
         component: () => import('../views/user/Point.vue'),
         meta: {
-            title: '绿洲石'
+            title: '绿洲核'
         }
     },
     {

src/views/Exchange.vue

@@ -7,7 +7,7 @@
                 <template #title>
                     <div class="cell-title">
                         <span>{{ info.price }}</span>
-                        <span>个绿洲石</span>
+                        <span>个绿洲核</span>
                     </div>
                 </template>
                 <template #value>
@@ -27,7 +27,7 @@
         <div class="bottom">
             <div class="price">
                 <span>{{ money }}</span>
-                <span>个绿洲石</span>
+                <span>个绿洲核</span>
             </div>
             <van-button type="primary" @click="submit">立即兑换</van-button>
         </div>

src/views/ExchangeCollection.vue

@@ -6,7 +6,7 @@
                 <div class="text1 van-multi-ellipsis--l2">{{ info.name }}</div>
                 <div class="text2">
                     <span>{{ info.price }}</span>
-                    <span>个绿洲石</span>
+                    <span>个绿洲核</span>
                 </div>
             </div>
         </div>
@@ -27,7 +27,7 @@
         <div class="bottom">
             <div class="price">
                 <span>{{ info.price }}</span>
-                <span>个绿洲石</span>
+                <span>个绿洲核</span>
             </div>
             <van-button type="primary" @click="submit">立即兑换</van-button>
         </div>

src/views/Home.vue

@@ -25,13 +25,13 @@
             <van-search
                 v-model="search"
                 left-icon=" "
-                @search="searchList"
                 show-action
                 placeholder="输入房间号码"
                 action-text="搜索"
+                @click="$router.push('/search')"
             >
                 <template #action>
-                    <div @click="searchList">搜索</div>
+                    <div>搜索</div>
                 </template>
             </van-search>
         </div>

src/views/Mine.vue

@@ -43,7 +43,7 @@
         <div class="menu-list">
             <div class="menu-card" @click="$router.push('/userPoint')">
                 <div class="text1">{{ balance }}</div>
-                <div class="text2">绿洲石</div>
+                <div class="text2">绿洲核</div>
             </div>
             <div class="menu-card" @click="$router.push('/userPass')">
                 <div class="text1">{{ userTickets }}</div>

src/views/Minepre.vue

@@ -238,7 +238,7 @@ export default {
                                 if (this.$refs.level.money <= this.shareMoney) {
                                     this.$dialog.alert({
                                         title: '提示',
-                                        message: '绿洲石大于' + this.shareMoney + '的用户才能参加该活动'
+                                        message: '绿洲核大于' + this.shareMoney + '的用户才能参加该活动'
                                     });
                                     resolve();
                                 } else if (this.shareProduct.openQuota) {

src/views/RoomResult.vue

@@ -13,7 +13,7 @@
                 <!-- <div class="text3">
                     <span>赢得</span>
                     <span></span>
-                    <span>绿洲石</span>
+                    <span>绿洲核</span>
                 </div> -->
             </div>
             <div class="top-info" v-else>

src/views/Search.vue

@@ -0,0 +1,64 @@
+<template>
+    <div class="search">
+        <div class="search-top">
+            <van-search v-model="search" left-icon=" " show-action placeholder="输入房间号码" @search="getSearch">
+                <template #action>
+                    <div @click="getSearch(search)">搜索</div>
+                </template>
+            </van-search>
+        </div>
+    </div>
+</template>
+
+<script>
+import list from '../mixins/list';
+import search from '../mixins/search';
+export default {
+    data() {
+        return {
+            url: '/room/roomList',
+            httpType: 'get'
+        };
+    },
+    mixins: [list, search],
+    methods: {
+        beforeData() {
+            return {
+                id: this.search
+            };
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.search-top {
+    padding: 12px 16px;
+    .van-button {
+        flex-shrink: 0;
+        height: 32px;
+        border-radius: 4px;
+        padding: 0 10px;
+    }
+    .flex();
+    .van-search__action {
+        background: linear-gradient(315deg, @prim2 0%, @prim 100%);
+        color: #1a1c2b;
+        height: 32px;
+        line-height: 32px;
+        padding: 0 20px;
+    }
+    .van-search {
+        padding: 0 0;
+        height: 32px;
+        border-radius: 4px;
+        overflow: hidden;
+        flex-grow: 1;
+    }
+
+    .van-search__content {
+        background: #25283d;
+        height: 32px;
+    }
+}
+</style>

src/views/user/Collections.vue

@@ -6,9 +6,11 @@
                 <div class="collection-content">
                     <div class="text1">{{ item.name }}</div>
                     <div class="text2">兑换账户:{{ item.phone }}</div>
-                    <div class="text2">消耗绿洲石:{{ item.totalPrice }}个</div>
+                    <div class="text2">消耗绿洲核:{{ item.totalPrice }}个</div>
+                </div>
+                <div class="status" :class="{ status1: item.status === 'PENDING' }">
+                    {{ getLabelName(item.status, statusOptions) }}
                 </div>
-                <div class="status">已发放</div>
             </div>
 
             <van-empty
@@ -26,7 +28,12 @@ export default {
     mixins: [list],
     data() {
         return {
-            url: '/exchangeOrder/my'
+            url: '/exchangeOrder/my',
+            statusOptions: [
+                { label: '等待发放', value: 'PENDING' },
+                { label: '已发放', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ]
         };
     },
     methods: {}

src/views/user/Pass.vue

@@ -11,8 +11,8 @@
             <pass-info v-for="(item, index) in list" :key="index" :info="item"></pass-info>
             <van-empty
                 v-if="empty"
-                description="当前没有兑换券哦～"
-                :image="require('../../assets/kong-pimg-zhanji.png')"
+                description="当前没有通行证哦～"
+                :image="require('../../assets/kong-pimg-tongxingzheng.png')"
             />
         </van-list>
     </div>

src/views/user/Point.vue

@@ -2,7 +2,7 @@
     <div class="point">
         <div class="point-card">
             <div class="card-top">
-                <div class="text1">绿洲石</div>
+                <div class="text1">绿洲核</div>
                 <div class="text2">
                     <span>{{ balance }}</span>
                     <span>个</span>