From 39c70a5515bed0092a52a0127aeb287bb04f5474 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 8 Jul 2022 16:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/match/list/index.vue | 100 +++++++++++++++++----------------
 src/setting.js                 |   2 +-
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index cdf53a2..c7dd5ab 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -8,51 +8,6 @@
             </div>
         </div>
 
-        <!-- 课程筛选 -->
-        <div class="filter">
-            <div class="center-wrap" style="padding: 0;margin: 0 auto;">
-                <dl v-if="form.eventType !== 1">
-                    <dt>比赛范围：</dt>
-                    <template v-if="form.eventType === 2">
-                      <dd v-for="(item, i) in squareScopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
-                    </template>
-                    <template v-if="form.eventType === 3">
-                      <dd v-for="(item, i) in scopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
-                    </template>
-                    <template v-if="form.eventType === 2 || (form.eventType === 3 && form.competitionScope === 2)">
-                      <div class="select-wrap">
-                        <span class="label">省份</span>
-                        <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
-                          <el-option label="不限" value=""></el-option>
-                          <el-option
-                              v-for="(item,index) in provinces"
-                              :key="index"
-                              :label="item.provinceName"
-                              :value="item.provinceId"
-                          ></el-option>
-                        </el-select>
-                      </div>
-                      <div class="select-wrap">
-                        <span class="label">城市</span>
-                        <el-select size="small" v-model="form.cityId" clearable @change="initData">
-                          <el-option label="不限" value=""></el-option>
-                          <el-option
-                              v-for="(item,index) in cities"
-                              :key="index"
-                              :label="item.cityName"
-                              :value="item.cityId"
-                          ></el-option>
-                        </el-select>
-                      </div>
-                    </template>
-                </dl>
-                <dl>
-                    <dt>筛选排序：</dt>
-                    <dd v-for="(item, i) in sorts" :key="i" :class="{active: form.sequence == item.id}" @click="changeSort(item.id)">{{ item.name }}</dd>
-                </dl>
-            </div>
-        </div>
-
         <div class="main">
             <div class="center-wrap list-inner">
                 <ul v-if="token" class="nav">
@@ -60,6 +15,51 @@
                     </li>
                 </ul>
                 <div class="list-wrap">
+                  <!-- 课程筛选 -->
+                  <div class="filter">
+                      <div>
+                          <dl v-if="form.eventType !== 1">
+                              <dt>比赛范围：</dt>
+                              <template v-if="form.eventType === 2">
+                                <dd v-for="(item, i) in squareScopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
+                              </template>
+                              <template v-if="form.eventType === 3">
+                                <dd v-for="(item, i) in scopes" :key="i" :class="{active: form.competitionScope == item.id}" @click="changeScope(item.id)">{{ item.name }}</dd>
+                              </template>
+                              <template v-if="form.eventType === 2 || (form.eventType === 3 && form.competitionScope === 2)">
+                                <div class="select-wrap">
+                                  <span class="label">省份</span>
+                                  <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
+                                    <el-option label="不限" value=""></el-option>
+                                    <el-option
+                                        v-for="(item,index) in provinces"
+                                        :key="index"
+                                        :label="item.provinceName"
+                                        :value="item.provinceId"
+                                    ></el-option>
+                                  </el-select>
+                                </div>
+                                <div class="select-wrap">
+                                  <span class="label">城市</span>
+                                  <el-select size="small" v-model="form.cityId" clearable @change="initData">
+                                    <el-option label="不限" value=""></el-option>
+                                    <el-option
+                                        v-for="(item,index) in cities"
+                                        :key="index"
+                                        :label="item.cityName"
+                                        :value="item.cityId"
+                                    ></el-option>
+                                  </el-select>
+                                </div>
+                              </template>
+                          </dl>
+                          <dl>
+                              <dt>筛选排序：</dt>
+                              <dd v-for="(item, i) in sorts" :key="i" :class="{active: form.sequence == item.id}" @click="changeSort(item.id)">{{ item.name }}</dd>
+                          </dl>
+                      </div>
+                  </div>
+
                     <div class="list">
                         <template v-if="listData.length">
                             <ul>
@@ -423,6 +423,8 @@ export default {
                 url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat;
     .filter {
         width: 100%;
+        padding: 0 20px;
+        margin-bottom: 20px;
         background-color: #fff;
         dl {
             display: flex;
@@ -432,12 +434,13 @@ export default {
                 color: #333;
                 font-size: 16px;
                 font-weight: 600;
+                white-space: nowrap;
             }
             dd {
-                padding: 5px 20px;
-                margin: 0 10px;
+                padding: 5px 15px;
                 color: #333;
                 font-size: 16px;
+                white-space: nowrap;
                 cursor: pointer;
                 border-radius: 4px;
                 &.active {
@@ -450,9 +453,10 @@ export default {
     .select-wrap {
       display: inline-flex;
       align-items: center;
-      margin: 0 20px;
+      margin: 0 10px;
       .label {
         margin-right: 10px;
+        white-space: nowrap;
       }
       .el-select {
         width: 130px;
diff --git a/src/setting.js b/src/setting.js
index 1410ff4..5bb24d2 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -21,7 +21,7 @@ if (isPro) {
     // 本地
     systemPath = `http://${location.hostname}:8093`
     host = "http://121.37.12.51/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.137:9000/"; // 赓
 }