boyue2025/dbd-meeting-wx-small
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting-wx-small.git synced 2025-06-21 18:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复BUG

Browse Source 
修复部分BUG，切换线上接口
This commit is contained in:
unknown 2024-09-30 16:54:33 +08:00
parent d4d9984851
commit 1cd7aaffed
7 changed files with 280 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
miniprogram/app.js
View File

@ -10,12 +10,12 @@ App({
// DOMAIN_NAME: 'http://192.168.0.30:9227', //接口域名
// IMG_NAME: 'http://192.168.0.30:9227',
// 生产
// DOMAIN_NAME_PREFIX: 'https://baoxiu.jsgdha.com/shoot-hand',
// DOMAIN_NAME: 'https://baoxiu.jsgdha.com/shoot-hand', //接口域名
// IMG_NAME: 'https://baoxiu.jsgdha.com/shoot-hand',
DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand',
DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名
IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand',
DOMAIN_NAME_PREFIX: 'https://baoxiu.jsgdha.com/shoot-hand',
DOMAIN_NAME: 'https://baoxiu.jsgdha.com/shoot-hand', //接口域名
IMG_NAME: 'https://baoxiu.jsgdha.com/shoot-hand',
// DOMAIN_NAME_PREFIX: 'https://company.haxy.com.cn:4443/shoot-hand',
// DOMAIN_NAME: 'https://company.haxy.com.cn:4443/shoot-hand', //接口域名
// IMG_NAME: 'https://company.haxy.com.cn:4443/shoot-hand',
globals: {
refreshMyPages: false,
homedata: {},

3
miniprogram/pages/meeting/index/index.js
View File

@ -105,7 +105,8 @@ Page({
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
let chooseTime = year + '-' + month + '-' + day + ' 00:00:00'
// IOS不支持-，必须用/
let chooseTime = year + '/' + month + '/' + day + ' 00:00:00'
let chooseTimeStr = new Date(chooseTime).getTime()
wx.navigateTo({
url: '/pages/meeting/meetingReservation/meetingReservation?time=' + chooseTimeStr + '&dep=' + this.data.depName + '&depId=' + this.data.depId,

4
miniprogram/pages/meeting/index/index.wxml
View File

@ -38,7 +38,7 @@
<!-- 提示框 -->
<van-dialog use-slot title="请认证所在单位" show="{{ showLogin }}" show-cancel-button bind:close="onCloseLogin" bind:confirm="orderLogin" beforeClose="{{ beforeClose }}" zIndex="109">
<van-cell-group style="margin: 20px;">
<van-field bind:change="onChangeUsername" value="{{ username }}" clearable label="用户名" placeholder="请输入用户名" />
<van-field bind:change="onChangePwd" value="{{ pwd }}" type="password" clearable label="密码" placeholder="请输入密码" />
<van-field bind:change="onChangeUsername" value="{{ username }}" clearable label="用户名" placeholder="请输入用户名" border="{{ false }}" />
<van-field bind:change="onChangePwd" value="{{ pwd }}" type="password" clearable label="密码" placeholder="请输入密码" border="{{ false }}" />
</van-cell-group>
</van-dialog>

3
miniprogram/pages/meeting/reservationRecord/approve/approve.js
View File

@ -474,7 +474,8 @@ Page({
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
let chooseTime = year + '-' + month + '-' + day + ' 00:00:00'
// IOS不支持-，必须用/
let chooseTime = year + '/' + month + '/' + day + ' 00:00:00'
let chooseTimeStr = new Date(chooseTime).getTime()
// 加入rId参数，为预约id，用于重新修改
wx.navigateTo({

3
miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
View File

@ -483,7 +483,8 @@ Page({
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
let chooseTime = year + '-' + month + '-' + day + ' 00:00:00'
// IOS不支持-，必须用/
let chooseTime = year + '/' + month + '/' + day + ' 00:00:00'
let chooseTimeStr = new Date(chooseTime).getTime()
// 加入rId参数，为预约id，用于重新修改
wx.navigateTo({

3
miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
View File

@ -528,7 +528,8 @@ Page({
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
let chooseTime = year + '-' + month + '-' + day + ' 00:00:00'
// IOS不支持-，必须用/
let chooseTime = year + '/' + month + '/' + day + ' 00:00:00'
let chooseTimeStr = new Date(chooseTime).getTime()
// 加入rId参数，为预约id，用于重新修改
wx.navigateTo({

33
miniprogram/utils/util.js
View File

@ -74,9 +74,15 @@ const formatHour = data => {
return [second].map(formatNumber)
}
}
function isString(value) {
return typeof value === "string";
}
//返回 指定秒数59 ， 2017-12-12 12:30:59
function selfFormatTimeReturnSecond59(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time);
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -90,6 +96,9 @@ function selfFormatTimeReturnSecond59(time) {
//返回 2017-12-12 12:30:59
function selfFormatTimeYMDHMS(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time);
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -104,6 +113,9 @@ function selfFormatTimeYMDHMS(time) {
//返回 2017-12-12 12:30
function selfFormatTimeYMDHM(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time);
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -117,6 +129,9 @@ function selfFormatTimeYMDHM(time) {
//返回 2017-12-12 12
function selfFormatTimeYMDH(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time);
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -130,6 +145,9 @@ function selfFormatTimeYMDH(time) {
//返回 例 2017-12-12
function selfFormatTimeYMD(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time)
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -142,6 +160,9 @@ function selfFormatTimeYMD(time) {
//返回 12:30
function selfFormatTimeHM(time) {
if (typeof time === "string" && time.includes('-')) {
time = time.replaceAll('-', '/')
}
let date = new Date(time);
let year = date.getFullYear()
let month = date.getMonth() + 1
@ -160,6 +181,12 @@ function selfFormatTimeHM(time) {
* @return 1天2时3分5秒
*/
function twoTimeInterval(startTime, endTime) {
if (typeof startTime === "string" && startTime.includes('-')) {
startTime = startTime.replaceAll('-', '/')
}
if (typeof endTime === "string" && endTime.includes('-')) {
endTime = endTime.replaceAll('-', '/')
}
// 开始时间
let date1 = new Date(startTime);
// 结束时间
@ -193,6 +220,12 @@ function twoTimeInterval(startTime, endTime) {
* @return 12时
*/
function twoTimeIntervalReturnHours(startTime, endTime) {
if (typeof startTime === "string" && startTime.includes('-')) {
startTime = startTime.replaceAll('-', '/')
}
if (typeof endTime === "string" && endTime.includes('-')) {
endTime = endTime.replaceAll('-', '/')
}
// 开始时间
let date1 = new Date(startTime);
// 结束时间