解决冲突

pages/details/details.js

@@ -19,12 +19,8 @@ Page({
     postsList: [],
     dateArr: [],
     playUrl: '',
-<<<<<<< HEAD
     courseWareId: '',
     currentVideo: 0
-=======
-    courseWareId: ''
->>>>>>> de0842070ba25769271f1a42d9839ec4b9d31b54
   },
   //点击收藏
   favorites: function () {

utils/APIRequest.js

@@ -24,13 +24,8 @@ class httpRequestApi {
     static addPlayLogList(data) {
         const url = httpApiUrl('wx/playLog');
         return getInstance().header({
-<<<<<<< HEAD
             uid: wx.getStorageSync('uid'),
         }).url(url).data(data).method('POST').send();
-=======
-            uid: 1,
-        }).url(url).data(data).send();
->>>>>>> de0842070ba25769271f1a42d9839ec4b9d31b54
     }    
     //收藏或者取消
     static getDetailsFavorites(data) {