Commit de484b386c497be9a56467138389ddf6e178637c

Authored by luoye

Merge branch 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child

* 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child:
  no message

Showing 4 changed files

littleApp_child/pages/checkTabList/checkTabList.js View file @ de484b3
... ... @@ -19,7 +19,9 @@
19 19 // , { likeCount: 12, title: "title2", introduction: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
20 20 // , { likeCount: 12, title: "title2", introduction: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
21 21 ],
22   -
  22 + flag:false,
  23 + showTitle:'',
  24 + showContent:'',
23 25 titles: ["问诊检查", "儿科检查", "一般检查", "辅助检查"],
24 26 current_index: 0,
25 27 //问诊检查
... ... @@ -82,7 +84,6 @@
82 84 var index = parseInt(e.current_index + "")
83 85 this.setData({
84 86 current_index: index
85   -
86 87 })
87 88 if (this.data.current_index == 0) {
88 89 this.requestDataWZ()
89 90  
90 91  
... ... @@ -93,25 +94,32 @@
93 94 } else if (this.data.current_index == 3) {
94 95 this.requestDataFZ()
95 96 }
96   -
97   -
98 97 },
99 98 onUnload: function () {
100 99  
101 100 },
102 101 /*---------事件处理函数--------*/
103 102 showMoreContent: function (e) {
104   - var content = e.currentTarget.dataset.content
105   - var title = e.currentTarget.dataset.title
106   - wx.showModal({
107   - title: title,
108   - content: content,
109   - showCancel: false,
110   - confirmText: '知道了',
111   - confirmColor: '#48C17B'
  103 + var content = e.currentTarget.dataset.content // + "问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问诊检查问"
  104 + var title = e.currentTarget.dataset.title
  105 + // wx.showModal({
  106 + // title: title,
  107 + // content: content,
  108 + // showCancel: false,
  109 + // confirmText: '知道了',
  110 + // confirmColor: '#48C17B'
  111 + // })
  112 + this.setData({
  113 + flag: true,
  114 + showTitle: title,
  115 + showContent: content,
112 116 })
113 117 },
114   -
  118 + closeMask:function(){
  119 + this.setData({
  120 + flag: false,
  121 + })
  122 + },
115 123  
116 124 titleClick: function (e) {
117 125 // console.log(e)
littleApp_child/pages/checkTabList/checkTabList.json View file @ de484b3
1 1 {
2 2 "navigationBarBackgroundColor": "#48C17B ",
3   - "navigationBarTitleText": "育儿知识",
  3 + "navigationBarTitleText": "检查项目",
4 4 "navigationBarTextStyle": "white",
5 5 "backgroundColor": "#d8dbd4"
6 6 }
littleApp_child/pages/checkTabList/checkTabList.wxml View file @ de484b3
... ... @@ -305,4 +305,16 @@
305 305 </view>
306 306  
307 307 </view>
  308 +
  309 +
  310 +<view class="mask_subscribe_bg1" wx:if="{{flag}}">
  311 + <view class="mask_subscribe_content1">
  312 + <view class="mask_subscribe_title1">{{showTitle}}</view>
  313 + <view class="mask_subscribe_time1">
  314 + <label class="mask_subscribe_content_text1">{{showContent}}</label>
  315 + </view>
  316 +
  317 + <view class="mask_subscribe_content_closeBtn1" bindtap="closeMask">知道了</view>
  318 + </view>
  319 + </view>
littleApp_child/pages/checkTabList/checkTabList.wxss View file @ de484b3
... ... @@ -113,4 +113,65 @@
113 113 padding-bottom: 5px;
114 114 min-height:30px;
115 115 }
  116 +
  117 +
  118 +/* 模板--遮罩 */
  119 +.mask_subscribe_bg1{
  120 + position:fixed;
  121 + width:100%;
  122 + height:100%;
  123 + top:0px;
  124 + background:rgba(0,0,0,0.4);
  125 + overflow: hidden;
  126 +}
  127 +
  128 +.mask_subscribe_content1{
  129 + /* width: 90%;*/
  130 + margin:35% auto;
  131 + overflow: hidden;
  132 + background-color: #fff;
  133 + border-radius: 4px;
  134 + padding-bottom: 20px;
  135 + width: 280px;
  136 + min-height: 180px;
  137 + font-size: 14px;
  138 + color: #333333;
  139 +}
  140 +
  141 +.mask_subscribe_title1 {
  142 + width: 100%;
  143 + text-align: center;
  144 + margin-top: 30px;
  145 + font-size: 20px;
  146 + color: #333333;
  147 + letter-spacing: 0;
  148 + line-height: 20px;
  149 + font-family: PingFang-SC-Medium;
  150 +}
  151 +
  152 +.mask_subscribe_time1 {
  153 + margin-top: 30px;
  154 + margin-left: 40px;
  155 + margin-right: 15px;
  156 +
  157 +}
  158 +
  159 +
  160 +
  161 + .mask_subscribe_content_text1 {
  162 + color: #666666;
  163 + }
  164 +
  165 + .mask_subscribe_content_closeBtn1 {
  166 + font-size: 14px;
  167 + color: #FFFFFF;
  168 + background: #48C17B;
  169 + border-radius: 100px;
  170 + width: 160px;
  171 + height: 32px;
  172 + margin-top: 50px;
  173 + text-align: center;
  174 + margin-left: calc(50% - 80px);
  175 + line-height: 32px;
  176 + }