luoye / littleApp_child

Download as
Browse Code »

Commit 6aa8676478e0a84abd4dd81d48e236765c8999c7

Authored by luoye
1 parent 415c920d71
Exists in master and in 2 other branches dev-wrh, dev_wjl

调整

Showing 17 changed files with 55 additions and 52 deletions

littleApp_child/pages/SearchPage/SearchPage.wxml View file @ 6aa8676
... ... @@ -8,10 +8,10 @@
8 8 <view class="searchBar_bar_cancle" bindtap="back">取消</view>
9 9 </view>
10 10 <!-- 建议标签 -->
11   - <!-- <view class="recommend_labels">
12   - <view catchtap="clickLabel" data-categary="lable" class="recommend_label">什么东东</view>
13   - <view class="recommend_label">什么东东啊</view>
14   - </view> -->
  11 + <view class="recommend_labels">
  12 + <view catchtap="clickLabel" data-categary="lable" class="recommend_label">搜索标签</view>
  13 + <view class="recommend_label">搜索标签</view>
  14 + </view>
15 15 <!-- 搜索历史 -->
16 16 <view class="history_list" wx:if="{{getSearch.length > 0 && !searching}}">
17 17 <view class="history_list_content">
littleApp_child/pages/Setting/Setting.js View file @ 6aa8676
... ... @@ -7,13 +7,13 @@
7 7  
8 8 Page({
9 9 data: {
10   - setList: [{ icon: '../../source/jianchajilu.png', text: '我的预约', right_text:'',margin:0},
11   - { icon: '../../source/jianchajilu.png', text: '儿童档案', right_text: '', margin: 10 },
12   - { icon: '../../source/jianchajilu.png', text: '消息提醒', right_text: '', margin: 0 },
13   - { icon: '../../source/jianchajilu.png', text: '交易记录', right_text: '', margin: 0 },
14   - { icon: '../../source/jianchajilu.png', text: '我的收藏', right_text: '', margin: 10 },
15   - { icon: '../../source/jianchajilu.png', text: '用户反馈', right_text: '', margin: 0 },
16   - { icon: '../../source/jianchajilu.png', text: '清楚缓存', right_text: '0.2 MB', margin:10} ],
  10 + setList: [{ icon: '../../source/set_yuyue.png', text: '我的预约', right_text:'',margin:0},
  11 + { icon: '../../source/set_dangan.png', text: '儿童档案', right_text: '', margin: 10 },
  12 + { icon: '../../source/set_xiaoxi.png', text: '消息提醒', right_text: '', margin: 0 },
  13 + { icon: '../../source/set_jiaoyi.png', text: '交易记录', right_text: '', margin: 0 },
  14 + { icon: '../../source/set_shoucang.png', text: '我的收藏', right_text: '', margin: 10 },
  15 + { icon: '../../source/set_fankui.png', text: '用户反馈', right_text: '', margin: 0 },
  16 + { icon: '../../source/set_huancun.png', text: '清楚缓存', right_text: '0.2 MB', margin:10} ],
17 17 isShowOne: false,
18 18 isShowTwo: false,
19 19 isShowThree: false,
littleApp_child/pages/Setting/Setting.wxml View file @ 6aa8676
... ... @@ -40,4 +40,5 @@
40 40 <view class="line" wx:if="{{item.margin == 0}}"></view>
41 41 </block>
42 42 <view class="btn" bindtap='logout'>退出登录</view>
  43 +<view style="height:40px;"></view>
littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxml View file @ 6aa8676
1 1 <view class="main">
2 2 <view class="title_text">{{knowledge.title}}</view>
3   - <!-- <view class="art_labels">
4   - <view class="article_label">啦啦</view>
5   - <view class="article_label">啦啦</view>
6   - <view class="article_label">啦啦</view>
7   - </view> -->
  3 + <view class="art_labels">
  4 + <view class="article_label">文章标签</view>
  5 + <view class="article_label">文章标签</view>
  6 + <view class="article_label">文章标签</view>
  7 + </view>
8 8 <view class="zar_box" style="margin-left:8px;" wx:if="{{knowledge}}">
9 9 <view class="zar_box" bindtap="articleLike">
10 10 <image class="zar_img" src="../../source/{{knowledge.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image>
littleApp_child/pages/home/home.js View file @ 6aa8676
... ... @@ -186,9 +186,6 @@
186 186 },
187 187 toLogin() {
188 188 var that = this
189   - wx.pageScrollTo({
190   - scrollTop: 0,
191   - })
192 189 that.setData({
193 190 pageType: 1
194 191 })
195 192  
... ... @@ -206,9 +203,9 @@
206 203 },
207 204 calculatePageSize() {
208 205 var windowWidth = wx.getSystemInfoSync().windowWidth
209   - var smallWidth = ((windowWidth - 10) / 2 - 10)
  206 + // var smallWidth = ((windowWidth - 10) / 2 - 10)
210 207 this.setData({
211   - item_big_height: 'height:' + windowWidth / 4 + 'px',
  208 + // item_big_height: 'height:' + windowWidth / 4 + 'px',
212 209 item_small: 'width:' + windowWidth / 4 * 0.45 + 'px;height:' + windowWidth / 4 * 0.45 + 'px',
213 210 })
214 211 },
littleApp_child/pages/home/home.wxml View file @ 6aa8676
... ... @@ -60,10 +60,10 @@
60 60 <image src="../../source/xiaoxitongzhi.png" style="{{item_small}}" class="foundation_item_small_image"></image>
61 61 <view class="foundation_item_small_text">消息通知</view>
62 62 </navigator>
63   - <!-- <navigator class="foundation_item_small" url="">
64   - <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
65   - <view class="foundation_item_small_text">设置</view>
66   - </navigator> -->
  63 + <navigator class="foundation_item_small" url="../Setting/Setting">
  64 + <image src="../../source/except.png" style="{{item_small}};margin-top:5px;" class="foundation_item_small_image"></image>
  65 + <view class="foundation_item_small_text">设置</view>
  66 + </navigator>
67 67 </view>
68 68  
69 69 <!--文章列表-->
70 70  
71 71  
... ... @@ -89,13 +89,13 @@
89 89 <image class="article_content_bottomBar_likes_icon" src="../../source/{{item.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image>
90 90 <label class="article_content_bottomBar_likes_text">{{item.likeCount ? item.likeCount : 0}}</label>
91 91 <!-- 文章收藏 -->
92   - <!-- <image class="article_content_bottomBar_likes_icon" src="../../source/{{item.isLike == 1 ? 'save_not.png' : 'save_not.png'}}"></image> -->
93   - <!-- <label class="article_content_bottomBar_likes_text">{{item.likeCount ? item.likeCount : 0}}</label> -->
  92 + <image class="article_content_bottomBar_likes_icon" src="../../source/{{item.isLike == 1 ? 'save_not.png' : 'save_not.png'}}"></image>
  93 + <label class="article_content_bottomBar_likes_text">{{item.likeCount ? item.likeCount : 0}}</label>
94 94 </view>
95   - <!-- <view class="article_content_bottomBar_labels">
  95 + <view class="article_content_bottomBar_labels">
96 96 <view catchtap="clickLabel" data-categary="lable" style="float: right" class="article_label">什么东东</view>
97 97 <view class="article_label" style="float: right">什么东东啊</view>
98   - </view> -->
  98 + </view>
99 99 </view>
100 100 </navigator>
101 101 </block>
littleApp_child/pages/home/home.wxss View file @ 6aa8676
... ... @@ -154,7 +154,7 @@
154 154 .foundation_BG {
155 155 width: 100%;
156 156 display: flex;
157   - flex-wrap: nowrap;
  157 + flex-wrap: wrap;
158 158 background: white;
159 159 }
160 160  
littleApp_child/pages/mySaved/mySaved.js View file @ 6aa8676
... ... @@ -16,7 +16,7 @@
16 16 data: {
17 17 list: [
18 18 {
19   - checked: false, id: 1, title: "title1", introduction: "introductionintroductionintroductionintroductionintroductionintroductionintroduction", isLike: 1, likeCount:2,image:{
  19 + checked: true, id: 1, title: "title1", introduction: "introductionintroductionintroductionintroductionintroductionintroductionintroduction", isLike: 1, likeCount:2,image:{
20 20 medium:"https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=4131634322,487666839&fm=26&gp=0.jpg"
21 21  
22 22 } },
23 23  
24 24  
25 25  
... ... @@ -65,24 +65,27 @@
65 65  
66 66  
67 67 },
68   - checkboxChange: function (e) {
  68 + clickCell(e){
  69 + if (this.data.isShowCheckbox){
69 70 console.log(e)
70   - if (this.data.isShowCheckbox){
71   - var self = this
72   - var id = e.target.dataset.id
73   - var checked = e.target.dataset.checked ? false : true
74   - console.log(this.data.list)
75   - for (var i = 0; i < this.data.list.length; i++) {
76   - if (id == this.data.list[i].id) {
77   - this.data.list[i].checked = checked
78   - }
  71 + if (this.data.isShowCheckbox) {
  72 + var self = this
  73 + var id = e.currentTarget.dataset.id
  74 + var checked = e.currentTarget.dataset.checked ? false : true
  75 + console.log(this.data.list)
  76 + for (var i = 0; i < this.data.list.length; i++) {
  77 + if (id == this.data.list[i].id) {
  78 + this.data.list[i].checked = !this.data.list[i].checked
79 79 }
80   - // console.log(this.data.list)
81   - this.setData({
82   - list: this.data.list
83   - })
  80 + }
  81 + // console.log(this.data.list)
  82 + this.setData({
  83 + list: this.data.list
  84 + })
84 85 }
85   -
  86 + } else {
  87 +
  88 + }
86 89 },
87 90 showChoose: function (e) {
88 91 var self = this
littleApp_child/pages/mySaved/mySaved.wxml View file @ 6aa8676
... ... @@ -4,12 +4,13 @@
4 4 <scroll-view scroll-y="true" style="height: 100%;" bindscrolltolower="loadMore">
5 5 <!--list的item-->
6 6 <view class="">
7   - <view wx:for="{{list}}" style="display: flex">
  7 + <block wx:for="{{list}}" >
  8 + <view bindtap='clickCell' style="display: flex" data-id="{{item.id}}" data-checked="{{item.checked}}">
8 9  
9   - <image wx:if="{{isShowCheckbox}}" class="check_image" src="../../source/{{item.checked ? 'checkBox_yes.png' :'checkBox_no.png'}}" mode='aspectFit' bindtap="checkboxChange" data-id="{{item.id}}" data-checked="{{item.checked}}"></image>
  10 + <image wx:if="{{isShowCheckbox}}" class="check_image" src="../../source/{{item.checked ? 'checkBox_yes.png' :'checkBox_no.png'}}" mode='aspectFit'></image>
10 11 <view class="content_item">
11 12 <view style="margin-right:75px;">
12   - <view class="content_title">{{item.title}}</view>
  13 + <view class="content_title">{{item.id}}</view>
13 14 <view class="content_content">{{item.introduction}}</view>
14 15 <view class="zarparent_box">
15 16  
16 17  
17 18  
... ... @@ -32,10 +33,11 @@
32 33 <view class="home__list-item__bottom"></view>
33 34 </view>
34 35  
35   -
36 36 </view>
  37 + </block>
37 38  
38 39 <view class="loadMoreView" wx:if="{{hasMore}}">加载更多...</view>
  40 + <view style='height:60px'></view>
39 41 </view>
40 42  
41 43 </scroll-view>
littleApp_child/pages/mySaved/mySaved.wxss View file @ 6aa8676
... ... @@ -8,7 +8,7 @@
8 8 width: 20px;
9 9 height: 20px;
10 10 margin-left: 10px;
11   - transform: translateY(-65px);
  11 + transform: translateY(60px);
12 12 }
13 13  
14 14 .content_item {
littleApp_child/source/set_dangan.png View file @ 6aa8676

1.61 KB
littleApp_child/source/set_fankui.png View file @ 6aa8676

1.73 KB
littleApp_child/source/set_huancun.png View file @ 6aa8676

1.87 KB
littleApp_child/source/set_jiaoyi.png View file @ 6aa8676

2.01 KB
littleApp_child/source/set_shoucang.png View file @ 6aa8676

2.04 KB
littleApp_child/source/set_xiaoxi.png View file @ 6aa8676

1.95 KB
littleApp_child/source/set_yuyue.png View file @ 6aa8676

2.5 KB