Commit d64bb2f9f37e173e3905c63a6d85d77c0f1fa4dc
1 parent
8eea874b58
Exists in
master
and in
2 other branches
冲突
Showing 1 changed file with 0 additions and 5 deletions
littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
View file @
d64bb2f
| ... | ... | @@ -27,13 +27,8 @@ |
| 27 | 27 | <view style="margin-left:15px;margin-right:75px;"> |
| 28 | 28 | <view class="content_title">{{item.title}}</view> |
| 29 | 29 | <view class="content_content">{{item.introduction}}</view> |
| 30 | -<<<<<<< HEAD | |
| 31 | - <view class="zar_box"> | |
| 32 | - <image class="zar_img" src="../../source/like.png"></image> | |
| 33 | -======= | |
| 34 | 30 | <view class="zar_box" bindtap="articleLike" data-categaryIndex="{{sectionIndex}}" data-artIndex="{{index}}"> |
| 35 | 31 | <image class="zar_img" src="../../source/{{item.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image> |
| 36 | ->>>>>>> c0652f9e89ff8c2538249d6ec04fdfcb0b5777f2 | |
| 37 | 32 | <view class="content_zar">{{item.likeCount}}</view> |
| 38 | 33 | </view> |
| 39 | 34 |