From 5656daeb79c6d4d3f9fc78f981c7faf96582d2f1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 11 八月 2022 14:24:29 +0800
Subject: [PATCH] 登录注册模块、
---
pages/promise/promise.js | 169 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 61 deletions(-)
diff --git a/pages/promise/promise.js b/pages/promise/promise.js
index ea77b2e..6ad099e 100644
--- a/pages/promise/promise.js
+++ b/pages/promise/promise.js
@@ -1,5 +1,6 @@
// pages/promise/promise.js
const moment = require('../../utils/moment.min')
+const promiseservice = require("../../service/promiseservice")
const app = getApp()
Page({
@@ -10,48 +11,33 @@
data: {
text1: "宸插紑鍚�!璇峰強鏃跺畬鎴愭壙璇�",
text3: "鍘绘壙璇�",
+ status: 0,
+
promise: [{
period: '鎵胯鍛ㄦ湡锛�2021骞�1鏈垀2021骞�12鏈�',
- time: '2021骞�1鏈�6鏃ュ畬鎴�'
- }, {
- period: '鎵胯鍛ㄦ湡锛�2020骞�1鏈垀2020骞�12鏈�',
- time: '2020骞�1鏈�6鏃ュ畬鎴�'
+ time: '2021骞�1鏈�6鏃ュ畬鎴�',
+ picPath: '',
+ pdfPath: ''
}],
- newPromise: [{
- period: '鎵胯鍛ㄦ湡锛�2022骞�1鏈垀2022骞�12鏈�',
- time: '2022骞�5鏈�10鏃ュ畬鎴�'
- },{
- period: '鎵胯鍛ㄦ湡锛�2021骞�1鏈垀2021骞�12鏈�',
- time: '2021骞�1鏈�6鏃ュ畬鎴�'
- }, {
- period: '鎵胯鍛ㄦ湡锛�2020骞�1鏈垀2020骞�12鏈�',
- time: '2020骞�1鏈�6鏃ュ畬鎴�'
- }],
- deadline: "----骞�--鏈�--鏃�",
+ deadline: "鎵胯鎴鏃堕棿锛�----骞�--鏈�--鏃�",
},
+
+ promiseHistory: [],
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
this._initPlanYear()
+ // this.getCommitment()
},
- /**
+ /**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow: function () {
- var that = this
- wx.getStorage({
- key: "promise",
- success(res) {
- if(res.data){
- that.setData({
- promise: that.data.newPromise
- })
- }
- }
- })
+ console.log("promise: onshow");
+ this.getCommitment()
},
/**
@@ -63,45 +49,106 @@
var period = `${now.year()}/${now.month()+1}-${now.month()+1}`
var deadline = now.endOf('year').format("YYYY骞碝M鏈圖D鏃�")
this.setData({
- planYear: `${year}骞碻,
- maxYear: year,
- thisPeiod: period,
- deadline: deadline
+ year: year,
+ deadline: `鎵胯鎴鏃堕棿锛�${deadline}`
})
},
/**
- * 椤甸潰璺宠浆
+ * 鍒ゆ柇褰撳墠鍛ㄦ湡鍐呯殑鎵胯鏄惁瀹屾垚
*/
- goto: function (e) {
- var url = ""
- var index = e.currentTarget.dataset.index
- switch (index) {
- case "0":
- //鍘绘壙璇�
- url = `/pages/promiseinfo/promiseinfo`
- break;
- case "1":
- //鏌ョ湅鎵胯缁撴灉
- url = `/pages/promiseresult/promiseresult`
- break;
- case "2":
- //
- url = ""
- return;
- case "3":
- //
- url = ""
- break;
- case "4":
- break;
- case "5":
- break;
- }
- if (url != "") {
- wx.navigateTo({
- url: url
- })
+ checkStatus() {
+ if (this.promiseHistory.length > 0) {
+ var first = this.promiseHistory[0]
+ var firstYear = moment(first.cmCreateTime).year()
+ if (firstYear >= this.data.year) {
+ var deadline = moment().add(1, 'years').endOf('year').format("YYYY骞碝M鏈圖D鏃�")
+ this.setData({
+ text1: "寰堟!鏈鎵胯宸插畬鎴�",
+ text3: "鏌ョ湅鎵胯",
+ status: 1,
+ deadline: `涓嬫鎵胯鏃堕棿锛�${deadline}`
+ })
+ } else {
+ this.setData({
+ text1: "宸插紑鍚�!璇峰強鏃跺畬鎴愭壙璇�",
+ text3: "鍘绘壙璇�",
+ status: 0,
+ })
+ this._initPlanYear()
+ }
}
},
+
+ /**
+ * 鑾峰彇鍘嗗彶璁板綍
+ */
+ getCommitment() {
+ var that = this
+ promiseservice.getCommitment(app.globalData.accessToken.userId, {
+ success(data) {
+ that.promiseHistory = data
+ let promise = []
+ data.forEach(d => {
+ const time = moment(d.cmCreateTime)
+ promise.push({
+ period: `鎵胯鍛ㄦ湡锛�${time.year()}骞�1鏈垀${time.year()}骞�12鏈坄,
+ time: `${time.format('YYYY骞碝M鏈圖D鏃�')}瀹屾垚`,
+ picPath: d.cmUrl,
+ pdfPath: d.cmPdfUrl
+ })
+ });
+ that.setData({
+ promise
+ })
+
+ that.checkStatus()
+ }
+ })
+ },
+
+ /**
+ * 璺宠浆鑷冲幓鎵胯
+ */
+ gotoPromise(e) {
+ var status = e.currentTarget.dataset.status
+ if (status == 0) {
+ wx.navigateTo({
+ url: '/pages/promiseinfo/promiseinfo'
+ })
+ } else {
+ this.gotoResult(0)
+ }
+ },
+
+ /**
+ * 璺宠浆鑷虫壙璇鸿鎯�
+ */
+ gotoDetail(e) {
+ var i = e.currentTarget.dataset.index
+ this.gotoResult(i)
+ },
+
+ gotoResult(i) {
+ var p = this.data.promise[i]
+ wx.navigateTo({
+ url: '/pages/promiseresult/promiseresult',
+ success: function (res) {
+ // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ promise: {
+ picPath: p.picPath,
+ pdfPath: p.pdfPath
+ }
+ })
+ }
+ })
+ },
+
+ /**
+ * 璺宠浆鑷冲巻鍙茶褰�
+ */
+ gotoHistory() {
+
+ }
})
\ No newline at end of file
--
Gitblit v1.9.3