diff --git a/pages.json b/pages.json index 70f476b..1510da1 100644 --- a/pages.json +++ b/pages.json @@ -3,14 +3,14 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "环市东院区安防小程序" + "navigationBarTitleText": "安防平台小程序" } }, { "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, @@ -99,7 +99,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "navigationBarBackgroundColor": "#fff", "backgroundColor": "#F8F8F8" }, diff --git a/pages.json b/pages.json index 70f476b..1510da1 100644 --- a/pages.json +++ b/pages.json @@ -3,14 +3,14 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "环市东院区安防小程序" + "navigationBarTitleText": "安防平台小程序" } }, { "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, @@ -99,7 +99,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "navigationBarBackgroundColor": "#fff", "backgroundColor": "#F8F8F8" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index fdde26f..a784026 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,7 +33,7 @@ import { getLogin, getUserProfile } from "@/utils/auth.js"; import { verifyPhone } from "@/api/index.js"; import {getUserJurisdiction} from '@/api/user.js' -import { getLocationParams } from "@/common/utils.js"; +import { getLocationParams, debounce } from "@/common/utils.js"; import GetPhonePopup from "@/components/base/getphonePopup.vue"; import { subscription } from "@/utils/common.js" @@ -91,7 +91,10 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); }, methods: { - async handleClick(id) { + handleClick(id) { + debounce(this.handleClick1(id)) + }, + async handleClick1(id) { this.active = id; const sessionId = uni.getStorageSync("sessionId"); //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过 @@ -143,7 +146,6 @@ icon: 'none' }); } - } } }, diff --git a/pages.json b/pages.json index 70f476b..1510da1 100644 --- a/pages.json +++ b/pages.json @@ -3,14 +3,14 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "环市东院区安防小程序" + "navigationBarTitleText": "安防平台小程序" } }, { "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, @@ -99,7 +99,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "navigationBarBackgroundColor": "#fff", "backgroundColor": "#F8F8F8" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index fdde26f..a784026 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,7 +33,7 @@ import { getLogin, getUserProfile } from "@/utils/auth.js"; import { verifyPhone } from "@/api/index.js"; import {getUserJurisdiction} from '@/api/user.js' -import { getLocationParams } from "@/common/utils.js"; +import { getLocationParams, debounce } from "@/common/utils.js"; import GetPhonePopup from "@/components/base/getphonePopup.vue"; import { subscription } from "@/utils/common.js" @@ -91,7 +91,10 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); }, methods: { - async handleClick(id) { + handleClick(id) { + debounce(this.handleClick1(id)) + }, + async handleClick1(id) { this.active = id; const sessionId = uni.getStorageSync("sessionId"); //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过 @@ -143,7 +146,6 @@ icon: 'none' }); } - } } }, diff --git a/pages/list/list.vue b/pages/list/list.vue index caf1888..f7c31e9 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -220,7 +220,7 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); //验证手机号 this.phone = uni.getStorageSync("registerPhone"); - this.checkphone(); + await this.checkphone(); this.queryList = { account: this.account, keywords: "", @@ -363,7 +363,7 @@ this.nothingMore = false; const resData = res.records.map((item, index) => { if (item.visitorApplyStatus == "1") { - item.status = "申请已提交"; + item.status = this.isManager ? "申请已提交" : '申请中'; item.color = "blue"; } else if (item.visitorApplyStatus == "2") { item.status = "申请已通过"; diff --git a/pages.json b/pages.json index 70f476b..1510da1 100644 --- a/pages.json +++ b/pages.json @@ -3,14 +3,14 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "环市东院区安防小程序" + "navigationBarTitleText": "安防平台小程序" } }, { "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, @@ -99,7 +99,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "navigationBarBackgroundColor": "#fff", "backgroundColor": "#F8F8F8" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index fdde26f..a784026 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,7 +33,7 @@ import { getLogin, getUserProfile } from "@/utils/auth.js"; import { verifyPhone } from "@/api/index.js"; import {getUserJurisdiction} from '@/api/user.js' -import { getLocationParams } from "@/common/utils.js"; +import { getLocationParams, debounce } from "@/common/utils.js"; import GetPhonePopup from "@/components/base/getphonePopup.vue"; import { subscription } from "@/utils/common.js" @@ -91,7 +91,10 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); }, methods: { - async handleClick(id) { + handleClick(id) { + debounce(this.handleClick1(id)) + }, + async handleClick1(id) { this.active = id; const sessionId = uni.getStorageSync("sessionId"); //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过 @@ -143,7 +146,6 @@ icon: 'none' }); } - } } }, diff --git a/pages/list/list.vue b/pages/list/list.vue index caf1888..f7c31e9 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -220,7 +220,7 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); //验证手机号 this.phone = uni.getStorageSync("registerPhone"); - this.checkphone(); + await this.checkphone(); this.queryList = { account: this.account, keywords: "", @@ -363,7 +363,7 @@ this.nothingMore = false; const resData = res.records.map((item, index) => { if (item.visitorApplyStatus == "1") { - item.status = "申请已提交"; + item.status = this.isManager ? "申请已提交" : '申请中'; item.color = "blue"; } else if (item.visitorApplyStatus == "2") { item.status = "申请已通过"; diff --git a/pagesA/checkListInfo/checkListInfo.vue b/pagesA/checkListInfo/checkListInfo.vue index ef0b6d6..f68e1ec 100644 --- a/pagesA/checkListInfo/checkListInfo.vue +++ b/pagesA/checkListInfo/checkListInfo.vue @@ -132,10 +132,11 @@ methods: { //获取当前零点和第二天8点的时间戳(比较当前时间是否在预定访问时间的第二天的8点之后) getStamp() { + const time = this.form.inTime.replace(/-/g, '/') //当前时间戳 let nowStamp = new Date().getTime() // 访问时间当天零点 - let currentZero = new Date(new Date(this.form.inTime).toLocaleDateString()).getTime() // 获取当天零点 + let currentZero = new Date(new Date(time).toLocaleDateString()).getTime() // 获取当天零点 // 第二天8点（当天0点 + 24个小时 = 第二天0点 + 8个小时） var currentTime = currentZero + 24 * 60 * 60 * 1000 + 8 * 60 * 60 * 1000 if(nowStamp >= currentTime) {//过了次日8点了 @@ -162,6 +163,7 @@ }, //提示不可修改和删除的时候的点击确定 confirm() { + this.showNotAllow = false wx.makePhoneCall({ phoneNumber: this.ServiceTel, }) diff --git a/pages.json b/pages.json index 70f476b..1510da1 100644 --- a/pages.json +++ b/pages.json @@ -3,14 +3,14 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "环市东院区安防小程序" + "navigationBarTitleText": "安防平台小程序" } }, { "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, @@ -99,7 +99,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "环市东院区安防小程序", + "navigationBarTitleText": "安防平台小程序", "navigationBarBackgroundColor": "#fff", "backgroundColor": "#F8F8F8" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index fdde26f..a784026 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,7 +33,7 @@ import { getLogin, getUserProfile } from "@/utils/auth.js"; import { verifyPhone } from "@/api/index.js"; import {getUserJurisdiction} from '@/api/user.js' -import { getLocationParams } from "@/common/utils.js"; +import { getLocationParams, debounce } from "@/common/utils.js"; import GetPhonePopup from "@/components/base/getphonePopup.vue"; import { subscription } from "@/utils/common.js" @@ -91,7 +91,10 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); }, methods: { - async handleClick(id) { + handleClick(id) { + debounce(this.handleClick1(id)) + }, + async handleClick1(id) { this.active = id; const sessionId = uni.getStorageSync("sessionId"); //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过 @@ -143,7 +146,6 @@ icon: 'none' }); } - } } }, diff --git a/pages/list/list.vue b/pages/list/list.vue index caf1888..f7c31e9 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -220,7 +220,7 @@ uni.setStorageSync("currentPagePath", this.currentPagePath); //验证手机号 this.phone = uni.getStorageSync("registerPhone"); - this.checkphone(); + await this.checkphone(); this.queryList = { account: this.account, keywords: "", @@ -363,7 +363,7 @@ this.nothingMore = false; const resData = res.records.map((item, index) => { if (item.visitorApplyStatus == "1") { - item.status = "申请已提交"; + item.status = this.isManager ? "申请已提交" : '申请中'; item.color = "blue"; } else if (item.visitorApplyStatus == "2") { item.status = "申请已通过"; diff --git a/pagesA/checkListInfo/checkListInfo.vue b/pagesA/checkListInfo/checkListInfo.vue index ef0b6d6..f68e1ec 100644 --- a/pagesA/checkListInfo/checkListInfo.vue +++ b/pagesA/checkListInfo/checkListInfo.vue @@ -132,10 +132,11 @@ methods: { //获取当前零点和第二天8点的时间戳(比较当前时间是否在预定访问时间的第二天的8点之后) getStamp() { + const time = this.form.inTime.replace(/-/g, '/') //当前时间戳 let nowStamp = new Date().getTime() // 访问时间当天零点 - let currentZero = new Date(new Date(this.form.inTime).toLocaleDateString()).getTime() // 获取当天零点 + let currentZero = new Date(new Date(time).toLocaleDateString()).getTime() // 获取当天零点 // 第二天8点（当天0点 + 24个小时 = 第二天0点 + 8个小时） var currentTime = currentZero + 24 * 60 * 60 * 1000 + 8 * 60 * 60 * 1000 if(nowStamp >= currentTime) {//过了次日8点了 @@ -162,6 +163,7 @@ }, //提示不可修改和删除的时候的点击确定 confirm() { + this.showNotAllow = false wx.makePhoneCall({ phoneNumber: this.ServiceTel, }) diff --git a/pagesA/submitInfo/submitInfo.vue b/pagesA/submitInfo/submitInfo.vue index f204e94..d3a7a41 100644 --- a/pagesA/submitInfo/submitInfo.vue +++ b/pagesA/submitInfo/submitInfo.vue @@ -71,7 +71,6 @@ :minDate="startTimeMinDate" :maxDate="startTimeMaxDate" @cancel="isStartTimeShow=false" - @change="change" @confirm="closestartTime"> @@ -84,7 +83,6 @@ :maxDate="endTimeMaxDate" :formatter="formatter" @cancel="closeTime" - @change="change" @confirm="confirmTime">