From 1951e6ccf8dff46e6f8c671308f6e4db694fc800 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 12 七月 2024 17:23:49 +0800
Subject: [PATCH] bug
---
packageDomain/pages/sampleBookList/applicationForm/index.js | 177 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 29 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 6b599f9..451f903 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -5,18 +5,18 @@
Page({
data: {
userInfo: null,
- active: 0,
+ active: '0',
description: "", //鐢宠瑙勫垯
teacherInfo: {
workInfo: null,
schoolName: "",
courseName: "",
- detailedAddress: ""
+ address: ""
},
contactInfo: {
- fullName: "",
+ user: "",
phone: "",
- detailedAddress: ""
+ address: ""
},
phoneError: false,
paperBookList: [], //鏍蜂功鍗曠焊璐ㄤ功
@@ -24,6 +24,8 @@
ebookCount: 0,
paperBookCount: 0,
bookList: [],
+ isIos: wx.getSystemInfoSync().platform === 'ios',
+ keyboardHeight: 0
},
/**
@@ -34,33 +36,80 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
+ let that = this;
+ that.setData({
+ bookList: []
+ })
if (wx.getStorageSync(app.config.userInfoKey)) {
- this.setData({
+ that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- if (this.data.userInfo.role == 'Teacher') {
- this.setData({
- 'teacherInfo.schoolName': JSON.parse(this.data.userInfo.data).schoolName,
- 'teacherInfo.courseName': JSON.parse(this.data.userInfo.data).courseName,
- 'contactInfo.fullName': JSON.parse(this.data.userInfo.data).fullName,
- 'contactInfo.phone': JSON.parse(this.data.userInfo.data).phone,
- 'contactInfo.detailedAddress': JSON.parse(this.data.userInfo.data).detailedAddress,
+ if (that.data.userInfo.role == 'Teacher') {
+ that.setData({
+ 'teacherInfo.schoolName': JSON.parse(that.data.userInfo.data).schoolName,
+ 'teacherInfo.courseName': JSON.parse(that.data.userInfo.data).courseName,
+ 'contactInfo.user': JSON.parse(that.data.userInfo.data).fullName,
+ 'contactInfo.phone': JSON.parse(that.data.userInfo.data).phone,
+ 'contactInfo.address': JSON.parse(that.data.userInfo.data).detailedAddress,
+ })
+ } else {
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ } else {
+ wx.navigateBack();
+ }
+ }
})
}
if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
- bookList: wx.getStorageSync("paperBookList")
+ const paperBookList = JSON.parse(wx.getStorageSync("paperBookList"))
+ for (let index = 0; index < paperBookList.length; index++) {
+ const item = paperBookList[index];
+ if (item.publicationDate)
+ item.publicationDate = this.formatDate(item.publicationDate)
+ }
+ that.setData({
+ paperBookList: paperBookList,
+ bookList: paperBookList
})
}
if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList")
+ const electronicBookList = JSON.parse(wx.getStorageSync("electronicBookList"))
+ for (let index = 0; index < electronicBookList.length; index++) {
+ const item = electronicBookList[index];
+ if (item.publicationDate)
+ item.publicationDate = this.formatDate(item.publicationDate)
+ }
+ that.setData({
+ electronicBookList: electronicBookList
})
}
- this.getSelectBookCount();
- this.getSelectPaperBookCount();
- this.getPaperType();
+ that.getSelectBookCount();
+ that.getSelectPaperBookCount();
+ that.getPaperType();
+ }
+ },
+
+ formatDate(inputDate) {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶆棩鏈熼儴鍒�
+ const dateMatch = inputDate.match(/^(\d{4})\/(\d{1,2})\/(\d{1,2})/);
+ if (dateMatch) {
+ // 鎻愬彇骞淬�佹湀銆佹棩
+ const year = dateMatch[1];
+ const month = dateMatch[2].padStart(2, '0'); // 纭繚鏈堜唤涓轰袱浣嶆暟
+ const day = dateMatch[3].padStart(2, '0'); // 纭繚鏃ユ湡涓轰袱浣嶆暟
+
+ // 鎷兼帴骞惰繑鍥炴牸寮忓寲鍚庣殑鏃ユ湡
+ return `${year}-${month}-${day}`;
+ } else {
+ // 濡傛灉娌℃湁鍖归厤鍒版棩鏈熼儴鍒嗭紝鍒欒繑鍥炲師濮嬭緭鍏ユ垨鎶涘嚭閿欒
+ return inputDate; // 鎴栬�� throw new Error('Invalid date format');
}
},
@@ -105,6 +154,7 @@
'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
})
}
+
})
},
//鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙鐢靛瓙锛�
@@ -138,7 +188,7 @@
//濮撳悕
onFullNameInput(e) {
this.setData({
- "contactInfo.fullName": e.detail.value,
+ "contactInfo.user": e.detail.value,
});
},
//杈撳叆鎵嬫満鍙�
@@ -160,13 +210,11 @@
});
}
},
- onAddressInput() {
+ onAddressInput(e) {
this.setData({
- "contactInfo.detailedAddress": e.detail.value,
+ "contactInfo.address": e.detail.value,
});
},
-
-
submit() {
let that = this;
if (that.data.bookList.length > 0) {
@@ -204,7 +252,7 @@
refType: 'applyBook'
}
} else {
- if (!(that.data.contactInfo.fullName && that.data.contactInfo.phone && that.data.contactInfo.detailedAddress)) {
+ if (!(that.data.contactInfo.user && that.data.contactInfo.phone && that.data.contactInfo.address)) {
wx.showToast({
title: "璇峰皢鏀惰揣浜轰俊鎭～鍐欏畬鏁达紒",
icon: 'none',
@@ -214,7 +262,7 @@
}
const mailAddress = JSON.stringify(that.data.contactInfo)
that.setData({
- 'teacherInfo.detailedAddress': mailAddress
+ 'teacherInfo.address': mailAddress
})
data = {
@@ -290,7 +338,7 @@
that.setData({
bookList: eList
})
- wx.setStorageSync("electronicBookList", eList);
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
} else {
let pList = that.data.paperBookList;
pList.forEach((obj, index) => {
@@ -301,13 +349,84 @@
that.setData({
bookList: pList
})
- wx.setStorageSync("paperBookList", pList);
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
}
} else if (res.cancel) {}
}
})
},
+ // 鐩戝惉椤甸潰杞敭鐩樺脊璧锋墜鍔ㄦ帹鍔ㄩ〉闈�
+ bindkeyboardheightchange(e) {
+ // 鍙ios 澶勭悊
+ if (!this.data.isIos === 'ios') {
+ return
+ }
+ // 閿洏楂樺害
+ const height = e.detail.height;
+ const className = e.target.dataset.class;
+ console.log(height, className)
+ if (height === 0) {
+ this.scrollToInput(0);
+ return;
+ }
+ try {
+ this.createSelectorQuery()
+ .select(`.${className}`)
+ .boundingClientRect((res) => {
+ // 鍙娇鐢ㄧ獥鍙ｉ珮搴�
+ const windowHeight = wx.getSystemInfoSync().windowHeight;
+ // 闄ゅ幓閿洏鐨勫墿浣欓珮搴�
+ let restHeight = windowHeight - height;
+ // 鍏冪礌宸︿笅瑙掑潗鏍�
+ let bottom = res.bottom;
+ // 鍙湁褰撳厓绱犺杞敭鐩樿鐩栫殑鏃跺�欐墠涓婃帹椤甸潰
+ if (bottom <= restHeight) return;
+ // 鐜伴樁娈甸渶瑕佹粴鍔ㄧ殑澶у皬
+ let scrollTop = bottom - restHeight;
+ console.log(scrollTop, 1)
+ this.scrollToInput(height, scrollTop);
+ })
+ .exec();
+ } catch (error) {}
+ },
+
+ // 鑾峰彇椤甸潰婊氬姩鏉′綅缃�
+ getScrollOffset() {
+ return new Promise((resolve) => {
+ try {
+ wx.createSelectorQuery()
+ .selectViewport()
+ .scrollOffset((res) => {
+ resolve(res.scrollTop);
+ })
+ .exec();
+ } catch (error) {
+ resolve(0);
+ }
+ });
+ },
+
+ // 鐩戝惉椤甸潰杞敭鐩樺脊璧锋墜鍔ㄦ帹鍔ㄩ〉闈�
+ scrollToInput(keyboardHeight, scrollTop) {
+ this.setData({
+ keyboardHeight,
+ });
+ if (scrollTop) {
+ try {
+ this.getScrollOffset().then((lastScrollTop) => {
+ wx.pageScrollTo({
+ // 濡傛灉宸茬粡瀛樺湪婊氬姩锛屽湪姝ゅ熀纭�涓婄户缁粴
+ scrollTop: lastScrollTop ? lastScrollTop + scrollTop : scrollTop,
+ duration: 300,
+ });
+ });
+ } catch (error) {}
+ }
+ },
+ changeParam(e) {
+ this.scrollToInput(0);
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
--
Gitblit v1.9.1