From 6605b015f6827cce407b107a5c5dfe6b05a0158d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=B0?= <1074472615@qq.com>
Date: Thu, 6 Dec 2018 15:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E7=9D=A1=E8=A7=89=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/add_record/index.wxml     | 20 +++++++++++++++-----
 template/operate_btn/index.wxml |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pages/add_record/index.wxml b/pages/add_record/index.wxml
index 6c044b8..311bc9d 100644
--- a/pages/add_record/index.wxml
+++ b/pages/add_record/index.wxml
@@ -16,16 +16,16 @@
     <view class="category">
       <view wx:for="{{categorys}}">
         <view class="eat_category_btn {{selectIndex == index ? 'selected' : ''}}" bindtap='tapCategory' data-index='{{index}}'>
-        {{item}}
+          {{item}}
         </view>
       </view>
     </view>
     <view class='kg-separater'></view>
     <!-- 数量 -->
     <view style='margin:20rpx'>
-      <template is='quantity_cell' data="{{type:'input'}}"></template>
-      <template is='quantity_cell' data="{{type:'input'}}"></template>
-      <template is='quantity_cell' data="{{type:'select'}}"></template>
+      <template is='quantity_cell' data="{{type:'input',unit:'毫升'}}"></template>
+      <template is='quantity_cell' data="{{type:'input',unit:'毫升'}}"></template>
+      <template is='quantity_cell' data="{{type:'select',unit:'毫升'}}"></template>
     </view>
     <view class='kg-separater'></view>
     <template is="section_header" data="{{title:'今日拍照'}}"></template>
@@ -44,6 +44,16 @@
     </view>
   </scroll-view>
 </view>
-<view hidden='{{controlIndex != 1}}'>睡觉</view>
+
+<!-- 睡觉 -->
+<view hidden='{{controlIndex != 1}}'></view>
+<!-- 滑动区域 -->
+<scroll-view style='height:calc(100vh - 50px - 2rpx - 20rpx - 140rpx)' scroll-y='true'>
+  <view style='margin:20rpx'>
+    <template is='quantity_cell' data="{{type:'input',unit:'分钟'}}"></template>
+    <template is='quantity_cell' data="{{type:'input',unit:'分钟'}}"></template>
+    <template is='quantity_cell' data="{{type:'select',unit:'分钟'}}"></template>
+  </view>
+</scroll-view>
 <view hidden='{{controlIndex != 2}}'>WC</view>
 <template is="operate_btn" data="{{title:'保存'}}"></template>
\ No newline at end of file
diff --git a/template/operate_btn/index.wxml b/template/operate_btn/index.wxml
index b767eaa..33bd6f4 100644
--- a/template/operate_btn/index.wxml
+++ b/template/operate_btn/index.wxml
@@ -22,7 +22,7 @@
     <view class='g-text-normal-dark'>张小华</view>
     <view class='kg-flex-row' hidden="{{type != 'input'}}">
       <input class='kg-border' style='width:140rpx;margin-right:10rpx;'></input>
-      <view class='kg-text-normal-gray'>毫升</view>
+      <view class='kg-text-normal-gray'>{{unit}}</view>
     </view>
     <view class='kg-flex-row' hidden="{{type != 'select'}}">
       <view wx:for="{{['少','正常','多']}}">
-- 
2.18.1