解决冲突

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -16,46 +16,15 @@
         </div>
       </div>
       <div class="adviceBox">
-<<<<<<< .mine
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="item in this.courseManagement" :key="item.id">
-
-
-
-
-
-
-
-
-
-=======
-        <van-list
-          v-model="loading"
-          finished-text="没有更多了"
-          @load="onLoad"
-          :finished="finished"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in this.courseManagement"
-            :key="item.id"
-          >
->>>>>>> .theirs
+        <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
+          <div class="adviceOne" v-for="(item, index) in this.courseManagement" :key="item.id">
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
-<<<<<<< .mine
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-
-
-
-
-=======
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
                 @click="toDeleteCourseManagement(item.id, index)"
               />
->>>>>>> .theirs
             </div>
             <div class="statOrder">
               <div class="statOrderTitle">
@@ -106,16 +75,6 @@
           @cancel="endShow = false"
         />
       </van-popup>
-<<<<<<< .mine
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
-
-
-
-
-
-
-
-=======
 
       <van-action-sheet
         v-model="newShow"
@@ -124,7 +83,6 @@
         @cancel="onCancel"
         @select="onDeleteConfirm"
       />
->>>>>>> .theirs
     </div>
   </div>
 </template>