diff --git a/app.js b/app.js
index df70ade..62558e2 100644
--- a/app.js
+++ b/app.js
@@ -17,12 +17,6 @@ App({
     // 登录
     // wx.login({
     //   success: res => {
-<<<<<<< HEAD
-=======
-    //     // this.setData({
-    //     //   code: res.code
-    //     // })
->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60
     //     http("/user/login", "post", {
     //       code: res.code
     //     }).then(res => {
diff --git a/pages/index/index.js b/pages/index/index.js
index d898f40..423734c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -91,9 +91,6 @@ Page({
       }
     })
    this.getrecordslist()
-<<<<<<< HEAD
-  },
-=======
    this.RankingList()
    this.numlist()
    
@@ -113,7 +110,6 @@ Page({
     })
   },
   //品牌动态
->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60
   getrecordslist(){
     http("/topicActivity/list", "post", {
       showAtIndex:1
diff --git a/pages/quest/subpage/detail/components/effect/effect.wxml b/pages/quest/subpage/detail/components/effect/effect.wxml
index 8778db5..9a534f9 100644
--- a/pages/quest/subpage/detail/components/effect/effect.wxml
+++ b/pages/quest/subpage/detail/components/effect/effect.wxml
@@ -27,13 +27,8 @@
       </view>
       <view class="card_hr"></view>
       <view class="dou_card">
-<<<<<<< HEAD
         <view class="card_num">{{effect.dyCommentNum}}</view>
         <view class="card_tip">评论量</view>
-=======
-        <view class="card_num">0</view>
-        <view class="card_tip">传播量</view>
->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60
       </view>
     </view>
   </view>
@@ -60,13 +55,8 @@
       </view>
       <view class="card_hr"></view>
       <view class="dou_card">
-<<<<<<< HEAD
         <view class="card_num">{{effect.ksCommentNum}}</view>
         <view class="card_tip">评论量</view>
-=======
-        <view class="card_num">0</view>
-        <view class="card_tip">传播量</view>
->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60
       </view>
     </view>
   </view>
@@ -111,13 +101,8 @@
       </view>
       <view class="card_hr"></view>
       <view class="dou_card">
-<<<<<<< HEAD
         <view class="card_num">{{effect.sphCommentNum}}</view>
         <view class="card_tip">评论量</view>
-=======
-        <view class="card_num">0</view>
-        <view class="card_tip">传播量</view>
->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60
       </view>
     </view>
   </view>