From bce99ece9150297e75b4bbb692890069438ce56b Mon Sep 17 00:00:00 2001 From: Tuisku Date: Thu, 16 Jun 2022 13:50:11 +0800 Subject: [PATCH] 111 --- app.js | 6 ------ pages/index/index.js | 4 ---- .../subpage/detail/components/effect/effect.wxml | 15 --------------- 3 files changed, 25 deletions(-) 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 @@ -<<<<<<< HEAD {{effect.dyCommentNum}} 评论量 -======= - 0 - 传播量 ->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60 @@ -60,13 +55,8 @@ -<<<<<<< HEAD {{effect.ksCommentNum}} 评论量 -======= - 0 - 传播量 ->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60 @@ -111,13 +101,8 @@ -<<<<<<< HEAD {{effect.sphCommentNum}} 评论量 -======= - 0 - 传播量 ->>>>>>> 90f2acacee696bc0fa6d8a5d8e3a1958033edc60