miniprogram / shuhou · 提交

转到一个项目

作者 liaolinfeng
提交 9290edb9d54ff2e561cc3b114751ba280252d1af 1 个父辈 158ae144

add

内嵌 并排对比
正在显示 7 个修改的文件 包含 118 行增加 和 17 行删除
@@ -8,7 +8,7 @@ Page({ @@ -8,7 +8,7 @@ Page({
8 * 页面的初始数据 8 * 页面的初始数据
9 */ 9 */
10 data: { 10 data: {
11 - showdoctor: true, //是否显示首页医生信息 11 + showdoctor: false, //是否显示首页医生信息
12 show_notest: false, //显示有记录和无记录之间的切换 12 show_notest: false, //显示有记录和无记录之间的切换
13 showfilesLog: false, //是否显示最新记录(没有记录不显示) 13 showfilesLog: false, //是否显示最新记录(没有记录不显示)
14 showdoc_adv:true, 14 showdoc_adv:true,
@@ -21,8 +21,17 @@ Page({ @@ -21,8 +21,17 @@ Page({
21 per_page: 2, //每页病情记录的条数 21 per_page: 2, //每页病情记录的条数
22 last_page:null,//最后一页 22 last_page:null,//最后一页
23 line_rows: 10, //每页趋势图的个数 23 line_rows: 10, //每页趋势图的个数
  24 + tab:1,//1表示白细胞计数，2表示中粒细胞计数，3血红蛋白，4血小板
24 FilesLogList: [] 25 FilesLogList: []
25 }, 26 },
  27 + settab(e){
  28 + console.log(e);
  29 + let that=this;
  30 + that.setData({
  31 + tab:e.currentTarget.dataset.tab
  32 + })
  33 + that.getFilesLogLine();
  34 + },
26 //切换显示记录于趋势图 35 //切换显示记录于趋势图
27 setshowrecord() { 36 setshowrecord() {
28 let that=this; 37 let that=this;
@@ -5,26 +5,42 @@ @@ -5,26 +5,42 @@
5 <cover-view class="record_left {{showrecord?'':'active'}}" bindtap='setshowrecord'>病情记录</cover-view> 5 <cover-view class="record_left {{showrecord?'':'active'}}" bindtap='setshowrecord'>病情记录</cover-view>
6 </cover-view> 6 </cover-view>
7 7
8 - <view class='container_box' wx:if='{{showrecord}}'> 8 +<view class='container_box' wx:if='{{showrecord}}'>
  9 +
9 <view class="container"> 10 <view class="container">
10 - <view class='container_txt'>白细胞</view> 11 + <view class='container_top'>
  12 + <view class='top_left' style=" background-image:url('../../img/pre.png')"></view>
  13 + <view>6月7日-6月13日</view>
  14 + <view class='top_rigth' style=" background-image:url('../../img/next.png')"></view>
  15 + </view>
  16 + <view class='container_contertab'>
  17 + <view class="contertab {{tab==1?'contertab_active':''}}" data-tab='1' bindtap='settab'>白细胞计数</view>
  18 + <view class="contertab {{tab==2?'contertab_active':''}}" data-tab='2' bindtap='settab'>中性粒细胞</view>
  19 + <view class="contertab {{tab==3?'contertab_active':''}}" data-tab='3' bindtap='settab'>血红蛋白</view>
  20 + <view class="contertab {{tab==4?'contertab_active':''}}" data-tab='4' bindtap='settab'>血小板</view>
  21 + </view>
  22 + <view class='tab_content'>
  23 + <!-- 白细胞 -->
  24 + <view wx:if='{{tab==1}}'>
11 <canvas class="canvas" canvas-id="lineCanvaswhite" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerwhite"></canvas> 25 <canvas class="canvas" canvas-id="lineCanvaswhite" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerwhite"></canvas>
12 </view> 26 </view>
13 - <view class="container">  
14 - <view class='container_txt'>中性粒细胞</view> 27 + <!-- 中性粒细胞 -->
  28 + <view wx:if='{{tab==2}}'>
15 <canvas class="canvas" canvas-id="lineCanvasneutrophils" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerneutrophils"></canvas> 29 <canvas class="canvas" canvas-id="lineCanvasneutrophils" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerneutrophils"></canvas>
16 </view> 30 </view>
17 - <view class="container">  
18 - <view class='container_txt'>血红蛋白</view> 31 + <!-- 血红蛋白 -->
  32 + <view wx:if='{{tab==3}}'>
19 <canvas class="canvas" canvas-id="lineCanvashemoglobin" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerhemoglobin"></canvas> 33 <canvas class="canvas" canvas-id="lineCanvashemoglobin" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerhemoglobin"></canvas>
20 </view> 34 </view>
21 - <view class="container">  
22 - <view class='container_txt'>血小板</view> 35 + <!-- 血小板 -->
  36 + <view wx:if='{{tab==4}}'>
23 <canvas class="canvas" canvas-id="lineCanvasplatelet" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerplatelet"></canvas> 37 <canvas class="canvas" canvas-id="lineCanvasplatelet" disable-scroll="true" class="canvas" bindtouchstart="touchHandlerplatelet"></canvas>
24 </view> 38 </view>
25 </view> 39 </view>
26 - <!-- 病情记录 -->  
27 - <scroll-view class='file_plan' wx:else scroll-y bindscrolltolower='scrollbottom'> 40 + </view>
  41 +</view>
  42 +<!-- 病情记录 -->
  43 +<scroll-view class='file_plan' wx:else scroll-y bindscrolltolower='scrollbottom'>
28 <view class='plan_item1' wx:for='{{FilesLogList}}' wx:key> 44 <view class='plan_item1' wx:for='{{FilesLogList}}' wx:key>
29 <view class='title_box'> 45 <view class='title_box'>
30 <view>{{item.create_time}}</view> 46 <view>{{item.create_time}}</view>
@@ -90,7 +106,7 @@ @@ -90,7 +106,7 @@
90 </view> 106 </view>
91 </view> 107 </view>
92 <view class='addnomore' wx:if='{{shownomore}}'>——没有更多数据了——</view> 108 <view class='addnomore' wx:if='{{shownomore}}'>——没有更多数据了——</view>
93 - </scroll-view> 109 +</scroll-view>
94 110
95 <!-- 趋势图 --> 111 <!-- 趋势图 -->
96 <!-- <view class="container" wx:if='{{showrecord}}'> 112 <!-- <view class="container" wx:if='{{showrecord}}'>
@@ -11,7 +11,7 @@ ec-canvas { @@ -11,7 +11,7 @@ ec-canvas {
11 height: 100%; 11 height: 100%;
12 } 12 }
13 .container{ 13 .container{
14 -height:530rpx; 14 +height:620rpx;
15 margin:30rpx 30rpx 0 30rpx; 15 margin:30rpx 30rpx 0 30rpx;
16 box-sizing:border-box; 16 box-sizing:border-box;
17 background:#fff; 17 background:#fff;
@@ -21,7 +21,8 @@ border-radius:20rpx; @@ -21,7 +21,8 @@ border-radius:20rpx;
21 box-shadow:0 0 100rpx #DADADA; 21 box-shadow:0 0 100rpx #DADADA;
22 } 22 }
23 .container canvas{ 23 .container canvas{
24 - height: 500rpx; 24 + width:100%;
  25 + height: 400rpx;
25 } 26 }
26 .container_txt{ 27 .container_txt{
27 color:#999; 28 color:#999;
@@ -143,3 +144,71 @@ z-index:100; @@ -143,3 +144,71 @@ z-index:100;
143 .page_body{ 144 .page_body{
144 flex: 1; 145 flex: 1;
145 } 146 }
  147 +.container_top{
  148 + margin: 0 30rpx;
  149 + color:#333;
  150 + font-size:26rpx;
  151 + padding:28rpx 0 30rpx 0;
  152 + display: flex;
  153 + justify-content: space-between;
  154 + align-items: center;
  155 + border-bottom: 1rpx solid #d8d8d8;
  156 +}
  157 +.top_left{
  158 + width:120rpx;
  159 + height: 44rpx;
  160 + border-radius: 5rpx;
  161 + background-position: center;
  162 + background-repeat: no-repeat;
  163 + background-size: cover;
  164 +}
  165 +.top_rigth{
  166 + width:120rpx;
  167 + height: 44rpx;
  168 + border-radius: 5rpx;
  169 + background-position: center;
  170 + background-repeat: no-repeat;
  171 + background-size: cover;
  172 +}
  173 +.container_contertab{
  174 + margin: 30rpx 30rpx;
  175 + box-sizing: border-box;
  176 + border-bottom: 1rpx solid #d8d8d8;
  177 + height: 60rpx;
  178 + border: 2rpx solid #3AA0EA;
  179 +border-radius: 30rpx;
  180 +display: flex;
  181 +align-items: center;
  182 +overflow: hidden;
  183 +justify-content: space-around;
  184 +}
  185 +.contertab{
  186 + width:25%;
  187 + height: 100%;
  188 + position: relative;
  189 + color:#3AA0EA;
  190 + font-size:24rpx;
  191 +
  192 +
  193 + display: flex;
  194 + justify-content: center;
  195 + align-items: center;
  196 +}
  197 +.contertab.contertab_active{
  198 + background: #3AA0EA;
  199 + color:#fff;
  200 +}
  201 +.contertab::after{
  202 + content: '';
  203 + position: absolute;
  204 + top:14rpx;
  205 + right: 0rpx;
  206 + width:3rpx;
  207 + height: 34rpx;
  208 + background: #3AA0EA;
  209 +}
  210 +.contertab:last-child::after{
  211 + content: '';
  212 + background: #fff;
  213 + opacity: 0;
  214 +}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 "libVersion": "2.4.0", 14 "libVersion": "2.4.0",
15 "appid": "wx0a0da51e3b931fad", 15 "appid": "wx0a0da51e3b931fad",
16 - "projectname": "%E6%9C%AF%E5%90%8E%E5%B0%8F%E7%A8%8B%E5%BA%8F(%E6%8F%90%E4%BA%A4%E7%BB%99%E5%AE%A2%E6%88%B7)", 16 + "projectname": "%E6%9C%AF%E5%90%8E%EF%BC%8820181119%EF%BC%89",
17 "debugOptions": { 17 "debugOptions": {
18 "hidedInDevtools": [] 18 "hidedInDevtools": []
19 }, 19 },
@@ -36,8 +36,15 @@ @@ -36,8 +36,15 @@
36 "list": [] 36 "list": []
37 }, 37 },
38 "miniprogram": { 38 "miniprogram": {
39 - "current": -1,  
40 - "list": [] 39 + "current": 0,
  40 + "list": [
  41 + {
  42 + "id": -1,
  43 + "name": "record",
  44 + "pathName": "pages/record/record",
  45 + "query": "showrecord=1&files_id=84"
  46 + }
  47 + ]
41 } 48 }
42 } 49 }
43 } 50 }