From 526a7505a7bb5403eb214efe3945323b55b1df6d Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Mon, 28 Nov 2022 16:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/task/index.js         | 12 ++++++++---
 pages/taskDetail/index.js   | 27 ++++++++++++++++++++++--
 pages/taskDetail/index.json |  3 ++-
 pages/taskDetail/index.wxml | 42 ++++++++++++++++++++++++-------------
 4 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/pages/task/index.js b/pages/task/index.js
index f5019eb..06ed466 100644
--- a/pages/task/index.js
+++ b/pages/task/index.js
@@ -44,9 +44,9 @@ Page({
             mask: true,
         })
         app.$api.taskList({}).then(res =>{
-            this.setData({
-                taskList:res.data.taskList,
-            })
+            // this.setData({
+            //     taskList:res.data.taskList,
+            // })
             let data = res.data || {
                 taskList: [],
                 over: false
@@ -190,5 +190,11 @@ Page({
         setTimeout(() => {
             this.refresh();
         }, 350);
+    },
+
+    handleClick(){
+        wx.navigateTo({
+            url: '/pages/taskDetail/index'
+        });
     }
 })
diff --git a/pages/taskDetail/index.js b/pages/taskDetail/index.js
index 86167c5..b234ba8 100644
--- a/pages/taskDetail/index.js
+++ b/pages/taskDetail/index.js
@@ -4,9 +4,19 @@ Page({
         mode: '',
         alertVisible: false,
         completeVisible: false,
+        repeatVisible: false,
+        repeatKey: [
+            { label: '每1天', value: '1' },
+            { label: '工作日', value: '2' },
+            { label: '每1周', value: '3' },
+            { label: '每1月', value: '4' },
+            { label: '每1年', value: '5' },
+        ],
         date: new Date('2021-12-23').getTime(), // 支持时间戳传入
         alertText: '',
         completeText: '',
+        repeatText: '',
+        repeatValue: '',
         // 指定选择区间起始值
         start: '2008-01-01 00:00:00',
         end: '2040-12-31 23:59:59',
@@ -46,9 +56,22 @@ Page({
         this.hidePicker();
     },
 
-    onColumnChange(e) {
-        console.log('pick', e?.detail?.value);
+    onPickerConfirm(e) {
+        const { label,value } = e?.detail;
+        this.setData({
+            repeatText : label,
+            repeatValue: value
+        });
+        this.hidePicker();
     },
 
+    submitTask() {
+        //TODO 新增或者修改
+        console.log('保存成功')
+        wx.redirectTo({
+            url: '../task/index'
+        })
+    }
+
 
 });
diff --git a/pages/taskDetail/index.json b/pages/taskDetail/index.json
index bf45ea0..a308912 100644
--- a/pages/taskDetail/index.json
+++ b/pages/taskDetail/index.json
@@ -3,6 +3,7 @@
     "t-date-time-picker": "../../components/date-time-picker/date-time-picker",
     "t-picker": "../../components/picker/picker",
     "t-picker-item": "../../components/picker/picker-item",
-    "t-switch": "../../components/switch/switch"
+    "t-switch": "../../components/switch/switch",
+    "t-button": "../../components/button/button"
   }
 }
diff --git a/pages/taskDetail/index.wxml b/pages/taskDetail/index.wxml
index 252ff2e..4376f0d 100644
--- a/pages/taskDetail/index.wxml
+++ b/pages/taskDetail/index.wxml
@@ -19,21 +19,21 @@
         t-class="pannel-item"
         t-class-note="{{alertText ? 'sub-text' : 'empty'}}"
 />
-<t-picker
-        visible="{{cityVisible}}"
-        value="{{cityValue}}"
-        data-key="city"
-        title="{{pickerTitle}}"
-        cancelBtn="取消"
-        confirmBtn="确认"
-        bindchange="onPickerChange"
-        bindpick="onColumnChange"
-        bindcancel="onPickerCancel"
->
-    <t-picker-item options="{{citys}}"></t-picker-item>
-</t-picker>
+<t-cell
+        title="任务重复"
+        hover
+        note="{{repeatText || '选择重复周期'}}"
+        arrow
+        data-mode="repeat"
+        bindtap="showPicker"
+        t-class="pannel-item"
+        t-class-note="{{repeatText ? 'sub-text' : 'empty'}}"
+/>
+<t-textarea label="备注" placeholder="请输入任务备注..." maxcharacter="200" />
+<t-button t-class="external-class" theme="primary" block bind:tap="submitTask">保存</t-button>
+<input value="{{repeatValue}}" hidden/>
 <t-date-time-picker
-        title="选择日期1"
+        title="完成日期"
         visible="{{completeVisible}}"
         mode="date"
         defaultValue="{{date}}"
@@ -45,7 +45,7 @@
         end="{{end}}"
 ></t-date-time-picker>
 <t-date-time-picker
-        title="选择日期2"
+        title="截止日期"
         visible="{{alertVisible}}"
         mode="date"
         defaultValue="{{date}}"
@@ -56,3 +56,15 @@
         start="{{start}}"
         end="{{end}}"
 ></t-date-time-picker>
+<t-picker
+        visible="{{repeatVisible}}"
+        value="{{repeatText}}"
+        data-key="repeatKey"
+        title="请选择重复周期"
+        cancelBtn="取消"
+        confirmBtn="确认"
+        bindchange="onPickerConfirm"
+        bindpick="onColumnChange"
+>
+    <t-picker-item options="{{repeatKey}}"></t-picker-item>
+</t-picker>