|
|
@@ -31,11 +31,7 @@
|
|
|
<div class="search">
|
|
|
<img src="../../../assets/icon/search.png" alt="" />
|
|
|
</div>
|
|
|
-<<<<<<< HEAD
|
|
|
<input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @change="getCourse()" @input="getCourse()" />
|
|
|
-=======
|
|
|
- <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @input="getCourse()" />
|
|
|
->>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
|
|
|
</div>
|
|
|
<el-button type="primary" class="bgColor" style="margin-left: 10px;" @click="reset">重置</el-button>
|
|
|
</div>
|
