diff --git a/pages/add-stroke/components/end-date-selector.vue b/pages/add-stroke/components/end-date-selector.vue index a25fe71..7db02f2 100644 --- a/pages/add-stroke/components/end-date-selector.vue +++ b/pages/add-stroke/components/end-date-selector.vue @@ -26,7 +26,7 @@ data() { return { - valueEnd: this.$moment(new Date()).format('YYYY-MM-DD hh:mm') + valueEnd: this.$moment(new Date()).format('YYYY-MM-DD HH:mm') }; }, @@ -41,7 +41,7 @@ methods: { bindChangeEnd(value){ - console.log('抵达时间',value) + // console.log('抵达时间',value) this.valueEnd = value; this.$emit('change', this.valueEnd); }, diff --git a/pages/add-stroke/components/start-date-selector.vue b/pages/add-stroke/components/start-date-selector.vue index 761c58c..7088c7a 100644 --- a/pages/add-stroke/components/start-date-selector.vue +++ b/pages/add-stroke/components/start-date-selector.vue @@ -26,7 +26,7 @@ data() { return { - valueStart: this.$moment(new Date()).format('YYYY-MM-DD hh:mm') + valueStart: this.$moment(new Date()).format('YYYY-MM-DD HH:mm') }; }, @@ -41,7 +41,7 @@ methods: { bindChangeStart(value){ - console.log('抵达时间',value) + // console.log('抵达时间',value) this.valueStart = value; this.$emit('change', this.valueStart); }, diff --git a/pages/apply-code/apply-code.vue b/pages/apply-code/apply-code.vue index 92c6554..b04acf2 100644 --- a/pages/apply-code/apply-code.vue +++ b/pages/apply-code/apply-code.vue @@ -85,7 +85,7 @@ *当前体温(℃) - + diff --git a/pages/basic-info/basic-info.vue b/pages/basic-info/basic-info.vue index 99c5ecd..5a478a9 100644 --- a/pages/basic-info/basic-info.vue +++ b/pages/basic-info/basic-info.vue @@ -21,7 +21,7 @@ :disabled="userInfo && userInfo.id ? true : false" name="input" placeholder="请输入身份证号" - type="text" + type="idcard" v-model="idCard" /> diff --git a/pages/my-trips/my-trips.vue b/pages/my-trips/my-trips.vue index dfc7406..92a6c91 100644 --- a/pages/my-trips/my-trips.vue +++ b/pages/my-trips/my-trips.vue @@ -96,7 +96,7 @@ formatDate1(time) { var data = new Date(time); - return formatDate(data, 'MM月dd日 hh:mm'); + return formatDate(data, 'MM月dd日 HH:mm'); }, }, diff --git a/pages/punch-the-clock/punch-the-clock.vue b/pages/punch-the-clock/punch-the-clock.vue index d1d39db..506f97b 100644 --- a/pages/punch-the-clock/punch-the-clock.vue +++ b/pages/punch-the-clock/punch-the-clock.vue @@ -59,7 +59,7 @@ *当前体温(℃) - + diff --git a/pages/sign/sign.vue b/pages/sign/sign.vue index ac268bd..37d4064 100644 --- a/pages/sign/sign.vue +++ b/pages/sign/sign.vue @@ -27,7 +27,9 @@ export default { siteName: '', success: false, type: 0, // 0进 / 1出 - timer: null, + timer: null, + longitude: 37.80079, + latitude: 112.58679, }; }, @@ -42,6 +44,7 @@ export default { onLoad(options) { console.log('options: ', options); this.init(options); + this.getLocation(); }, methods: { @@ -81,6 +84,20 @@ export default { this.getSiteByQrId(params); } }, + + // 获取当前的地址位置 + // 注意用国测局的数据 map只支持gcj02 + getLocation() { + uni.getLocation({ + type: 'gcj02', + success: res => { + this.longitude = res.longitude; + this.latitude = res.latitude; + console.log('当前位置的经度:' + res.longitude); + console.log('当前位置的纬度:' + res.latitude); + }, + }); + }, /** * 扫码打卡 @@ -88,7 +105,7 @@ export default { */ async handleSign(siteId) { try { - const params = { param: { siteId } }; + const params = { param: { siteId, locationLatitude: this.latitude, locationLongitude: this.longitude } }; await this.sign(params); this.success = true; } catch (error) {