From ebc96a1cf0424c04dceacbc42f9ad2a897223be9 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 25 六月 2024 14:42:04 +0800
Subject: [PATCH] css
---
h5/pages/staff/vehicle/shiwai.vue | 14
h5/pages/appointmentDetails/appointmentDetails.vue | 2
h5/pages/staff/meetingCalendar.vue | 32
h5/pages/meeting/myAppointment/myAppointment.vue | 1255 ++++----
h5/pages/staff/meetingSub.vue | 54
h5/pages/staff/vehicle/index.vue | 178
h5/pages/staff/vehicle/sendACar.vue | 10
h5/n_pages/login/login.vue | 165
h5/pages/staffLogin/forgetPsd.vue | 2
h5/pages/applicationRecord/applicationRecord.vue | 27
h5/pages/laborApplication/laborApplication.vue | 12
h5/components/Li-Calendar/Li-Calendar.vue | 1632 +++++-----
h5/pages/staff/task/visitorApprove.vue | 15
h5/n_pages/visitorApplication/visitorApplication.vue | 14
h5/pages/staff/meetingManager.vue | 26
h5/packagesMine/notice/notice.vue | 352 +-
h5/pages.json | 2
h5/pages/staff/visitorReport.vue | 4
h5/pages/staffLogin/login.vue | 4
h5/pages/driver/index.vue | 553 ++-
h5/pages/staff/task/visitorReport.vue | 16
h5/pages/visitorApproval/visitorApproval.vue | 2
h5/pages/staff/index.vue | 506 +-
h5/pages/driver/reservedDetail.vue | 6
h5/pages/driver/queueUp.vue | 186
h5/n_pages/visitorApproval/visitorApproval.vue | 4
h5/pages/visitorApplication/visitorApplication.vue | 15
h5/pages/driver/taskDetail.vue | 741 ++--
h5/pages/staff/task/index.vue | 35
h5/pages/driver/queueUpRecord.vue | 269
h5/pages/notice/notice.vue | 25
h5/n_pages/applicationRecord/applicationRecord.vue | 4
h5/pages/driver/reservedRecord.vue | 2
h5/pages/meeting/login/login.vue | 302 +
h5/pages/staff/vehicle/sendACarDetail.vue | 6
h5/components/Header.vue | 131
h5/packagesMine/notificationDetails/notificationDetails.vue | 118
h5/pages/driver/taskConfirm.vue | 777 ++--
h5/pages/staff/task/vDangetAppr.vue | 6
h5/pages/meeting/personal/personal.vue | 999 +++---
40 files changed, 4,444 insertions(+), 4,059 deletions(-)
diff --git a/h5/components/Header.vue b/h5/components/Header.vue
index 2b36fab..e5c22d8 100644
--- a/h5/components/Header.vue
+++ b/h5/components/Header.vue
@@ -1,66 +1,69 @@
-<template>
- <view class="custombar" :style="{height:statusbarHeight + navHeight +'px'}">
- <view class="status_bar" :style="{height:statusbarHeight+'px'}"></view>
- <view class="nav_bar" :style="{height:navHeight +'px'}">
- <view class="title">
- <text>{{Title}}</text>
- </view>
- </view>
- </view>
-</template>
-
+<template>
+ <view
+ class="custombar"
+ :style="{ height: statusbarHeight + navHeight + 'px' }"
+ >
+ <view class="status_bar" :style="{ height: statusbarHeight + 'px' }"></view>
+ <view class="nav_bar" :style="{ height: navHeight + 'px' }">
+ <view class="title">
+ <text>{{ Title }}</text>
+ </view>
+ </view>
+ </view>
+</template>
+
<script>
- import { mapState } from 'vuex'
-
- export default {
- props: {
- Title: {
- type: String,
- default: ''
- }
- },
- computed: {
- ...mapState(['statusbarHeight', 'navHeight'])
- }
- }
-</script>
-
-<style lang="less" scoped>
- .custombar{
- position: sticky;
- top: 0rpx;
- left: 0;
- width: 100%;
- z-index: 999;
- height: 45px;
- background-color: #ffffff;
- .nav_bar{
- position: relative;
- z-index: 999;
- .return{
- position: absolute;
- transform: translateY(-50%);
- width: 40rpx;
- height: 40rpx;
- top: 50%;
- left: 30rpx;
- z-index: 99;
- }
- .title{
- position: relative;
- transform: translate(-50%, -50%);
- left: 50%;
- top: 50%;
- font-size: 0;
- padding-left: 30rpx;
- box-sizing: border-box;
- text{
- font-size: 36rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #111111;
- }
- }
- }
- }
+import { mapState } from 'vuex'
+
+export default {
+ props: {
+ Title: {
+ type: String,
+ default: ''
+ }
+ },
+ computed: {
+ ...mapState(['statusbarHeight', 'navHeight'])
+ }
+}
+</script>
+
+<style lang="less" scoped>
+.custombar {
+ position: sticky;
+ top: 0rpx;
+ left: 0;
+ width: 100%;
+ z-index: 999;
+ height: 45px;
+ background-color: #ffffff;
+ .nav_bar {
+ position: relative;
+ z-index: 999;
+ .return {
+ position: absolute;
+ transform: translateY(-50%);
+ width: 40rpx;
+ height: 40rpx;
+ top: 50%;
+ left: 30rpx;
+ z-index: 99;
+ }
+ .title {
+ position: relative;
+ transform: translate(-50%, -50%);
+ left: 50%;
+ top: 50%;
+ font-size: 0;
+ padding-left: 30rpx;
+ box-sizing: border-box;
+ text {
+ font-size: 36rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #111111;
+ }
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/h5/components/Li-Calendar/Li-Calendar.vue b/h5/components/Li-Calendar/Li-Calendar.vue
index 02d9e74..f8f970c 100644
--- a/h5/components/Li-Calendar/Li-Calendar.vue
+++ b/h5/components/Li-Calendar/Li-Calendar.vue
@@ -1,836 +1,884 @@
<template>
- <view>
- <view class='calendar-Time-header under_line'>
- <view class="header-left">
- <!-- <image :src="lastDisabled ? disable : nodisable" mode="widthFix" @tap="subMonth"></image> -->
- <image :src="nodisable" mode="widthFix" @tap="subMonth"></image>
- <text>{{title_time}}</text>
- <image src="@/static/meeting/icon/ar_right@2x.png" mode="widthFix" @tap="addMonth"></image>
- </view>
- <view class="header-right" @tap="backToToday">鍥炲埌浠婂ぉ</view>
- <!-- <text class='calendar-lastMonth' @tap="subMonth" v-bind:class="{'calendar-btn-disabled' : lastDisabled }">{{lastText}}</text>
+ <view>
+ <view class="calendar-Time-header under_line">
+ <view class="header-left">
+ <!-- <image :src="lastDisabled ? disable : nodisable" mode="widthFix" @tap="subMonth"></image> -->
+ <image :src="nodisable" mode="widthFix" @tap="subMonth"></image>
+ <text>{{ title_time }}</text>
+ <image
+ src="@/static/meeting/icon/ar_right@2x.png"
+ mode="widthFix"
+ @tap="addMonth"
+ ></image>
+ </view>
+ <view class="header-right" @tap="backToToday">鍥炲埌浠婂ぉ</view>
+ <!-- <text class='calendar-lastMonth' @tap="subMonth" v-bind:class="{'calendar-btn-disabled' : lastDisabled }">{{lastText}}</text>
<text class='calendar-TimeH'>{{title_time}}</text>
<text class='calendar-nextMonth' @tap="addMonth" v-bind:class="{'calendar-btn-disabled' : nextDisabled }">{{nextText}}</text>
<text class='calendar-backToToday' @tap="backToToday">鍥炲埌浠婂ぉ</text> -->
- </view>
- <view class='ClearBoth'></view>
- <view class="calendar-content">
- <view class="calendar-row calendar-header">
- <view class="calendar-col aligncanter">鍛ㄦ棩</view>
- <view class="calendar-col aligncanter">鍛ㄤ竴</view>
- <view class="calendar-col aligncanter">鍛ㄤ簩</view>
- <view class="calendar-col aligncanter">鍛ㄤ笁</view>
- <view class="calendar-col aligncanter">鍛ㄥ洓</view>
- <view class="calendar-col aligncanter">鍛ㄤ簲</view>
- <view class="calendar-col aligncanter">鍛ㄥ叚</view>
- </view>
- <view class="calendar-row calendar-day" v-bind:style="{'transform':transformObj, 'transition-duration':transformTimeObj}" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend">
- <view class="calendar-col aligncanter calendar-col-lastMonth" v-for='item in beforeDateList' v-bind:key='item.key'
- @tap="subMonth" v-bind:class="{'calendar-out-of-Date' : item.outOfDate }">{{item.dateIndex}}
- <text class='calendar-text'>{{item.markText}}</text>
- </view>
+ </view>
+ <view class="ClearBoth"></view>
+ <view class="calendar-content">
+ <view class="calendar-row calendar-header">
+ <view class="calendar-col aligncanter">鍛ㄦ棩</view>
+ <view class="calendar-col aligncanter">鍛ㄤ竴</view>
+ <view class="calendar-col aligncanter">鍛ㄤ簩</view>
+ <view class="calendar-col aligncanter">鍛ㄤ笁</view>
+ <view class="calendar-col aligncanter">鍛ㄥ洓</view>
+ <view class="calendar-col aligncanter">鍛ㄤ簲</view>
+ <view class="calendar-col aligncanter">鍛ㄥ叚</view>
+ </view>
+ <view
+ class="calendar-row calendar-day"
+ v-bind:style="{
+ transform: transformObj,
+ 'transition-duration': transformTimeObj,
+ }"
+ @touchstart="touchstart"
+ @touchmove="touchmove"
+ @touchend="touchend"
+ >
+ <view
+ class="calendar-col aligncanter calendar-col-lastMonth"
+ v-for="item in beforeDateList"
+ v-bind:key="item.key"
+ @tap="subMonth"
+ v-bind:class="{ 'calendar-out-of-Date': item.outOfDate }"
+ >{{ item.dateIndex }}
+ <text class="calendar-text">{{ item.markText }}</text>
+ </view>
- <view class="calendar-col aligncanter currentDays" v-bind:class="{'calendar-active' : item.dateIndex == currentSelectTime
- , 'calendar-today' : item.isToday
- , 'calendar-range' : item.isRanges
- , 'calendar-out-of-Date' : item.outOfDate }"
- v-for='item in dateList' v-bind:key='item.key' @tap="selectedDateFun(item.dateIndex)">
- <view class='dayValue'>
- <text class='calendar-date calendar-day-6-7' v-if="item.isDaySunOrSat">{{item.dateIndex}}</text>
- <text v-else class='calendar-date'>{{item.dateIndex}}</text>
- <text class='calendar-point' v-if="item.pointText" v-bind:style="{'color':item.pointTextColor?item.pointTextColor:maskColor}">{{item.pointText}}</text>
- <text class='calendar-text' v-bind:style="{'color':item.markTextColor?item.markTextColor:maskColor}">{{item.markText}}</text>
- </view>
- </view>
+ <view
+ class="calendar-col aligncanter currentDays"
+ v-bind:class="{
+ 'calendar-active': item.dateIndex == currentSelectTime,
+ 'calendar-today': item.isToday,
+ 'calendar-range': item.isRanges,
+ 'calendar-out-of-Date': item.outOfDate,
+ }"
+ v-for="item in dateList"
+ v-bind:key="item.key"
+ @tap="selectedDateFun(item.dateIndex)"
+ >
+ <view class="dayValue">
+ <text
+ class="calendar-date calendar-day-6-7"
+ v-if="item.isDaySunOrSat"
+ >{{ item.dateIndex }}</text
+ >
+ <text v-else class="calendar-date">{{ item.dateIndex }}</text>
+ <text
+ class="calendar-point"
+ v-if="item.pointText"
+ v-bind:style="{
+ color: item.pointTextColor ? item.pointTextColor : maskColor,
+ }"
+ >{{ item.pointText }}</text
+ >
+ <text
+ class="calendar-text"
+ v-bind:style="{
+ color: item.markTextColor ? item.markTextColor : maskColor,
+ }"
+ >{{ item.markText }}</text
+ >
+ </view>
+ </view>
- <view class="calendar-col aligncanter calendar-col-nextMonth" v-for='item in afterDateList' v-bind:key='item.key'
- @tap="addMonth" v-bind:class="{'calendar-out-of-Date' : item.outOfDate }">{{item.dateIndex}}
- <text class='calendar-text'>{{item.markText}}</text>
- </view>
- </view>
- <view class="ClearBoth"></view>
- </view>
- </view>
+ <view
+ class="calendar-col aligncanter calendar-col-nextMonth"
+ v-for="item in afterDateList"
+ v-bind:key="item.key"
+ @tap="addMonth"
+ v-bind:class="{ 'calendar-out-of-Date': item.outOfDate }"
+ >{{ item.dateIndex }}
+ <text class="calendar-text">{{ item.markText }}</text>
+ </view>
+ </view>
+ <view class="ClearBoth"></view>
+ </view>
+ </view>
</template>
<script>
- import lunarYearTool from './sloarToLunar.js'
- import { getDay } from '@/utils/utils.js'
- export default {
- name: 'Li-Calendar',
- props: {
- /**
- * @description 褰撳墠鏃堕棿 yyyy-MM-dd
- */
- currentTime: {
- type: String,
- default: function() {
- let timeObj = new Date();
- return timeObj.getFullYear() + "-" + (timeObj.getMonth() + 1) + "-" + timeObj.getDate();
- }
- },
- /**
- * @description 鏍囪鐐瑰垪琛�
- * time 鏍囪鏃堕棿 yyyy-MM-dd
- * text 鏍囪鍐呭
- * markPoint 鏄惁鏄剧ず鏍囪鐐� 榛樿false
- * markTextColor 鏍囪鍐呭棰滆壊
- * pointText 宸︿笂瑙掓爣璁扮偣鍐呭
- * pointTextColor 鏍囪鐐归鑹�
- */
- mark: {
- type: Array,
- default: function() {
- return undefined;
- }
- },
- /**
- * @description 涓婃湀鏂囧瓧
- */
- lastText: {
- type: String,
- default: '銆�'
- },
- /**
- * @description 涓嬫湀鏂囧瓧
- */
- nextText: {
- type: String,
- default: '銆�'
- },
- /**
- * @description 鍏ㄥ眬鏍囪鐐归鑹诧紝鍖呮嫭鐐瑰拰鏂囧瓧
- */
- maskColor: {
- type: String,
- default: '#01AAED'
- },
- /**
- * @description 鏄惁鏄剧ず鍐滃巻锛宮ask浼樺厛绾ч珮
- */
- showLunar: {
- type: Boolean,
- default: true
- },
- /**
- * @description 璁剧疆鏍囪鑼冨洿
- */
- range: {
- type: Object,
- default: function() {
- return {
- rangeStart: undefined, //璁剧疆鏍囪鑼冨洿寮�濮嬶紝yyyy-MM-dd
- rangeEnd: undefined //璁剧疆鏍囪鑼冨洿缁撴潫锛寉yyy-MM-dd
- }
- }
- },
- /**
- * @description 鏄惁寮�鍚寖鍥撮�夋嫨妯″紡
- */
- rangeMode: {
- type: Boolean,
- default: false
- },
- /**
- * @description 鏃ュ巻璧峰鏃堕棿 yyyy-MM-dd
- */
- dateStart: {
- type: String,
- default: '1970-01-01'
- },
- /**
- * @description 鏃ュ巻缁撴潫鏃堕棿 yyyy-MM-dd
- */
- dateEnd: {
- type: String,
- default: '2100-12-31'
- },
- /**
- * @description 鏄惁鍙互婊氬姩
- */
- canDrag:{
- type: Boolean,
- default: true
- },
- },
- created() {
- this.render();
- },
- data() {
- return {
- nodisable: require('@/static/meeting/icon/ar_left@2x.png'),
- disable: require('@/static/meeting/icon/ar_left_disable.png'),
-
- nextDisabled: false,
- lastDisabled: true,
- currentSelectTime: undefined, //鐐瑰嚮鏃朵繚瀛樼殑dateIndex
- title_time: '', //椤跺ご鏂囨湰
- year: undefined, //褰撳墠骞�
- month: undefined, //褰撳墠鏈�
- beforeDateList: [], //涓婁釜鏈堢殑鏃ユ湡鍒楄〃
- dateList: [], //鏈湀鐨勬棩鏈熷垪琛�
- afterDateList: [], //涓嬩釜鏈堢殑鏃ユ湡鍒楄〃
- firstRangeSelected: false, // 鑼冨洿寮�濮嬫椂闂存槸鍚﹀凡缁忛�夋嫨
- rangeStart_: undefined, //鏍囪鑼冨洿寮�濮嬶紝yyyyMM-dd
- rangeEnd_: undefined, //鏍囪鑼冨洿缁撴潫锛寉yyyMM-dd
- transform_x:0,
- transform_time:0,
- };
- },
- methods: {
- render(setTimeStr) { //鍒濆鍖�
- let that = this;
- let currentTimeStr = setTimeStr ? setTimeStr : that.currentTime;
- let timeObj = this.toDateByStr(currentTimeStr); //褰撳墠閫夊畾鐨勬椂闂�
- //璁＄畻澶撮儴鏄剧ず鐨勫勾鏈�
- let _tempTileMonth = (timeObj.getMonth() + 1);
- if (_tempTileMonth < 10)
- _tempTileMonth = '0' + _tempTileMonth;
- this.title_time = timeObj.getFullYear() + "骞�" + _tempTileMonth + "鏈�";
+import lunarYearTool from './sloarToLunar.js'
+import { getDay } from '@/utils/utils.js'
+export default {
+ name: 'Li-Calendar',
+ props: {
+ /**
+ * @description 褰撳墠鏃堕棿 yyyy-MM-dd
+ */
+ currentTime: {
+ type: String,
+ default: function () {
+ let timeObj = new Date()
+ return timeObj.getFullYear() + "-" + (timeObj.getMonth() + 1) + "-" + timeObj.getDate()
+ }
+ },
+ /**
+ * @description 鏍囪鐐瑰垪琛�
+ * time 鏍囪鏃堕棿 yyyy-MM-dd
+ * text 鏍囪鍐呭
+ * markPoint 鏄惁鏄剧ず鏍囪鐐� 榛樿false
+ * markTextColor 鏍囪鍐呭棰滆壊
+ * pointText 宸︿笂瑙掓爣璁扮偣鍐呭
+ * pointTextColor 鏍囪鐐归鑹�
+ */
+ mark: {
+ type: Array,
+ default: function () {
+ return undefined
+ }
+ },
+ /**
+ * @description 涓婃湀鏂囧瓧
+ */
+ lastText: {
+ type: String,
+ default: '銆�'
+ },
+ /**
+ * @description 涓嬫湀鏂囧瓧
+ */
+ nextText: {
+ type: String,
+ default: '銆�'
+ },
+ /**
+ * @description 鍏ㄥ眬鏍囪鐐归鑹诧紝鍖呮嫭鐐瑰拰鏂囧瓧
+ */
+ maskColor: {
+ type: String,
+ default: '#01AAED'
+ },
+ /**
+ * @description 鏄惁鏄剧ず鍐滃巻锛宮ask浼樺厛绾ч珮
+ */
+ showLunar: {
+ type: Boolean,
+ default: true
+ },
+ /**
+ * @description 璁剧疆鏍囪鑼冨洿
+ */
+ range: {
+ type: Object,
+ default: function () {
+ return {
+ rangeStart: undefined, //璁剧疆鏍囪鑼冨洿寮�濮嬶紝yyyy-MM-dd
+ rangeEnd: undefined //璁剧疆鏍囪鑼冨洿缁撴潫锛寉yyy-MM-dd
+ }
+ }
+ },
+ /**
+ * @description 鏄惁寮�鍚寖鍥撮�夋嫨妯″紡
+ */
+ rangeMode: {
+ type: Boolean,
+ default: false
+ },
+ /**
+ * @description 鏃ュ巻璧峰鏃堕棿 yyyy-MM-dd
+ */
+ dateStart: {
+ type: String,
+ default: '1970-01-01'
+ },
+ /**
+ * @description 鏃ュ巻缁撴潫鏃堕棿 yyyy-MM-dd
+ */
+ dateEnd: {
+ type: String,
+ default: '2100-12-31'
+ },
+ /**
+ * @description 鏄惁鍙互婊氬姩
+ */
+ canDrag: {
+ type: Boolean,
+ default: true
+ },
+ },
+ created() {
+ this.render()
+ },
+ data() {
+ return {
+ nodisable: require('@/static/meeting/icon/ar_left@2x.png'),
+ disable: require('@/static/meeting/icon/ar_left_disable.png'),
- //鑾峰彇褰撳墠鏃堕棿鏈堜唤1鍙�
- let firstDayStr = timeObj.getFullYear() + "/" + (timeObj.getMonth() + 1) + "/01";
- let date = that.toDateByStr(firstDayStr);
- that.year = date.getFullYear();
- that.month = date.getMonth() + 1;
- let firstDayWeek = date.getDay(); //绗竴澶╂槸鏄熸湡鍑�
- let grid_sum = 0; //鎬绘牸瀛愭暟 锛岀敤浜庡悗闈㈠～婊℃牸瀛�
- //鑾峰彇涓婁竴涓湀鐨勫ぉ鏁�
- let TempMonth;
- let TempYear;
- if (that.month == 1) { //璺ㄥ勾
- TempMonth = 12;
- TempYear = that.year - 1;
- } else {
- TempYear = that.year;
- TempMonth = that.month - 1;
- }
- let TempLastMonthStr = TempYear + "/" + TempMonth + "/01";
- let lastMonthTotalDay = that.getTotalDay(TempLastMonthStr);
- let lastMonthStartDay = lastMonthTotalDay - firstDayWeek;
+ nextDisabled: false,
+ lastDisabled: true,
+ currentSelectTime: undefined, //鐐瑰嚮鏃朵繚瀛樼殑dateIndex
+ title_time: '', //椤跺ご鏂囨湰
+ year: undefined, //褰撳墠骞�
+ month: undefined, //褰撳墠鏈�
+ beforeDateList: [], //涓婁釜鏈堢殑鏃ユ湡鍒楄〃
+ dateList: [], //鏈湀鐨勬棩鏈熷垪琛�
+ afterDateList: [], //涓嬩釜鏈堢殑鏃ユ湡鍒楄〃
+ firstRangeSelected: false, // 鑼冨洿寮�濮嬫椂闂存槸鍚﹀凡缁忛�夋嫨
+ rangeStart_: undefined, //鏍囪鑼冨洿寮�濮嬶紝yyyyMM-dd
+ rangeEnd_: undefined, //鏍囪鑼冨洿缁撴潫锛寉yyyMM-dd
+ transform_x: 0,
+ transform_time: 0,
+ }
+ },
+ methods: {
+ render(setTimeStr) { //鍒濆鍖�
+ let that = this
+ let currentTimeStr = setTimeStr ? setTimeStr : that.currentTime
+ let timeObj = this.toDateByStr(currentTimeStr) //褰撳墠閫夊畾鐨勬椂闂�
+ //璁＄畻澶撮儴鏄剧ず鐨勫勾鏈�
+ let _tempTileMonth = (timeObj.getMonth() + 1)
+ if (_tempTileMonth < 10)
+ _tempTileMonth = '0' + _tempTileMonth
+ this.title_time = timeObj.getFullYear() + "骞�" + _tempTileMonth + "鏈�"
- let _dateStart = that.toDateByStr1(that.dateStart);
- let _dateEnd = that.toDateByStr1(that.dateEnd);
- // 鍒涘缓鍓嶉潰鐨勬棩鏈�
- that.beforeDateList = [];
- for (let i = 0; i < firstDayWeek; i++) {
- grid_sum++;
- lastMonthStartDay++;
- let tempObj = {
- dateIndex: lastMonthStartDay,
- key: 'before_' + i
- };
+ //鑾峰彇褰撳墠鏃堕棿鏈堜唤1鍙�
+ let firstDayStr = timeObj.getFullYear() + "/" + (timeObj.getMonth() + 1) + "/01"
+ let date = that.toDateByStr(firstDayStr)
+ that.year = date.getFullYear()
+ that.month = date.getMonth() + 1
+ let firstDayWeek = date.getDay() //绗竴澶╂槸鏄熸湡鍑�
+ let grid_sum = 0 //鎬绘牸瀛愭暟 锛岀敤浜庡悗闈㈠～婊℃牸瀛�
+ //鑾峰彇涓婁竴涓湀鐨勫ぉ鏁�
+ let TempMonth
+ let TempYear
+ if (that.month == 1) { //璺ㄥ勾
+ TempMonth = 12
+ TempYear = that.year - 1
+ } else {
+ TempYear = that.year
+ TempMonth = that.month - 1
+ }
+ let TempLastMonthStr = TempYear + "/" + TempMonth + "/01"
+ let lastMonthTotalDay = that.getTotalDay(TempLastMonthStr)
+ let lastMonthStartDay = lastMonthTotalDay - firstDayWeek
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- let _tempBeforeDate = new Date(TempYear + "/" + TempMonth + "/" + lastMonthStartDay);
- if (_dateStart > _tempBeforeDate || _tempBeforeDate > _dateEnd) {
- tempObj.outOfDate = true;
- }
+ let _dateStart = that.toDateByStr1(that.dateStart)
+ let _dateEnd = that.toDateByStr1(that.dateEnd)
+ // 鍒涘缓鍓嶉潰鐨勬棩鏈�
+ that.beforeDateList = []
+ for (let i = 0; i < firstDayWeek; i++) {
+ grid_sum++
+ lastMonthStartDay++
+ let tempObj = {
+ dateIndex: lastMonthStartDay,
+ key: 'before_' + i
+ }
- //鑾峰彇鍐滃巻
- if (that.showLunar) {
- let LunarDate = that.sloarToLunar(TempYear, TempMonth, lastMonthStartDay);
- let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay;
- tempObj.markText = tempLunarDay;
- }
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ let _tempBeforeDate = new Date(TempYear + "/" + TempMonth + "/" + lastMonthStartDay)
+ if (_dateStart > _tempBeforeDate || _tempBeforeDate > _dateEnd) {
+ tempObj.outOfDate = true
+ }
- that.beforeDateList.push(tempObj);
- }
+ //鑾峰彇鍐滃巻
+ if (that.showLunar) {
+ let LunarDate = that.sloarToLunar(TempYear, TempMonth, lastMonthStartDay)
+ let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay
+ tempObj.markText = tempLunarDay
+ }
- //鑾峰彇涓�涓湀鐨勫ぉ鏁�
- let totalDay = that.getTotalDay(currentTimeStr);
-
- //鐢熸垚鏈湀鏃ュ巻
- let today = new Date();
- let today_year = today.getFullYear();
- let today_month = today.getMonth() + 1;
- let today_day = today.getDate();
- that.dateList = [];
- for (let i = 1; i <= totalDay; i++) { //寰幆鏃�
- grid_sum++;
+ that.beforeDateList.push(tempObj)
+ }
- let tempObj = {
- dateIndex: i,
- key: 'date_' + i,
- isRanges: false,
- isToday: false
- };
- //褰撳墠鏃ユ湡鍙橀噺
- let tempDay = that.toDateByStr(that.year + "/" + that.month + "/" + i);
+ //鑾峰彇涓�涓湀鐨勫ぉ鏁�
+ let totalDay = that.getTotalDay(currentTimeStr)
- //鍒ゆ柇鏄惁涓哄綋澶�
- if (today_year == that.year && today_month == that.month && today_day == i)
- tempObj.isToday = true;
+ //鐢熸垚鏈湀鏃ュ巻
+ let today = new Date()
+ let today_year = today.getFullYear()
+ let today_month = today.getMonth() + 1
+ let today_day = today.getDate()
+ that.dateList = []
+ for (let i = 1; i <= totalDay; i++) { //寰幆鏃�
+ grid_sum++
- //鍛ㄥ叚鍜屽懆鏃ワ紝鐗规畩澶勭悊
- let tempCurrWeek = tempDay.getDay();
- if (tempCurrWeek == 0 || tempCurrWeek == 6)
- tempObj.isDaySunOrSat = true;
+ let tempObj = {
+ dateIndex: i,
+ key: 'date_' + i,
+ isRanges: false,
+ isToday: false
+ }
+ //褰撳墠鏃ユ湡鍙橀噺
+ let tempDay = that.toDateByStr(that.year + "/" + that.month + "/" + i)
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- if (_dateStart > tempDay || tempDay > _dateEnd) {
- tempObj.outOfDate = true;
- }
+ //鍒ゆ柇鏄惁涓哄綋澶�
+ if (today_year == that.year && today_month == that.month && today_day == i)
+ tempObj.isToday = true
- //鑾峰彇鍐滃巻
- if (that.showLunar) {
- let LunarDate = that.sloarToLunar(that.year, that.month, i);
- that.lunarMonth = LunarDate.lunarMonth;
- that.lunarYear = LunarDate.lunarYear;
- let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay;
- tempObj.lunarMonth = LunarDate.lunarMonth;
- tempObj.lunarYear = LunarDate.lunarYear;
- tempObj.lunarDay = LunarDate.lunarDay;
- tempObj.markText = tempLunarDay;
- tempObj.markTextColor = '#454545';
- }
+ //鍛ㄥ叚鍜屽懆鏃ワ紝鐗规畩澶勭悊
+ let tempCurrWeek = tempDay.getDay()
+ if (tempCurrWeek == 0 || tempCurrWeek == 6)
+ tempObj.isDaySunOrSat = true
- //璁剧疆浜嗘爣璁扮偣
- if (that.mark) {
- for (let z = 0; z < that.mark.length; z++) { //鍒ゆ柇鏄惁涓烘爣璁扮偣
- let tempDayMark = that.toDateByStr1(that.mark[z].time.trim())
- if (tempDay.getTime() == tempDayMark.getTime()) {
- let tempTextStr = that.mark[z].text
- if (that.mark[z].markPoint != false) { // 鏄惁鏄剧ず鐐�
- tempObj.pointText = that.mark[z].pointText ? that.mark[z].pointText : '鈼�';
- tempObj.pointTextColor = that.mark[z].pointTextColor ? that.mark[z].pointTextColor : undefined;
- }
- if (tempTextStr != undefined && tempTextStr != "") { // 鏄惁鏄剧ず鏂囧瓧
- tempObj.markText = tempTextStr;
- tempObj.markTextColor = that.mark[z].markTextColor ? that.mark[z].markTextColor : undefined;
- }
- break;
- }
- }
- }
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ if (_dateStart > tempDay || tempDay > _dateEnd) {
+ tempObj.outOfDate = true
+ }
- that.dateList.push(tempObj);
- }
+ //鑾峰彇鍐滃巻
+ if (that.showLunar) {
+ let LunarDate = that.sloarToLunar(that.year, that.month, i)
+ that.lunarMonth = LunarDate.lunarMonth
+ that.lunarYear = LunarDate.lunarYear
+ let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay
+ tempObj.lunarMonth = LunarDate.lunarMonth
+ tempObj.lunarYear = LunarDate.lunarYear
+ tempObj.lunarDay = LunarDate.lunarDay
+ tempObj.markText = tempLunarDay
+ tempObj.markTextColor = '#454545'
+ }
- that.setRange();
+ //璁剧疆浜嗘爣璁扮偣
+ if (that.mark) {
+ for (let z = 0; z < that.mark.length; z++) { //鍒ゆ柇鏄惁涓烘爣璁扮偣
+ let tempDayMark = that.toDateByStr1(that.mark[z].time.trim())
+ if (tempDay.getTime() == tempDayMark.getTime()) {
+ let tempTextStr = that.mark[z].text
+ if (that.mark[z].markPoint != false) { // 鏄惁鏄剧ず鐐�
+ tempObj.pointText = that.mark[z].pointText ? that.mark[z].pointText : '鈼�'
+ tempObj.pointTextColor = that.mark[z].pointTextColor ? that.mark[z].pointTextColor : undefined
+ }
+ if (tempTextStr != undefined && tempTextStr != "") { // 鏄惁鏄剧ず鏂囧瓧
+ tempObj.markText = tempTextStr
+ tempObj.markTextColor = that.mark[z].markTextColor ? that.mark[z].markTextColor : undefined
+ }
+ break
+ }
+ }
+ }
- // 鍒涘缓鍚庨潰鐨勭┖鐧斤紝琛ュ浜旇
- that.afterDateList = [];
- if (grid_sum < 42) { // 鍒涘缓鍚庨潰鐨勭┖鐧斤紝琛ュ浜旇
- let j = 0;
+ that.dateList.push(tempObj)
+ }
- //鑾峰彇涓嬩竴鏈�
- let TempMonthNext;
- let TempYearNext;
- if (that.month == 12) { //璺ㄥ勾
- TempMonthNext = 1;
- TempYearNext = that.year + 1;
- } else {
- TempYearNext = that.year;
- TempMonthNext = that.month + 1;
- }
+ that.setRange()
- for (let i = grid_sum; i < 42; i++) {
- j++;
+ // 鍒涘缓鍚庨潰鐨勭┖鐧斤紝琛ュ浜旇
+ that.afterDateList = []
+ if (grid_sum < 42) { // 鍒涘缓鍚庨潰鐨勭┖鐧斤紝琛ュ浜旇
+ let j = 0
- let tempObj = {
- dateIndex: j,
- key: 'after_' + j
- };
- //鑾峰彇鍐滃巻
- if (that.showLunar) {
- let LunarDate = that.sloarToLunar(TempYearNext, TempMonthNext, j);
- let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay;
- tempObj.markText = tempLunarDay;
- }
+ //鑾峰彇涓嬩竴鏈�
+ let TempMonthNext
+ let TempYearNext
+ if (that.month == 12) { //璺ㄥ勾
+ TempMonthNext = 1
+ TempYearNext = that.year + 1
+ } else {
+ TempYearNext = that.year
+ TempMonthNext = that.month + 1
+ }
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- let _tempAfterDate = new Date(TempYearNext + "/" + TempMonthNext + "/" + j);
- if (_dateStart > _tempAfterDate || _tempAfterDate > _dateEnd) {
- tempObj.outOfDate = true;
- }
+ for (let i = grid_sum; i < 42; i++) {
+ j++
- that.afterDateList.push(tempObj);
- }
- }
- },
- sloarToLunar(year,month,day){
- // console.log('----')
- // console.log(year + "--" +month+ "--" + day)
- let result = lunarYearTool.sloarToLunar(year,month,day);
- //console.log(result)
- return result;
- },
- getTotalDay(time) { //鑾峰彇鏈� 鏃ユ湡鎬绘暟
- time = time.replace(/-/g, "/");
- let selectedDate = new Date(time);
- if (selectedDate == "Invalid Date") {
- selectedDate = new Date(time + "/01");
- }
-
- let dayMany = new Date(selectedDate.getFullYear(),(selectedDate.getMonth() + 1), 0).getDate()
- return dayMany;
- },
- toDateByStr(timeStr) { //瀛楃涓茶浆鎹㈡椂闂达紝杞崲澶辫触鎴栬�呬笉浼犲瓧绗︿覆鍒欒繑鍥炲綋鍓�
- let timeObj;
- if (timeStr) {
- timeObj = new Date(timeStr.replace(/-/g, "/"));
- }
- if (!timeStr || timeObj == "Invalid Date")
- timeObj = new Date();
- return timeObj;
- },
- toDateByStr1(timeStr) { //瀛楃涓茶浆鎹㈡椂闂达紝杞崲澶辫触鎴栬�呬笉浼犲瓧绗︿覆鍒檔ull
- try {
- let timeObj;
- if (timeStr) {
- timeObj = new Date(timeStr.replace(/-/g, "/"));
- }
- if (!timeStr || timeObj == "Invalid Date")
- return null;
- return timeObj;
- } catch (e) {
- return null;
- }
- },
- getTimeStrFormat(timeStr) { //鑾峰彇鏍煎紡鍖栫殑鏃堕棿 yyyy-MM-dd
- let timeObj;
- if (timeStr) {
- timeObj = new Date(timeStr.replace(/-/g, "/"));
- }
- if (!timeStr || timeObj == "Invalid Date")
- timeObj = new Date();
- return timeObj.getFullYear() + "-" + (timeObj.getMonth() + 1) + "-" + timeObj.getDate();
- },
- selectedDateFun(index) { //鐐瑰嚮鏃ユ湡
- let that = this;
- let selectObj = that.dateList[index - 1];
- selectObj.year = that.year;
- selectObj.month = that.month;
- selectObj.day = index;
- selectObj.time = that.year + "-" + that.month + "-" + index;
- that.$emit('dayChange', selectObj);
+ let tempObj = {
+ dateIndex: j,
+ key: 'after_' + j
+ }
+ //鑾峰彇鍐滃巻
+ if (that.showLunar) {
+ let LunarDate = that.sloarToLunar(TempYearNext, TempMonthNext, j)
+ let tempLunarDay = LunarDate.lunarDay == '鍒濅竴' ? LunarDate.lunarMonth + '鏈�' : LunarDate.lunarDay
+ tempObj.markText = tempLunarDay
+ }
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- if (that.checkOutOfDate(selectObj.time)) {
- return;
- }
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ let _tempAfterDate = new Date(TempYearNext + "/" + TempMonthNext + "/" + j)
+ if (_dateStart > _tempAfterDate || _tempAfterDate > _dateEnd) {
+ tempObj.outOfDate = true
+ }
- that.currentSelectTime = index;
-
- console.log(index)
+ that.afterDateList.push(tempObj)
+ }
+ }
+ },
+ sloarToLunar(year, month, day) {
+ // console.log('----')
+ // console.log(year + "--" +month+ "--" + day)
+ let result = lunarYearTool.sloarToLunar(year, month, day)
+ //console.log(result)
+ return result
+ },
+ getTotalDay(time) { //鑾峰彇鏈� 鏃ユ湡鎬绘暟
+ time = time.replace(/-/g, "/")
+ let selectedDate = new Date(time)
+ if (selectedDate == "Invalid Date") {
+ selectedDate = new Date(time + "/01")
+ }
- //寮�鍚簡鑼冨洿閫夋嫨妯″紡
- if (that.rangeMode) {
- if (!that.firstRangeSelected) { //閫夋嫨寮�濮嬫椂闂�
- that.firstRangeSelected = !that.firstRangeSelected
- that.rangeStart_ = selectObj.time;
- that.rangeEnd_ = undefined;
- that.clearRange();
- } else { //閫夋嫨浜嗙粨鏉熸椂闂�
- that.rangeEnd_ = selectObj.time;
- that.firstRangeSelected = !that.firstRangeSelected
- that.$emit('rangeChange', {
- start: that.rangeStart_,
- end: that.rangeEnd_,
- });
- that.setRange();
- }
- }
- },
- addMonth() { //鍔犱竴涓湀
- let that = this;
- that.currentSelectTime = ''
- let _Month = that.month;
- let _Year = that.year;
- if (that.month == 12) { //璺ㄥ勾
- _Month = 1;
- _Year += 1;
- } else {
- _Month += 1;
- }
+ let dayMany = new Date(selectedDate.getFullYear(), (selectedDate.getMonth() + 1), 0).getDate()
+ return dayMany
+ },
+ toDateByStr(timeStr) { //瀛楃涓茶浆鎹㈡椂闂达紝杞崲澶辫触鎴栬�呬笉浼犲瓧绗︿覆鍒欒繑鍥炲綋鍓�
+ let timeObj
+ if (timeStr) {
+ timeObj = new Date(timeStr.replace(/-/g, "/"))
+ }
+ if (!timeStr || timeObj == "Invalid Date")
+ timeObj = new Date()
+ return timeObj
+ },
+ toDateByStr1(timeStr) { //瀛楃涓茶浆鎹㈡椂闂达紝杞崲澶辫触鎴栬�呬笉浼犲瓧绗︿覆鍒檔ull
+ try {
+ let timeObj
+ if (timeStr) {
+ timeObj = new Date(timeStr.replace(/-/g, "/"))
+ }
+ if (!timeStr || timeObj == "Invalid Date")
+ return null
+ return timeObj
+ } catch (e) {
+ return null
+ }
+ },
+ getTimeStrFormat(timeStr) { //鑾峰彇鏍煎紡鍖栫殑鏃堕棿 yyyy-MM-dd
+ let timeObj
+ if (timeStr) {
+ timeObj = new Date(timeStr.replace(/-/g, "/"))
+ }
+ if (!timeStr || timeObj == "Invalid Date")
+ timeObj = new Date()
+ return timeObj.getFullYear() + "-" + (timeObj.getMonth() + 1) + "-" + timeObj.getDate()
+ },
+ selectedDateFun(index) { //鐐瑰嚮鏃ユ湡
+ let that = this
+ let selectObj = that.dateList[index - 1]
+ selectObj.year = that.year
+ selectObj.month = that.month
+ selectObj.day = index
+ selectObj.time = that.year + "-" + that.month + "-" + index
+ that.$emit('dayChange', selectObj)
- let str = _Year + "/" + _Month + "/01";
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ if (that.checkOutOfDate(selectObj.time)) {
+ return
+ }
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- if (that.checkOutOfDate(str)) {
- that.nextDisabled = true;
- return;
- }
+ that.currentSelectTime = index
- that.month = _Month;
- that.year = _Year;
- that.lastDisabled = false;
+ console.log(index)
- //妫�鏌ユ棩鏈熶笂闄愬�兼槸鍚﹀湪褰撴湀鍐咃紝濡傛灉鍦ㄥ垯涓嶈兘鍐嶅垏鎹笅涓湀
- if (that.checkDateRange(that.year, that.month, 1)) {
- that.nextDisabled = true;
- }
+ //寮�鍚簡鑼冨洿閫夋嫨妯″紡
+ if (that.rangeMode) {
+ if (!that.firstRangeSelected) { //閫夋嫨寮�濮嬫椂闂�
+ that.firstRangeSelected = !that.firstRangeSelected
+ that.rangeStart_ = selectObj.time
+ that.rangeEnd_ = undefined
+ that.clearRange()
+ } else { //閫夋嫨浜嗙粨鏉熸椂闂�
+ that.rangeEnd_ = selectObj.time
+ that.firstRangeSelected = !that.firstRangeSelected
+ that.$emit('rangeChange', {
+ start: that.rangeStart_,
+ end: that.rangeEnd_,
+ })
+ that.setRange()
+ }
+ }
+ },
+ addMonth() { //鍔犱竴涓湀
+ let that = this
+ that.currentSelectTime = ''
+ let _Month = that.month
+ let _Year = that.year
+ if (that.month == 12) { //璺ㄥ勾
+ _Month = 1
+ _Year += 1
+ } else {
+ _Month += 1
+ }
- if (that.rangeMode) { //寮�鍚簡鑼冨洿妯″紡
- that.currentSelectTime = undefined;
- }
+ let str = _Year + "/" + _Month + "/01"
- that.$emit('monthChange', {
- date: str
- });
- that.render(str);
- },
- subMonth() { //鍑忎竴涓湀
- let that = this;
-
- that.currentSelectTime = ''
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ if (that.checkOutOfDate(str)) {
+ that.nextDisabled = true
+ return
+ }
- let _Month = that.month;
- let _Year = that.year;
- if (that.month == 1) { //璺ㄥ勾
- _Month = 12;
- _Year -= 1;
- } else {
- _Month -= 1;
- }
+ that.month = _Month
+ that.year = _Year
+ that.lastDisabled = false
- let str = _Year + "/" + _Month + "/01";
+ //妫�鏌ユ棩鏈熶笂闄愬�兼槸鍚﹀湪褰撴湀鍐咃紝濡傛灉鍦ㄥ垯涓嶈兘鍐嶅垏鎹笅涓湀
+ if (that.checkDateRange(that.year, that.month, 1)) {
+ that.nextDisabled = true
+ }
- //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
- let _totalDay = that.getTotalDay(str);
- if (that.checkOutOfDate(_Year + "/" + _Month + "/" + _totalDay)) {
- that.lastDisabled = true;
- return;
- }
+ if (that.rangeMode) { //寮�鍚簡鑼冨洿妯″紡
+ that.currentSelectTime = undefined
+ }
- that.month = _Month;
- that.year = _Year;
- that.nextDisabled = false;
+ that.$emit('monthChange', {
+ date: str
+ })
+ that.render(str)
+ },
+ subMonth() { //鍑忎竴涓湀
+ let that = this
- //妫�鏌ユ棩鏈熶笅闄愬�兼槸鍚﹀湪褰撴湀鍐咃紝濡傛灉鍦ㄥ垯涓嶈兘鍐嶅垏鎹笂涓湀
- if (that.checkDateRange(that.year, that.month)) {
- that.lastDisabled = true;
- }
+ that.currentSelectTime = ''
- if (that.rangeMode) { //寮�鍚簡鑼冨洿妯″紡
- that.currentSelectTime = undefined;
- }
+ let _Month = that.month
+ let _Year = that.year
+ if (that.month == 1) { //璺ㄥ勾
+ _Month = 12
+ _Year -= 1
+ } else {
+ _Month -= 1
+ }
- that.$emit('monthChange', {
- date: str
- });
- that.render(str);
- },
- backToToday() { //鍥炲埌浠婂ぉ
- let currDate = new Date();
- let _year = currDate.getFullYear();
- let _month = currDate.getMonth() + 1;
+ let str = _Year + "/" + _Month + "/01"
- this.currentSelectTime = getDay().day
-
- this.$emit('dayChange', { time: getDay().date });
+ //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿
+ let _totalDay = that.getTotalDay(str)
+ if (that.checkOutOfDate(_Year + "/" + _Month + "/" + _totalDay)) {
+ that.lastDisabled = true
+ return
+ }
- //濡傛灉宸茬粡鏄綋鏈�
- if (_year == this.year && _month == this.month) {
- return;
- }
-
- let value = _year + "/" + _month + "/" + currDate.getDate();
- this.$emit('monthChange', {
- date: value
- });
- this.lastDisabled = true
-
- this.render(value);
- },
- setRange() { //璁剧疆鑼冨洿
- let that = this;
- let rangeStartDate = that.toDateByStr1(that.rangeStart_);
- let rangeEndDate = that.toDateByStr1(that.rangeEnd_);
- if (!rangeStartDate || !rangeEndDate)
- return;
- if (rangeStartDate > rangeEndDate) { //闃叉鑼冨洿鍑洪敊
- let tempD = rangeEndDate;
- rangeEndDate = rangeStartDate;
- rangeStartDate = tempD;
- }
+ that.month = _Month
+ that.year = _Year
+ that.nextDisabled = false
- //寰幆鍒ゆ柇鑼冨洿
- for (let i = 0; i < that.dateList.length; i++) {
- let _TempDtStr = that.year + "/" + that.month + "/" + that.dateList[i].dateIndex;
- let _TempDt = that.toDateByStr1(_TempDtStr);
- that.dateList[i].isRanges = false;
- if (rangeStartDate <= _TempDt && _TempDt <= rangeEndDate) //鏃堕棿鍦ㄨ寖鍥村唴
- that.dateList[i].isRanges = true;
- }
- },
- clearRange() { //鍏抽棴鑼冨洿妯″紡鑼冨洿
- let that = this;
- //寰幆鍒ゆ柇鑼冨洿
- for (let i = 0; i < that.dateList.length; i++) {
- that.dateList[i].isRanges = false;
- }
- },
- checkOutOfDate(time) { //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿,yyyy-MM-dd
- let that = this;
- let _dateStart = that.toDateByStr1(that.dateStart);
- let _dateEnd = that.toDateByStr1(that.dateEnd);
- let _tempDate = that.toDateByStr1(time);
- if (_dateStart > _tempDate || _tempDate > _dateEnd) {
- return true;
- } else
- return false;
- },
- checkDateRange(year, month, type) { //鍒ゆ柇鑼冨洿鐣岄檺鍊兼槸鍚﹀湪褰撴湀鍐�,yyyy-MM-dd,type锛�1 涓婇檺鍊�,鍏朵粬锛氫笅闄愬��
- let that = this;
+ //妫�鏌ユ棩鏈熶笅闄愬�兼槸鍚﹀湪褰撴湀鍐咃紝濡傛灉鍦ㄥ垯涓嶈兘鍐嶅垏鎹笂涓湀
+ if (that.checkDateRange(that.year, that.month)) {
+ that.lastDisabled = true
+ }
- let totalDay = that.getTotalDay(year + '/' + month + '/01');
- let firstD = that.toDateByStr1(year + '/' + month + '/01');
- let lastD = that.toDateByStr1(year + '/' + month + '/' + totalDay);
+ if (that.rangeMode) { //寮�鍚簡鑼冨洿妯″紡
+ that.currentSelectTime = undefined
+ }
- if (type == 1) { //涓婇檺鍊�
- let _dateEnd = that.toDateByStr1(that.dateEnd);
- if (firstD <= _dateEnd && _dateEnd <= lastD) {
- return true;
- } else
- return false;
- } else { //涓嬮檺鍊�
- let _dateStart = that.toDateByStr1(that.dateStart);
- if (firstD <= _dateStart && _dateStart <= lastD) {
- return true;
- } else
- return false;
- }
- },
- calendarTransform(x,time){ //鏃ュ巻婊戝姩鍔ㄧ敾
- this.transform_x = x;
- this.transform_time = time;
- },
- touchstart(event) {
- if(!this.canDrag)
- return;
- this.startPageX = event.touches[0].pageX;
- this.startPageY = event.touches[0].pageY;
- },
- touchmove(event) {
- if(!this.canDrag)
- return;
- let touchmovePageX = event.touches[0].pageX;
- let result = touchmovePageX - this.startPageX;
- this.calendarTransform(result,0);
- },
- touchend(event) {
- if(!this.canDrag)
- return;
- let that = this;
- let endPageX = event.changedTouches[0].pageX;
- let endPageY = event.changedTouches[0].pageY;
- let x = Math.abs(that.startPageX - endPageX); //妯潗鏍囦箣宸�
- let y = Math.abs(that.startPageY - endPageY); //绾靛潗鏍囦箣宸�
-
- let screenX = 0;
- try {
- const res = uni.getSystemInfoSync();
- screenX = res.windowWidth;
- } catch (e) {
- console.error(e)
- return;
- }
- if (that.startPageX > endPageX) { //宸︽粦
- let a = Math.atan(y / x);
- let Rate = x / screenX;
- if (a < Math.PI / 6 && Rate > 0.3) {
- screenX = -screenX;
- that.calendarTransform(screenX,300);
- setTimeout(function(){
- that.addMonth();
- that.calendarTransform(0,0);
- },300);
- }
- else{
- that.calendarTransform(0,300);
- }
- } else {
- let a = Math.atan(y / x);
- let Rate = x / screenX;
- if (a < Math.PI / 6 && Rate > 0.3) {
- that.calendarTransform(screenX,300);
- setTimeout(function(){
- that.subMonth();
- that.calendarTransform(0,0);
- },300);
- }
- else{
- that.calendarTransform(0,300);
- }
- }
- }
- },
- watch: {
- currentTime: function(val, oldVal) { //鏃堕棿鏀瑰彉
- let dateNew = this.toDateByStr1(val);
- if (dateNew.getFullYear() == this.year && (dateNew.getMonth() + 1) == this.month) {
- console.log('time is not change')
- } else {
- this.currentSelectTime = dateNew.getDate();
- this.render();
- }
- },
- range: function(val, oldVal) { //鑼冨洿鏀瑰彉
- if (val.rangeStart != oldVal.rangeStart || val.rangeEnd != oldVal.rangeEnd) {
- this.rangeStart_ = val.rangeStart;
- this.rangeEnd_ = val.rangeEnd;
- this.setRange();
- }
- },
- mark: function(val, oldVal) { //鏍囪鏀瑰彉
- this.render();
- },
- rangeMode: function(val, oldVal) { //鑼冨洿鏀瑰彉
- if (!val) { //濡傛灉鏄叧闂寖鍥存ā寮�
- this.rangeStart_ = undefined; //鏍囪鑼冨洿寮�濮嬶紝yyyyMM-dd
- this.rangeEnd_ = undefined; //鏍囪鑼冨洿缁撴潫锛寉yyyMM-dd
- this.firstRangeSelected = false;
- this.clearRange()
- }
- },
- },
- computed: {
- transformObj:function () {
- return 'translate3d(' + this.transform_x + 'px, 0px, 0px) translateZ(0px)';
- },
- transformTimeObj:function () {
- return this.transform_time + 'ms';
- }
- },
- }
+ that.$emit('monthChange', {
+ date: str
+ })
+ that.render(str)
+ },
+ backToToday() { //鍥炲埌浠婂ぉ
+ let currDate = new Date()
+ let _year = currDate.getFullYear()
+ let _month = currDate.getMonth() + 1
+
+ this.currentSelectTime = getDay().day
+
+ this.$emit('dayChange', { time: getDay().date })
+
+ //濡傛灉宸茬粡鏄綋鏈�
+ if (_year == this.year && _month == this.month) {
+ return
+ }
+
+ let value = _year + "/" + _month + "/" + currDate.getDate()
+ this.$emit('monthChange', {
+ date: value
+ })
+ this.lastDisabled = true
+
+ this.render(value)
+ },
+ setRange() { //璁剧疆鑼冨洿
+ let that = this
+ let rangeStartDate = that.toDateByStr1(that.rangeStart_)
+ let rangeEndDate = that.toDateByStr1(that.rangeEnd_)
+ if (!rangeStartDate || !rangeEndDate)
+ return
+ if (rangeStartDate > rangeEndDate) { //闃叉鑼冨洿鍑洪敊
+ let tempD = rangeEndDate
+ rangeEndDate = rangeStartDate
+ rangeStartDate = tempD
+ }
+
+ //寰幆鍒ゆ柇鑼冨洿
+ for (let i = 0; i < that.dateList.length; i++) {
+ let _TempDtStr = that.year + "/" + that.month + "/" + that.dateList[i].dateIndex
+ let _TempDt = that.toDateByStr1(_TempDtStr)
+ that.dateList[i].isRanges = false
+ if (rangeStartDate <= _TempDt && _TempDt <= rangeEndDate) //鏃堕棿鍦ㄨ寖鍥村唴
+ that.dateList[i].isRanges = true
+ }
+ },
+ clearRange() { //鍏抽棴鑼冨洿妯″紡鑼冨洿
+ let that = this
+ //寰幆鍒ゆ柇鑼冨洿
+ for (let i = 0; i < that.dateList.length; i++) {
+ that.dateList[i].isRanges = false
+ }
+ },
+ checkOutOfDate(time) { //鍒ゆ柇鏄惁瓒呭嚭鏃ユ湡鑼冨洿,yyyy-MM-dd
+ let that = this
+ let _dateStart = that.toDateByStr1(that.dateStart)
+ let _dateEnd = that.toDateByStr1(that.dateEnd)
+ let _tempDate = that.toDateByStr1(time)
+ if (_dateStart > _tempDate || _tempDate > _dateEnd) {
+ return true
+ } else
+ return false
+ },
+ checkDateRange(year, month, type) { //鍒ゆ柇鑼冨洿鐣岄檺鍊兼槸鍚﹀湪褰撴湀鍐�,yyyy-MM-dd,type锛�1 涓婇檺鍊�,鍏朵粬锛氫笅闄愬��
+ let that = this
+
+ let totalDay = that.getTotalDay(year + '/' + month + '/01')
+ let firstD = that.toDateByStr1(year + '/' + month + '/01')
+ let lastD = that.toDateByStr1(year + '/' + month + '/' + totalDay)
+
+ if (type == 1) { //涓婇檺鍊�
+ let _dateEnd = that.toDateByStr1(that.dateEnd)
+ if (firstD <= _dateEnd && _dateEnd <= lastD) {
+ return true
+ } else
+ return false
+ } else { //涓嬮檺鍊�
+ let _dateStart = that.toDateByStr1(that.dateStart)
+ if (firstD <= _dateStart && _dateStart <= lastD) {
+ return true
+ } else
+ return false
+ }
+ },
+ calendarTransform(x, time) { //鏃ュ巻婊戝姩鍔ㄧ敾
+ this.transform_x = x
+ this.transform_time = time
+ },
+ touchstart(event) {
+ if (!this.canDrag)
+ return
+ this.startPageX = event.touches[0].pageX
+ this.startPageY = event.touches[0].pageY
+ },
+ touchmove(event) {
+ if (!this.canDrag)
+ return
+ let touchmovePageX = event.touches[0].pageX
+ let result = touchmovePageX - this.startPageX
+ this.calendarTransform(result, 0)
+ },
+ touchend(event) {
+ if (!this.canDrag)
+ return
+ let that = this
+ let endPageX = event.changedTouches[0].pageX
+ let endPageY = event.changedTouches[0].pageY
+ let x = Math.abs(that.startPageX - endPageX) //妯潗鏍囦箣宸�
+ let y = Math.abs(that.startPageY - endPageY) //绾靛潗鏍囦箣宸�
+
+ let screenX = 0
+ try {
+ const res = uni.getSystemInfoSync()
+ screenX = res.windowWidth
+ } catch (e) {
+ console.error(e)
+ return
+ }
+ if (that.startPageX > endPageX) { //宸︽粦
+ let a = Math.atan(y / x)
+ let Rate = x / screenX
+ if (a < Math.PI / 6 && Rate > 0.3) {
+ screenX = -screenX
+ that.calendarTransform(screenX, 300)
+ setTimeout(function () {
+ that.addMonth()
+ that.calendarTransform(0, 0)
+ }, 300)
+ }
+ else {
+ that.calendarTransform(0, 300)
+ }
+ } else {
+ let a = Math.atan(y / x)
+ let Rate = x / screenX
+ if (a < Math.PI / 6 && Rate > 0.3) {
+ that.calendarTransform(screenX, 300)
+ setTimeout(function () {
+ that.subMonth()
+ that.calendarTransform(0, 0)
+ }, 300)
+ }
+ else {
+ that.calendarTransform(0, 300)
+ }
+ }
+ }
+ },
+ watch: {
+ currentTime: function (val, oldVal) { //鏃堕棿鏀瑰彉
+ let dateNew = this.toDateByStr1(val)
+ if (dateNew.getFullYear() == this.year && (dateNew.getMonth() + 1) == this.month) {
+ console.log('time is not change')
+ } else {
+ this.currentSelectTime = dateNew.getDate()
+ this.render()
+ }
+ },
+ range: function (val, oldVal) { //鑼冨洿鏀瑰彉
+ if (val.rangeStart != oldVal.rangeStart || val.rangeEnd != oldVal.rangeEnd) {
+ this.rangeStart_ = val.rangeStart
+ this.rangeEnd_ = val.rangeEnd
+ this.setRange()
+ }
+ },
+ mark: function (val, oldVal) { //鏍囪鏀瑰彉
+ this.render()
+ },
+ rangeMode: function (val, oldVal) { //鑼冨洿鏀瑰彉
+ if (!val) { //濡傛灉鏄叧闂寖鍥存ā寮�
+ this.rangeStart_ = undefined //鏍囪鑼冨洿寮�濮嬶紝yyyyMM-dd
+ this.rangeEnd_ = undefined //鏍囪鑼冨洿缁撴潫锛寉yyyMM-dd
+ this.firstRangeSelected = false
+ this.clearRange()
+ }
+ },
+ },
+ computed: {
+ transformObj: function () {
+ return 'translate3d(' + this.transform_x + 'px, 0px, 0px) translateZ(0px)'
+ },
+ transformTimeObj: function () {
+ return this.transform_time + 'ms'
+ }
+ },
+}
</script>
<style lang="scss">
-.calendar-Time-header{
- /* text-align: center;
+.calendar-Time-header {
+ /* text-align: center;
height: 50upx;
line-height: 50upx;
vertical-align: middle;
padding: 20upx; */
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 20rpx;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20rpx;
}
.header-left {
- display: flex;
- align-items: center;
+ display: flex;
+ align-items: center;
}
.header-left image {
- width: 30rpx;
- height: 30rpx;
+ width: 30rpx;
+ height: 30rpx;
}
.header-left text {
- font-size: 32rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #222222;
- margin: 0 40rpx
+ font-size: 32rpx;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ margin: 0 40rpx;
}
.header-right {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: $uni-color-primary;
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: $uni-color-primary;
}
-.calendar-TimeH{
+.calendar-TimeH {
}
-.calendar-lastMonth{
- width: 100upx;
- font-size: 35upx;
- margin-right: 10%;
- padding: 0 5px;
- text-align: center;
+.calendar-lastMonth {
+ width: 100upx;
+ font-size: 35upx;
+ margin-right: 10%;
+ padding: 0 5px;
+ text-align: center;
}
-.calendar-nextMonth{
- width: 100upx;
- text-align: center;
- margin-left: 10%;
- font-size: 35upx;
- padding: 0 5px;
+.calendar-nextMonth {
+ width: 100upx;
+ text-align: center;
+ margin-left: 10%;
+ font-size: 35upx;
+ padding: 0 5px;
}
-.calendar-backToToday{
- text-align: center;
- font-size: 24upx;
- position: absolute;
- right: 5px;
+.calendar-backToToday {
+ text-align: center;
+ font-size: 24upx;
+ position: absolute;
+ right: 5px;
}
.calendar-row:before,
.calendar-row:after {
- display: table;
- content: ' ';
+ display: table;
+ content: " ";
}
.calendar-row:after {
- clear: both;
+ clear: both;
}
.calendar-col {
- width: 14.285714%;
- max-width: 14.285714%;
- position: relative;
- float: left;
- font-weight: 500;
- min-height: 80upx;
- font-size: 28rpx;
- /* color: #999999; */
- color: #222222;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- overflow: hidden;
-
- display: flex;
- align-items: center;
- justify-content: center;
+ width: 14.285714%;
+ max-width: 14.285714%;
+ position: relative;
+ float: left;
+ font-weight: 600;
+ min-height: 80upx;
+ font-size: 28rpx;
+ /* color: #999999; */
+ color: #222222;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.aligncanter {
- text-align: center;
- /* border-bottom: 1rpx solid #E5E5E5; */
+ text-align: center;
+ /* border-bottom: 1rpx solid #E5E5E5; */
}
.calendar-header {
- color: gray;
- height: 40upx;
- line-height: 40upx;
- vertical-align: middle;
- font-size: 24upx;
+ color: gray;
+ height: 40upx;
+ line-height: 40upx;
+ vertical-align: middle;
+ font-size: 24upx;
}
.calendar-day {
- height: 80upx;
- transform: translate3d(0px, 0px, 0px) translateZ(0px); transition-duration: 0ms; transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+ height: 80upx;
+ transform: translate3d(0px, 0px, 0px) translateZ(0px);
+ transition-duration: 0ms;
+ transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
}
-
.calendar-content {
}
-.calendar-date{
- /* color: #000; */
+.calendar-date {
+ /* color: #000; */
}
.calendar-today {
- /* border-radius: 6upx;
+ /* border-radius: 6upx;
background-color: $uni-color-primary; */
- color: $uni-color-primary;
- /* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
+ color: $uni-color-primary;
+ /* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
box-shadow: 0px 2upx 10upx #ABABAB; */
}
-.calendar-today .calendar-point{
- color: white !important;
+.calendar-today .calendar-point {
+ color: white !important;
}
-.calendar-today .calendar-text{
- color: white !important;
+.calendar-today .calendar-text {
+ color: white !important;
}
-.calendar-col-lastMonth .calendar-text{
- color: gray;
+.calendar-col-lastMonth .calendar-text {
+ color: gray;
}
-.calendar-col-nextMonth .calendar-text{
- color: gray;
+.calendar-col-nextMonth .calendar-text {
+ color: gray;
}
/* .calendar-today .calendar-date{
@@ -838,83 +886,105 @@
} */
.calendar-active {
- color:#FFFFFF !important;
- background-color: $uni-color-primary;
- /* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
+ color: #ffffff !important;
+ background-color: $uni-color-primary;
+ /* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
box-shadow: 0px 2upx 10upx #ABABAB; */
}
/* 鑼冨洿鏍囪 */
.calendar-range {
- /* color:#01AAED; */
- border-radius: 0px;
- background-color: #D9D9D9;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
+ /* color:#01AAED; */
+ border-radius: 0px;
+ background-color: #d9d9d9;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
}
-
-
.ClearBoth {
- clear: both;
+ clear: both;
}
-.calendar-col-nextMonth{
- color:gray;
+.calendar-col-nextMonth {
+ color: gray;
}
-.calendar-col-lastMonth{
- color:gray;
+.calendar-col-lastMonth {
+ color: gray;
}
-.calendar-btn-disabled{
- color:gainsboro;
+.calendar-btn-disabled {
+ color: gainsboro;
}
-.calendar-point{
- width: 28rpx;
- height: 28rpx;
- box-sizing: border-box;
- background-color: #F62710;
- border-radius: 50%;
- font-size: 16upx;
- color: #FFFFFF;
- top:2upx;
- right: 2upx;
- position: absolute;
- display: flex;
- align-items: center;
- justify-content: center;
+.calendar-point {
+ width: 28rpx;
+ height: 28rpx;
+ box-sizing: border-box;
+ background-color: #f62710;
+ border-radius: 50%;
+ font-size: 16upx;
+ color: #ffffff;
+ top: 2upx;
+ right: 2upx;
+ position: absolute;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
-.calendar-text{
- padding: 4rpx 0;
- width:100%;font-size: 20upx;color: #F62710;top:40upx;left: 0px;position: absolute;overflow:hidden;
+.calendar-text {
+ padding: 4rpx 0;
+ width: 100%;
+ font-size: 20upx;
+ color: #f62710;
+ top: 40upx;
+ left: 0px;
+ position: absolute;
+ overflow: hidden;
}
-.dayValue{
- text-align: center;
- /* color: #000000; */
+.dayValue {
+ text-align: center;
+ /* color: #000000; */
}
-.calendar-day-6-7{
- /* color: orangered; */
+.calendar-day-6-7 {
+ /* color: orangered; */
}
/* 瓒呭嚭鏃ユ湡鑼冨洿 */
-.calendar-out-of-Date{
- background-color: #EAEAEA;
+.calendar-out-of-Date {
+ background-color: #eaeaea;
}
-.calendar-out-of-Date .calendar-date{
- color: gray;
+.calendar-out-of-Date .calendar-date {
+ color: gray;
}
-
-
-
-
/* 浠ヤ笅涓哄疄鐜�0.5px搴曢儴杈圭晫 */
-.under_line{position: relative;}
+.under_line {
+ position: relative;
+}
.under_line:before,
-.under_line:after{position: absolute;content: " ";height: 1px;width: 100%;left: 0;transform-origin: 0 0;-webkit-transform-origin: 0 0;}
+.under_line:after {
+ position: absolute;
+ content: " ";
+ height: 1px;
+ width: 100%;
+ left: 0;
+ transform-origin: 0 0;
+ -webkit-transform-origin: 0 0;
+}
/* .fineLine:before{椤堕儴top: 0;background: #000;} */
-.under_line:after{bottom: 0;}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5){.under_line:after,.under_line:before{-webkit-transform: scaleY(.667);}}
-@media only screen and (-webkit-min-device-pixel-ratio: 2){.under_line:after,.under_line:before{-webkit-transform: scaleY(.5);}}
+.under_line:after {
+ bottom: 0;
+}
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+ .under_line:after,
+ .under_line:before {
+ -webkit-transform: scaleY(0.667);
+ }
+}
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+ .under_line:after,
+ .under_line:before {
+ -webkit-transform: scaleY(0.5);
+ }
+}
/* 浠ヤ笂涓哄疄鐜�0.5px搴曢儴杈圭晫 */
</style>
diff --git a/h5/n_pages/applicationRecord/applicationRecord.vue b/h5/n_pages/applicationRecord/applicationRecord.vue
index ca251ce..776c700 100644
--- a/h5/n_pages/applicationRecord/applicationRecord.vue
+++ b/h5/n_pages/applicationRecord/applicationRecord.vue
@@ -275,7 +275,7 @@
text {
&:nth-child(1) {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
&:nth-child(2) {
@@ -330,7 +330,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search_list {
diff --git a/h5/n_pages/login/login.vue b/h5/n_pages/login/login.vue
index 060f0c8..f5ac782 100644
--- a/h5/n_pages/login/login.vue
+++ b/h5/n_pages/login/login.vue
@@ -5,11 +5,16 @@
<view class="login_list">
<view class="login_list_item">
<image src="@/static/login_ic_phone@2x.png" mode="widthFix" />
- <input v-model="form.idCard" maxlength="18" type="number" placeholder="鎵嬫満鍙�">
+ <input
+ v-model="form.idCard"
+ maxlength="18"
+ type="number"
+ placeholder="鎵嬫満鍙�"
+ />
</view>
<view class="login_list_item">
<image src="@/static/login_ic_password@2x.png" mode="widthFix" />
- <input v-model="form.password" type="password" placeholder="瀵嗙爜">
+ <input v-model="form.password" type="password" placeholder="瀵嗙爜" />
</view>
</view>
<view class="login_btn">
@@ -22,7 +27,7 @@
export default {
name: 'login',
- data () {
+ data() {
return {
form: {
idCard: '',
@@ -31,88 +36,92 @@
}
},
- created () {
-
+ created() {
+
},
methods: {
-
+
}
}
</script>
<style lang="scss" scoped>
- .login {
- width: 100%;
- height: 100vh;
- display: flex;
- padding-top: 160rpx;
- box-sizing: border-box;
- align-items: center;
- flex-direction: column;
- background: linear-gradient(180deg, rgba(2,94,239,0.2) 0%, rgba(2,94,239,0) 100%);
- .login_logo {
- width: 180rpx;
- height: 180rpx;
- }
- .login_title {
- font-size: 44rpx;
- font-weight: 600;
- color: #333333;
- margin-top: 40rpx;
- margin-bottom: 120rpx;
- }
- .login_list {
- width: 100%;
- padding: 0 60rpx;
- box-sizing: border-box;
- .login_list_item {
- width: 100%;
- height: 98rpx;
- padding: 0 40rpx;
- box-sizing: border-box;
- background: #FFFFFF;
- border-radius: 8rpx;
- margin-bottom: 40rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- &:last-child {
- margin-bottom: 0 !important;
- }
- image {
- flex-shrink: 0;
- width: 40rpx;
- height: 40rpx;
- }
- input {
- flex: 1;
- height: 100%;
- color: #666666;
- margin-left: 24rpx;
- border: none;
- }
- }
- }
- .login_btn {
- width: 100%;
- padding: 0 60rpx;
- box-sizing: border-box;
- margin-top: 80rpx;
- .login_btn_n {
- width: 100%;
- height: 98rpx;
- background: #025EEF;
- background: #025EEF;
- box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(2,94,239,0.14);
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- border-radius: 50rpx;
- }
- }
+.login {
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ padding-top: 160rpx;
+ box-sizing: border-box;
+ align-items: center;
+ flex-direction: column;
+ background: linear-gradient(
+ 180deg,
+ rgba(2, 94, 239, 0.2) 0%,
+ rgba(2, 94, 239, 0) 100%
+ );
+ .login_logo {
+ width: 180rpx;
+ height: 180rpx;
}
+ .login_title {
+ font-size: 44rpx;
+ font-weight: 600;
+ color: #333333;
+ margin-top: 40rpx;
+ margin-bottom: 120rpx;
+ }
+ .login_list {
+ width: 100%;
+ padding: 0 60rpx;
+ box-sizing: border-box;
+ .login_list_item {
+ width: 100%;
+ height: 98rpx;
+ padding: 0 40rpx;
+ box-sizing: border-box;
+ background: #ffffff;
+ border-radius: 8rpx;
+ margin-bottom: 40rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ image {
+ flex-shrink: 0;
+ width: 40rpx;
+ height: 40rpx;
+ }
+ input {
+ flex: 1;
+ height: 100%;
+ color: #666666;
+ margin-left: 24rpx;
+ border: none;
+ }
+ }
+ }
+ .login_btn {
+ width: 100%;
+ padding: 0 60rpx;
+ box-sizing: border-box;
+ margin-top: 80rpx;
+ .login_btn_n {
+ width: 100%;
+ height: 98rpx;
+ background: #025eef;
+ background: #025eef;
+ box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(2, 94, 239, 0.14);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ font-weight: 600;
+ color: #ffffff;
+ border-radius: 50rpx;
+ }
+ }
+}
</style>
diff --git a/h5/n_pages/visitorApplication/visitorApplication.vue b/h5/n_pages/visitorApplication/visitorApplication.vue
index b6fcc14..5d7dd54 100644
--- a/h5/n_pages/visitorApplication/visitorApplication.vue
+++ b/h5/n_pages/visitorApplication/visitorApplication.vue
@@ -805,7 +805,7 @@
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.list {
@@ -861,7 +861,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.adduser_list {
@@ -987,7 +987,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
@@ -1044,7 +1044,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search-box {
@@ -1185,7 +1185,7 @@
background: #025eef;
border-radius: 8rpx;
font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
border-radius: 44rpx;
}
@@ -1277,7 +1277,7 @@
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
@@ -1353,7 +1353,7 @@
background: #025eef;
border-radius: 44rpx;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
diff --git a/h5/n_pages/visitorApproval/visitorApproval.vue b/h5/n_pages/visitorApproval/visitorApproval.vue
index ca23113..983fcf1 100644
--- a/h5/n_pages/visitorApproval/visitorApproval.vue
+++ b/h5/n_pages/visitorApproval/visitorApproval.vue
@@ -143,7 +143,7 @@
position: relative;
.box_list_title {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
margin-bottom: 24rpx;
}
@@ -328,7 +328,7 @@
}
.box_list_name {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.box_list_job {
diff --git a/h5/packagesMine/notice/notice.vue b/h5/packagesMine/notice/notice.vue
index e7afae5..0e51fb2 100644
--- a/h5/packagesMine/notice/notice.vue
+++ b/h5/packagesMine/notice/notice.vue
@@ -1,172 +1,196 @@
<template>
- <view class="notice">
- <view class="notice_item" v-for="(item, index) in list" :key="index" @click="jump(item)">
- <view class="left">
- <view class="left_dian" v-if="item.status === 0"></view>
- <image src="@/static/meeting/icon/xiaoxi_ic_gonggao@2x.png" v-if="item.type === 1" mode="widthFix"></image>
- <image src="@/static/meeting/icon/xiaoxi_ic_gonggao@2x(1).png" v-else mode="widthFix"></image>
- </view>
- <view class="right">
- <view class="right_a">{{item.title}}</view>
- <view class="right_b" v-if="item.type === 1">
- <view class="right_b_label">浼氳涓婚锛�</view>
- <view class="right_b_val">{{item.meetingDetailResponse.meetingName}}</view>
- </view>
- <view class="right_b" v-if="item.type === 1">
- <view class="right_b_label">浼氳鏃堕棿锛�</view>
- <view class="right_b_val">{{item.meetingDetailResponse.meetingDate}} {{item.meetingDetailResponse.meetingTime}}</view>
- </view>
- <view class="right_b" v-if="item.type === 1">
- <view class="right_b_label">浼氳瀹わ細</view>
- <view class="right_b_val">{{item.meetingDetailResponse.roomName}}</view>
- </view>
- <view class="right_b" v-if="item.type === 1">
- <view class="right_b_label">棰勭害浜猴細</view>
- <view class="right_b_val">{{item.meetingDetailResponse.bookingUserName}}</view>
- </view>
- <view class="right_c" v-if="item.type !== 1">{{item.createDate}}</view>
- </view>
- </view>
- </view>
+ <view class="notice">
+ <view
+ class="notice_item"
+ v-for="(item, index) in list"
+ :key="index"
+ @click="jump(item)"
+ >
+ <view class="left">
+ <view class="left_dian" v-if="item.status === 0"></view>
+ <image
+ src="@/static/meeting/icon/xiaoxi_ic_gonggao@2x.png"
+ v-if="item.type === 1"
+ mode="widthFix"
+ ></image>
+ <image
+ src="@/static/meeting/icon/xiaoxi_ic_gonggao@2x(1).png"
+ v-else
+ mode="widthFix"
+ ></image>
+ </view>
+ <view class="right">
+ <view class="right_a">{{ item.title }}</view>
+ <view class="right_b" v-if="item.type === 1">
+ <view class="right_b_label">浼氳涓婚锛�</view>
+ <view class="right_b_val">{{
+ item.meetingDetailResponse.meetingName
+ }}</view>
+ </view>
+ <view class="right_b" v-if="item.type === 1">
+ <view class="right_b_label">浼氳鏃堕棿锛�</view>
+ <view class="right_b_val"
+ >{{ item.meetingDetailResponse.meetingDate }}
+ {{ item.meetingDetailResponse.meetingTime }}</view
+ >
+ </view>
+ <view class="right_b" v-if="item.type === 1">
+ <view class="right_b_label">浼氳瀹わ細</view>
+ <view class="right_b_val">{{
+ item.meetingDetailResponse.roomName
+ }}</view>
+ </view>
+ <view class="right_b" v-if="item.type === 1">
+ <view class="right_b_label">棰勭害浜猴細</view>
+ <view class="right_b_val">{{
+ item.meetingDetailResponse.bookingUserName
+ }}</view>
+ </view>
+ <view class="right_c" v-if="item.type !== 1">{{
+ item.createDate
+ }}</view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
- page: 0,
- next: false,
- list: []
- };
- },
- onLoad() {
- this.getList()
- },
- onReachBottom(){
- this.getList()
- },
- methods: {
- getList() {
- if (!this.next) {
- this.page = this.page + 1
- this.$u.api.findNoticePage({
- capacity: 20,
- model: {
-
- },
- page: this.page
- }).then(res => {
- if (res.data.records.length > 0) {
- this.list = [...this.list, ...res.data.records]
- }
- if (res.data.records.length < 20) {
- this.next = false
- }
- })
- }
- },
- jump(item) {
- var that = this
- if (item.type === 0) {
- uni.navigateTo({
- url: `/packagesMine/notificationDetails/notificationDetails?content=${item.id}`
- });
- } else {
- that.$u.api.getMemberDTO({ id: item.id })
- .then(res => {
- that.list.forEach(element => {
- if (element.id === item.id) {
- element.status = 1
- }
- })
- uni.navigateTo({
- url: `/packagesMine/meetingDetails/meetingDetails?id=${item.meetingDetailResponse.id}`
- });
- })
- }
- }
- }
- }
+export default {
+ data() {
+ return {
+ page: 0,
+ next: false,
+ list: []
+ }
+ },
+ onLoad() {
+ this.getList()
+ },
+ onReachBottom() {
+ this.getList()
+ },
+ methods: {
+ getList() {
+ if (!this.next) {
+ this.page = this.page + 1
+ this.$u.api.findNoticePage({
+ capacity: 20,
+ model: {
+
+ },
+ page: this.page
+ }).then(res => {
+ if (res.data.records.length > 0) {
+ this.list = [...this.list, ...res.data.records]
+ }
+ if (res.data.records.length < 20) {
+ this.next = false
+ }
+ })
+ }
+ },
+ jump(item) {
+ var that = this
+ if (item.type === 0) {
+ uni.navigateTo({
+ url: `/packagesMine/notificationDetails/notificationDetails?content=${item.id}`
+ })
+ } else {
+ that.$u.api.getMemberDTO({ id: item.id })
+ .then(res => {
+ that.list.forEach(element => {
+ if (element.id === item.id) {
+ element.status = 1
+ }
+ })
+ uni.navigateTo({
+ url: `/packagesMine/meetingDetails/meetingDetails?id=${item.meetingDetailResponse.id}`
+ })
+ })
+ }
+ }
+ }
+}
</script>
<style lang="scss">
- .notice {
- width: 100%;
- padding: 26rpx 30rpx;
- box-sizing: border-box;
- .notice_item {
- width: 100%;
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- background-color: #fff;
- padding: 30rpx;
- box-sizing: border-box;
- margin-bottom: 20rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
- .left {
- flex-shrink: 0;
- width: 72rpx;
- height: 72rpx;
- position: relative;
- margin-right: 24rpx;
- .left_dian {
- position: absolute;
- right: 0;
- top: 0;
- width: 18rpx;
- height: 18rpx;
- background: #F62710;
- border: 2rpx solid #FFFFFF;
- border-radius: 50%;
- }
- image {
- width: 100%;
- height: 100%;
- }
- }
- .right {
- flex: 1;
- display: flex;
- flex-direction: column;
- .right_a {
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #222222;
- margin-bottom: 24rpx;
- }
- .right_c {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- .right_b {
- display: flex;
- align-items: flex-start;
- margin-bottom: 24rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
- .right_b_label {
- flex-shrink: 0;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- .right_b_val {
- flex: 1;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- }
- }
- }
- }
- }
+.notice {
+ width: 100%;
+ padding: 26rpx 30rpx;
+ box-sizing: border-box;
+ .notice_item {
+ width: 100%;
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ background-color: #fff;
+ padding: 30rpx;
+ box-sizing: border-box;
+ margin-bottom: 20rpx;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .left {
+ flex-shrink: 0;
+ width: 72rpx;
+ height: 72rpx;
+ position: relative;
+ margin-right: 24rpx;
+ .left_dian {
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 18rpx;
+ height: 18rpx;
+ background: #f62710;
+ border: 2rpx solid #ffffff;
+ border-radius: 50%;
+ }
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .right {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ .right_a {
+ font-size: 32rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ margin-bottom: 24rpx;
+ }
+ .right_c {
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ .right_b {
+ display: flex;
+ align-items: flex-start;
+ margin-bottom: 24rpx;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .right_b_label {
+ flex-shrink: 0;
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ .right_b_val {
+ flex: 1;
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ }
+ }
+ }
+ }
+}
</style>
diff --git a/h5/packagesMine/notificationDetails/notificationDetails.vue b/h5/packagesMine/notificationDetails/notificationDetails.vue
index f6d06a4..6e46d01 100644
--- a/h5/packagesMine/notificationDetails/notificationDetails.vue
+++ b/h5/packagesMine/notificationDetails/notificationDetails.vue
@@ -1,62 +1,62 @@
-<template>
- <view class="details">
- <view class="details_head">
- <text>{{info.title}}</text>
- <text>{{info.createDate}}</text>
- </view>
- <u-parse :content="content"></u-parse>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- info: {},
- content: ''
- };
- },
- onLoad(option) {
- this.$u.api.getNoticeDetail({ id: option.content })
- .then(res => {
- this.content = res.data.content
- this.info = res.data
- })
- }
- }
-</script>
+<template>
+ <view class="details">
+ <view class="details_head">
+ <text>{{ info.title }}</text>
+ <text>{{ info.createDate }}</text>
+ </view>
+ <u-parse :content="content"></u-parse>
+ </view>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ info: {},
+ content: ''
+ }
+ },
+ onLoad(option) {
+ this.$u.api.getNoticeDetail({ id: option.content })
+ .then(res => {
+ this.content = res.data.content
+ this.info = res.data
+ })
+ }
+}
+</script>
<style>
- page {
- background-color: #ffffff;
- }
+page {
+ background-color: #ffffff;
+}
</style>
-
-<style lang="scss">
- .details {
- width: 100%;
- padding: 30rpx;
- box-sizing: border-box;
- .details_head {
- width: 100%;
- display: flex;
- flex-direction: column;
- margin-bottom: 38rpx;
- text {
- &:first-child {
- font-size: 40rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #222222;
- }
- &:last-child {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- margin-top: 30rpx;
- }
- }
- }
- }
-</style>
+
+<style lang="scss">
+.details {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+ .details_head {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 38rpx;
+ text {
+ &:first-child {
+ font-size: 40rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ }
+ &:last-child {
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ margin-top: 30rpx;
+ }
+ }
+ }
+}
+</style>
diff --git a/h5/pages.json b/h5/pages.json
index 96f0c98..8fc4ef3 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -70,7 +70,7 @@
{
"path": "pages/applicationRecord/applicationRecord",
"style": {
- "navigationBarTitleText": "鐢宠璁板綍",
+ "navigationBarTitleText": "棰勭害璁板綍",
"enablePullDownRefresh": false
}
},
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index ea490a1..a390d45 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -50,22 +50,26 @@
</view>
<view class="box_list_item_nr_item">
<text>杩涘巶鏃堕棿锛�</text>
- <text>{{ item.starttime }}</text>
+ <text v-if="item.starttime">{{ item.starttime.slice(5, 16) }}</text>
</view>
<view class="box_list_item_nr_item">
<text>绂诲洯鏃堕棿锛�</text>
- <text>{{ item.endtime }}</text>
+ <text v-if="item.endtime">{{ item.endtime.slice(5, 16) }}</text>
</view>
<view class="box_list_item_nr_item">
<text>鏉ヨ浜嬬敱锛�</text>
<text>{{ item.reason }}</text>
</view>
<view class="box_list_item_nr_x"></view>
- <view class="box_list_item_nr_text">{{ item.createDate }} 鎻愪氦</view>
+ <view v-if="item.createDate" class="box_list_item_nr_text">{{ item.createDate.slice(0, 16) }} 鎻愪氦</view>
</view>
</view>
- <view v-if="list.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="list.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -162,12 +166,14 @@
height: 100%;
display: flex;
align-items: center;
+ justify-content: space-between;
.active {
border: 1rpx solid $uni-color-primary !important;
color: $uni-color-primary !important;
}
.box_head_item {
- padding: 0 30rpx;
+ width: 156rpx;
+ text-align: center;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
@@ -176,7 +182,6 @@
font-size: 26rpx;
font-weight: 400;
color: #333333;
- margin-right: 20rpx;
}
}
}
@@ -212,7 +217,7 @@
text {
&:nth-child(1) {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
&:nth-child(2) {
@@ -226,17 +231,17 @@
width: 100%;
box-sizing: border-box;
background-color: #ffffff;
- .box_list_item_nr_x {
+ /* .box_list_item_nr_x {
width: 100%;
height: 1rpx;
background-color: #e5e5e5;
- }
+ } */
.box_list_item_nr_text {
width: 100%;
font-size: 26rpx;
font-weight: 400;
color: #999999;
- margin-top: 32rpx;
+ /* margin-top: 32rpx; */
}
.box_list_item_nr_item {
width: 100%;
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index c757a11..ce81109 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -216,7 +216,7 @@
}
.box_list_label {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.box_list_item {
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 3281464..42ee41e 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -1,279 +1,312 @@
<template>
- <view class="main_app">
- <view class="title_wrap">
- <view class="name">鏌愭煇鏌愶紝娆㈣繋鐧诲綍锝�</view>
- <view class="btn" @click="loginOut">閫�鍑虹櫥褰�</view>
- </view>
- <!-- -->
- <view class="banner_wrap">
- <view class="h1">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
- <view class="h2">鐗╂祦杞︿笓鍖�</view>
- <image class="banner" src="../../static/driver/wuliuche_banner@2x.png" mode="widthFix"></image>
- </view>
- <!-- -->
- <view class="task_list">
- <view class="item">
- <view class="head">
- <view class="name">杩愯緭鍗�222</view>
- <view class="status">
- <view class="text">璇风‘璁や换鍔�</view>
- <view class="time">棰勮绛夊緟锛�12灏忔椂</view>
- </view>
- </view>
- <view class="content">
- <view class="info">
- <view class="plate">
- <image src="@/static/driver/wuliu_ic_car@2x.png" class="icon" mode=""></image>
- <text>鐨朅D</text>
- </view>
- <view class="plate">
- <image src="@/static/driver/wuliu_ic_huowu@2x.png" class="icon" mode=""></image>
- <text>3000涓�</text>
- </view>
- </view>
- <view class="sub">
- <view class="time">02-01 08:11:11</view>
- <view class="sub_btn" @click="handleTask()">纭浠诲姟</view>
- </view>
- </view>
- </view>
- </view>
- <!-- -->
- <view class="title_wrap"><view class="name">涓氬姟鍔炵悊</view></view>
- <view class="container1">
- <view class="left">
- <view class="img_wrap img1" @click="$jump('/pages/driver/reserved')">
- <image src="@/static/driver/wuliu_ic_ruyuanyuyue@2x.png" class="img"></image>
- <view class="h1">鍏ュ洯椤荤煡</view>
- <view class="h2">RESERVATION</view>
- </view>
- <view class="img_wrap img2" @click="$jump('/pages/driver/reservedGuide')">
- <image src="@/static/driver/wuliu_ic_zhinan@2x.png" class="img"></image>
- <view class="h1">棰勭害鎸囧崡</view>
- <view class="h2">APPOINTMENT GUIDE</view>
- </view>
- </view>
- <view class="right">
- <view class="img_wrap img2" @click="$jump('/pages/driver/reservedRecord')">
- <image src="@/static/driver/wuliu_ic_yuyuejilu@2x.png" class="img"></image>
- <view class="h1">棰勭害璁板綍</view>
- <view class="h2">APPOINTMENT RECORD</view>
- </view>
- <view class="img_wrap img2" @click="$jump('/pages/driver/queueUp')">
- <image src="@/static/driver/wuliu_ic_paidui@2x.png" class="img"></image>
- <view class="h1">鏈堝彴鎺掗槦鎯呭喌</view>
- <view class="h2">HIDDEN DANGER</view>
- </view>
- <view class="img_wrap img2">
- <image src="@/static/driver/wuliu_ic_daolan@2x.png" class="img"></image>
- <view class="h1">鍥尯瀵艰鍥�</view>
- <view class="h2">GUIDE MAP</view>
- </view>
- </view>
- </view>
- <!-- -->
- <view class="copyright">
- <image src="@/static/logo_s@2x.png" class="mr6" mode="widthFix" />
- <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
- </view>
- </view>
+ <view class="main_app">
+ <view class="title_wrap">
+ <view class="name">鏌愭煇鏌愶紝娆㈣繋鐧诲綍锝�</view>
+ <view class="btn" @click="loginOut">閫�鍑虹櫥褰�</view>
+ </view>
+ <!-- -->
+ <view class="banner_wrap">
+ <view class="h1">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
+ <view class="h2">鐗╂祦杞︿笓鍖�</view>
+ <image
+ class="banner"
+ src="../../static/driver/wuliuche_banner@2x.png"
+ mode="widthFix"
+ ></image>
+ </view>
+ <!-- -->
+ <view class="task_list">
+ <view class="item">
+ <view class="head">
+ <view class="name">杩愯緭鍗�222</view>
+ <view class="status">
+ <view class="text">璇风‘璁や换鍔�</view>
+ <view class="time">棰勮绛夊緟锛�12灏忔椂</view>
+ </view>
+ </view>
+ <view class="content">
+ <view class="info">
+ <view class="plate">
+ <image
+ src="@/static/driver/wuliu_ic_car@2x.png"
+ class="icon"
+ mode=""
+ ></image>
+ <text>鐨朅D</text>
+ </view>
+ <view class="plate">
+ <image
+ src="@/static/driver/wuliu_ic_huowu@2x.png"
+ class="icon"
+ mode=""
+ ></image>
+ <text>3000涓�</text>
+ </view>
+ </view>
+ <view class="sub">
+ <view class="time">02-01 08:11:11</view>
+ <view class="sub_btn" @click="handleTask()">纭浠诲姟</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- -->
+ <view class="title_wrap"><view class="name">涓氬姟鍔炵悊</view></view>
+ <view class="container1">
+ <view class="left">
+ <view class="img_wrap img1" @click="$jump('/pages/driver/reserved')">
+ <image
+ src="@/static/driver/wuliu_ic_ruyuanyuyue@2x.png"
+ class="img"
+ ></image>
+ <view class="h1">鍏ュ洯椤荤煡</view>
+ <view class="h2">RESERVATION</view>
+ </view>
+ <view
+ class="img_wrap img2"
+ @click="$jump('/pages/driver/reservedGuide')"
+ >
+ <image
+ src="@/static/driver/wuliu_ic_zhinan@2x.png"
+ class="img"
+ ></image>
+ <view class="h1">棰勭害鎸囧崡</view>
+ <view class="h2">APPOINTMENT GUIDE</view>
+ </view>
+ </view>
+ <view class="right">
+ <view
+ class="img_wrap img2"
+ @click="$jump('/pages/driver/reservedRecord')"
+ >
+ <image
+ src="@/static/driver/wuliu_ic_yuyuejilu@2x.png"
+ class="img"
+ ></image>
+ <view class="h1">棰勭害璁板綍</view>
+ <view class="h2">APPOINTMENT RECORD</view>
+ </view>
+ <view class="img_wrap img2" @click="$jump('/pages/driver/queueUp')">
+ <image
+ src="@/static/driver/wuliu_ic_paidui@2x.png"
+ class="img"
+ ></image>
+ <view class="h1">鏈堝彴鎺掗槦鎯呭喌</view>
+ <view class="h2">HIDDEN DANGER</view>
+ </view>
+ <view class="img_wrap img2">
+ <image
+ src="@/static/driver/wuliu_ic_daolan@2x.png"
+ class="img"
+ ></image>
+ <view class="h1">鍥尯瀵艰鍥�</view>
+ <view class="h2">GUIDE MAP</view>
+ </view>
+ </view>
+ </view>
+ <!-- -->
+ <view class="copyright">
+ <image src="@/static/logo_s@2x.png" class="mr6" mode="widthFix" />
+ <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
-
- };
- },
- methods: {
- handleTask(){
- uni.navigateTo({
- url: '/pages/driver/taskConfirm'
- })
- }
- }
- }
+export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+ handleTask() {
+ uni.navigateTo({
+ url: '/pages/driver/taskConfirm'
+ })
+ }
+ }
+}
</script>
<style lang="scss">
.title_wrap {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-bottom: 24rpx;
- .name {
- font-weight: 500;
- font-size: 34rpx;
- color: #222222;
- }
- .btn {
- width: 144rpx;
- height: 56rpx;
- border-radius: 36rpx;
- border: 1rpx solid $uni-color-primary;
- font-size: 26rpx;
- color: $uni-color-primary;
- display: flex;
- justify-content: center;
- align-items: center;
- }
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 24rpx;
+ .name {
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ }
+ .btn {
+ width: 144rpx;
+ height: 56rpx;
+ border-radius: 36rpx;
+ border: 1rpx solid $uni-color-primary;
+ font-size: 26rpx;
+ color: $uni-color-primary;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
}
.main_app {
- padding-top: 12rpx;
+ padding-top: 12rpx;
}
.banner_wrap {
- padding: 54rpx 44rpx;
- color: #fff;
- position: relative;
- width: 688rpx;
- height: 270rpx;
- margin-bottom: 40rpx;
- .h1 {
- font-weight: bold;
- line-height: 66rpx;
- font-size: 44rpx;
- margin-bottom: 14rpx;
- }
- .h2{
- font-weight: 500;
- font-size: 28rpx;
- width: 192rpx;
- color: $uni-color-primary;
- height: 48rpx;
- line-height: 48rpx;
- text-align: center;
- background: #FFFFFF;
- box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(39,155,170,0.31);
- border-radius: 24rpx;
- }
- .banner {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
+ padding: 54rpx 44rpx;
+ color: #fff;
+ position: relative;
+ width: 688rpx;
+ height: 270rpx;
+ margin-bottom: 40rpx;
+ .h1 {
+ font-weight: bold;
+ line-height: 66rpx;
+ font-size: 44rpx;
+ margin-bottom: 14rpx;
+ }
+ .h2 {
+ font-weight: 600;
+ font-size: 28rpx;
+ width: 192rpx;
+ color: $uni-color-primary;
+ height: 48rpx;
+ line-height: 48rpx;
+ text-align: center;
+ background: #ffffff;
+ box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(39, 155, 170, 0.31);
+ border-radius: 24rpx;
+ }
+ .banner {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
}
.container1 {
- display: flex;
- flex-wrap: wrap;
- view {
- width: 336rpx;
- }
- .left {
- margin-right: 18rpx;
- }
- .img_wrap {
- position: relative;
- padding: 24rpx 0rpx 0 28rpx;
- border-radius: 8rpx;
- overflow: hidden;
- .h1 {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 48rpx;
- margin-bottom: 4rpx;
- }
- .h2 {
- font-size: 22rpx;
- color: #7b9da1;
- line-height: 34rpx;
- }
- .img {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- }
- .img1 {
- width: 336rpx;
- height: 296rpx;
- margin-bottom: 16rpx;
- }
- .img2 {
- width: 336rpx;
- height: 140rpx;
- margin-bottom: 16rpx;
- }
+ display: flex;
+ flex-wrap: wrap;
+ view {
+ width: 336rpx;
+ }
+ .left {
+ margin-right: 18rpx;
+ }
+ .img_wrap {
+ position: relative;
+ padding: 24rpx 0rpx 0 28rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ .h1 {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 48rpx;
+ margin-bottom: 4rpx;
+ }
+ .h2 {
+ font-size: 22rpx;
+ color: #7b9da1;
+ line-height: 34rpx;
+ }
+ .img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ }
+ .img1 {
+ width: 336rpx;
+ height: 296rpx;
+ margin-bottom: 16rpx;
+ }
+ .img2 {
+ width: 336rpx;
+ height: 140rpx;
+ margin-bottom: 16rpx;
+ }
}
-.task_list{
- margin-bottom: 48rpx;
- .item{
- background: #FFFFFF;
- box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(39,155,170,0.18);
- border-radius: 16rpx;
- .head{
- display: flex;
- justify-content: space-between;
- align-items: center;
- background: linear-gradient( 270deg, #FEFEFF 0%, #E1F7FE 100%);
- padding: 20rpx 30rpx;
- .name{
- font-weight: 600;
- font-size: 36rpx;
- color: #222222;
- }
- .status{
- color: $uni-color-primary;
- font-weight: 500;
- .time{
- font-size: 24rpx;
- font-weight: 360;
- }
- }
- }
- .content{
- .info{
- display: flex;
- padding: 24rpx 30rpx;
- .plate{
- flex: 1;
- display: flex;
- align-items: center;
- .icon{
- width: 26rpx;
- height: 26rpx;
- margin-right: 10rpx;
- }
- }
- }
- .sub{
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 30rpx 24rpx;
- .time{
- font-size: 26rpx;
- color: #999999;
- }
- .sub_btn{
- height: 68rpx;
- line-height: 68rpx;
- padding: 0 34rpx;
- color: #FFFFFF;
- background: $uni-color-primary;
- box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(39,155,170,0.4);
- border-radius: 40rpx;
- }
- }
- }
- }
+.task_list {
+ margin-bottom: 48rpx;
+ .item {
+ background: #ffffff;
+ box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(39, 155, 170, 0.18);
+ border-radius: 16rpx;
+ .head {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ background: linear-gradient(270deg, #fefeff 0%, #e1f7fe 100%);
+ padding: 20rpx 30rpx;
+ .name {
+ font-weight: 600;
+ font-size: 36rpx;
+ color: #222222;
+ }
+ .status {
+ color: $uni-color-primary;
+ font-weight: 600;
+ .time {
+ font-size: 24rpx;
+ font-weight: 360;
+ }
+ }
+ }
+ .content {
+ .info {
+ display: flex;
+ padding: 24rpx 30rpx;
+ .plate {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ .icon {
+ width: 26rpx;
+ height: 26rpx;
+ margin-right: 10rpx;
+ }
+ }
+ }
+ .sub {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 30rpx 24rpx;
+ .time {
+ font-size: 26rpx;
+ color: #999999;
+ }
+ .sub_btn {
+ height: 68rpx;
+ line-height: 68rpx;
+ padding: 0 34rpx;
+ color: #ffffff;
+ background: $uni-color-primary;
+ box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(39, 155, 170, 0.4);
+ border-radius: 40rpx;
+ }
+ }
+ }
+ }
}
.copyright {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 44rpx;
- font-size: 24rpx;
- color: #666666;
- image {
- width: 40rpx;
- height: 40rpx;
- }
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 44rpx;
+ font-size: 24rpx;
+ color: #666666;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
}
</style>
diff --git a/h5/pages/driver/queueUp.vue b/h5/pages/driver/queueUp.vue
index 999b758..3b836b1 100644
--- a/h5/pages/driver/queueUp.vue
+++ b/h5/pages/driver/queueUp.vue
@@ -1,98 +1,106 @@
<template>
- <view class="main_app">
- <view class="main_name">
- <text class="mr12">鐗╂祦鍏ュ簱鏈堝彴</text>
- <u-icon name="arrow-down" color="#777777"></u-icon>
- </view>
- <!-- -->
- <view class="main_list">
- <view class="item" @click="handleCheck()">
- <view class="h1">浣滀笟涓溅杈�</view>
- <view class="h2">
- <text>4</text>
- <text class="unit">杈�</text>
- </view>
- <image class="img" src="../../static/driver/ic_zuoyezhong@2x.png" mode=""></image>
- </view>
- <view class="item cyan">
- <view class="h1">浣滀笟涓溅杈�</view>
- <view class="h2">
- <text>4</text>
- <text class="unit">杈�</text>
- </view>
- <image class="img" src="../../static/driver/ic_yiqiandao@2x.png" mode=""></image>
- </view>
- </view>
- </view>
+ <view class="main_app">
+ <view class="main_name">
+ <text class="mr12">鐗╂祦鍏ュ簱鏈堝彴</text>
+ <u-icon name="arrow-down" color="#777777"></u-icon>
+ </view>
+ <!-- -->
+ <view class="main_list">
+ <view class="item" @click="handleCheck()">
+ <view class="h1">浣滀笟涓溅杈�</view>
+ <view class="h2">
+ <text>4</text>
+ <text class="unit">杈�</text>
+ </view>
+ <image
+ class="img"
+ src="../../static/driver/ic_zuoyezhong@2x.png"
+ mode=""
+ ></image>
+ </view>
+ <view class="item cyan">
+ <view class="h1">浣滀笟涓溅杈�</view>
+ <view class="h2">
+ <text>4</text>
+ <text class="unit">杈�</text>
+ </view>
+ <image
+ class="img"
+ src="../../static/driver/ic_yiqiandao@2x.png"
+ mode=""
+ ></image>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
-
- };
- },
- methods: {
- handleCheck(){
- uni.navigateTo({
- url: "/pages/driver/queueUpRecord"
- })
- }
- }
- }
+export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+ handleCheck() {
+ uni.navigateTo({
+ url: "/pages/driver/queueUpRecord"
+ })
+ }
+ }
+}
</script>
<style lang="scss">
-.main_app{
- .main_name{
- display: flex;
- justify-content: center;
- align-items: center;
- height: 104rpx;
- font-weight: 500;
- font-size: 32rpx;
- color: #111111;
- }
- .main_list{
- padding: 30rpx 10rpx;
- .item{
- width: 100%;
- height: 208rpx;
- padding: 30rpx 40rpx;
- margin-bottom: 30rpx;
- position: relative;
- .h1{
- font-weight: 400;
- font-size: 34rpx;
- color: #222222;
- line-height: 50rpx;
- }
- .h2{
- font-weight: bold;
- font-size: 64rpx;
- color: #00BA67;
- line-height: 110rpx;
- .unit{
- font-weight: 400;
- font-size: 26rpx;
- margin-left: 12rpx;
- }
- }
- .img{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: -1;
- }
- }
- .cyan{
- .h2{
- color: $uni-color-primary;
- }
- }
- }
+.main_app {
+ .main_name {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 104rpx;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #111111;
+ }
+ .main_list {
+ padding: 30rpx 10rpx;
+ .item {
+ width: 100%;
+ height: 208rpx;
+ padding: 30rpx 40rpx;
+ margin-bottom: 30rpx;
+ position: relative;
+ .h1 {
+ font-weight: 400;
+ font-size: 34rpx;
+ color: #222222;
+ line-height: 50rpx;
+ }
+ .h2 {
+ font-weight: bold;
+ font-size: 64rpx;
+ color: #00ba67;
+ line-height: 110rpx;
+ .unit {
+ font-weight: 400;
+ font-size: 26rpx;
+ margin-left: 12rpx;
+ }
+ }
+ .img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: -1;
+ }
+ }
+ .cyan {
+ .h2 {
+ color: $uni-color-primary;
+ }
+ }
+ }
}
</style>
diff --git a/h5/pages/driver/queueUpRecord.vue b/h5/pages/driver/queueUpRecord.vue
index 1df7d4f..000730d 100644
--- a/h5/pages/driver/queueUpRecord.vue
+++ b/h5/pages/driver/queueUpRecord.vue
@@ -1,140 +1,147 @@
<template>
- <view class="main_app">
- <view class="main_name">
- <text class="mr12">鐗╂祦鍏ュ簱鏈堝彴</text>
- <u-icon name="arrow-down" color="#777777"></u-icon>
- </view>
- <!-- -->
- <view class="main_list">
- <view class="item">
- <view class="status">浣滀笟涓�</view>
- <image class="avatar" src="@/static/driver/ic_truck@2x.png" mode=""></image>
- <view class="content">
- <view class="id_card">鐨朅</view>
- <view class="line">
- <view class="address">4鍙锋湀鍙�</view>
- <view class="time">
- <u-icon class="mr6" name="clock" color="#4d98a8"></u-icon>
- <text>01:02:02</text>
- </view>
- </view>
- </view>
- </view>
- <view class="item active">
- <view class="status padding">浣滀笟涓�</view>
- <view class="me">鎴�</view>
- <image class="avatar" src="@/static/driver/ic_truck@2x.png" mode=""></image>
- <view class="content">
- <view class="id_card">鐨朅</view>
- <view class="line">
- <view class="address">4鍙锋湀鍙�</view>
- <view class="time">
- <u-icon class="mr6" name="clock" color="#4d98a8"></u-icon>
- <text>01:02:02</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
+ <view class="main_app">
+ <view class="main_name">
+ <text class="mr12">鐗╂祦鍏ュ簱鏈堝彴</text>
+ <u-icon name="arrow-down" color="#777777"></u-icon>
+ </view>
+ <!-- -->
+ <view class="main_list">
+ <view class="item">
+ <view class="status">浣滀笟涓�</view>
+ <image
+ class="avatar"
+ src="@/static/driver/ic_truck@2x.png"
+ mode=""
+ ></image>
+ <view class="content">
+ <view class="id_card">鐨朅</view>
+ <view class="line">
+ <view class="address">4鍙锋湀鍙�</view>
+ <view class="time">
+ <u-icon class="mr6" name="clock" color="#4d98a8"></u-icon>
+ <text>01:02:02</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="item active">
+ <view class="status padding">浣滀笟涓�</view>
+ <view class="me">鎴�</view>
+ <image
+ class="avatar"
+ src="@/static/driver/ic_truck@2x.png"
+ mode=""
+ ></image>
+ <view class="content">
+ <view class="id_card">鐨朅</view>
+ <view class="line">
+ <view class="address">4鍙锋湀鍙�</view>
+ <view class="time">
+ <u-icon class="mr6" name="clock" color="#4d98a8"></u-icon>
+ <text>01:02:02</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
-
- };
- }
- }
+export default {
+ data() {
+ return {
+
+ }
+ }
+}
</script>
<style lang="scss">
- page{
- background-color: #f7f7f7;
- }
-.main_app{
- .main_name{
- display: flex;
- justify-content: center;
- align-items: center;
- height: 104rpx;
- font-weight: 500;
- font-size: 32rpx;
- color: #111111;
- background-color: #fff;
- margin:0 -30rpx 20rpx;
- }
- .main_list{
- .item{
- display: flex;
- align-items: center;
- position: relative;
- padding: 30rpx;
- background-color: #fff;
- margin-bottom: 20rpx;
- border-radius: 8rpx;
- .status{
- position: absolute;
- top: 0;
- right: 0;
- height: 50rpx;
- line-height: 50rpx;
- padding: 0 20rpx;
- background: $uni-color-primary;
- color: #fff;
- font-size: 26rpx;
- border-radius: 0rpx 8rpx 0rpx 25rpx;
- }
- .me{
- position: absolute;
- top: 0;
- left: 0;
- background: #00BA67;
- border-radius: 8rpx 0rpx 8rpx 0rpx;
- height: 42rpx;
- line-height: 42rpx;
- width: 64rpx;
- text-align: center;
- color: #fff;
- font-size: 24rpx;
- z-index: 11;
- }
- .padding{
- background: #E9F5F6;
- color: $uni-color-primary;
- }
- .avatar{
- width: 84rpx;
- height: 84rpx;
- margin-right: 20rpx;
- }
- .content{
- flex: 1;
- .id_card{
- font-weight: 500;
- font-size: 30rpx;
- color: #111111;
- }
- .line{
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 26rpx;
- color: #999999;
- margin-top: 6rpx;
- .time{
- display: flex;
- align-items: center;
- color: $uni-color-primary;
- }
- }
- }
- }
- .active{
- background: linear-gradient( 270deg, #FFFFFF 0%, #E1F7FE 100%);
- }
- }
-
+page {
+ background-color: #f7f7f7;
+}
+.main_app {
+ .main_name {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 104rpx;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #111111;
+ background-color: #fff;
+ margin: 0 -30rpx 20rpx;
+ }
+ .main_list {
+ .item {
+ display: flex;
+ align-items: center;
+ position: relative;
+ padding: 30rpx;
+ background-color: #fff;
+ margin-bottom: 20rpx;
+ border-radius: 8rpx;
+ .status {
+ position: absolute;
+ top: 0;
+ right: 0;
+ height: 50rpx;
+ line-height: 50rpx;
+ padding: 0 20rpx;
+ background: $uni-color-primary;
+ color: #fff;
+ font-size: 26rpx;
+ border-radius: 0rpx 8rpx 0rpx 25rpx;
+ }
+ .me {
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: #00ba67;
+ border-radius: 8rpx 0rpx 8rpx 0rpx;
+ height: 42rpx;
+ line-height: 42rpx;
+ width: 64rpx;
+ text-align: center;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 11;
+ }
+ .padding {
+ background: #e9f5f6;
+ color: $uni-color-primary;
+ }
+ .avatar {
+ width: 84rpx;
+ height: 84rpx;
+ margin-right: 20rpx;
+ }
+ .content {
+ flex: 1;
+ .id_card {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: #111111;
+ }
+ .line {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 26rpx;
+ color: #999999;
+ margin-top: 6rpx;
+ .time {
+ display: flex;
+ align-items: center;
+ color: $uni-color-primary;
+ }
+ }
+ }
+ }
+ .active {
+ background: linear-gradient(270deg, #ffffff 0%, #e1f7fe 100%);
+ }
+ }
}
</style>
diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index cc7ab63..e87dc36 100644
--- a/h5/pages/driver/reservedDetail.vue
+++ b/h5/pages/driver/reservedDetail.vue
@@ -161,7 +161,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -311,7 +311,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -363,7 +363,7 @@
padding: 36rpx 30rpx 0;
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
diff --git a/h5/pages/driver/reservedRecord.vue b/h5/pages/driver/reservedRecord.vue
index befa0a5..f76ba2e 100644
--- a/h5/pages/driver/reservedRecord.vue
+++ b/h5/pages/driver/reservedRecord.vue
@@ -141,7 +141,7 @@
text {
&:nth-child(1) {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
&:nth-child(2) {
diff --git a/h5/pages/driver/taskConfirm.vue b/h5/pages/driver/taskConfirm.vue
index 1cf5578..592c807 100644
--- a/h5/pages/driver/taskConfirm.vue
+++ b/h5/pages/driver/taskConfirm.vue
@@ -1,435 +1,448 @@
<template>
- <view class="main_app">
- <view class="status_wrap">
- <image class="bg" src="../../static/driver/bg_renwu@2x.png" mode=""></image>
- <view class="name">浣滀笟宸插畬鎴�</view>
- <view class="id_card">鐨朅D1212</view>
- <view class="status">浣滀笟瀹屾垚</view>
- </view>
- <!-- -->
- <view class="main_content">
- <view class="line">
- <view class="label">鍙告満濮撳悕</view>
- <view class="value">鍒樻煇</view>
- </view>
- <view class="line">
- <view class="label">鎵嬫満鍙�</view>
- <view class="value">188</view>
- </view>
- <view class="line">
- <view class="label">杩愯緭鍗曞彿</view>
- <view class="value" @click="showDetail = true">
- <text class="waybill_num">Y111</text>
- <text class="btn">杩愬崟璇︽儏</text>
- </view>
- </view>
- <view class="line">
- <view class="label">浣滀笟绫诲瀷</view>
- <view class="value">鍏ュ洯瑁呰揣</view>
- </view>
- <view class="empty"></view>
- <!-- -->
- <view class="line">
- <view class="label">杞﹀墠鐗岀収鍙�</view>
- <view class="value" @click="openInput(1)">
- <text :style="{ color: param.carNos ? '#000000' : '#999999' }">{{ param.carNos ? param.carNos : '璇疯緭鍏ヨ溅鍓嶇墝鐓у彿'
- }}</text>
- </view>
- </view>
- <view class="line">
- <view class="label">杞﹀悗鐗岀収鍙�</view>
- <view class="value">
- <text @click="openInput(1)" :style="{ color: param.carNos ? '#000000' : '#999999' }">{{ param.carNos ?
- param.carNos : '璇疯緭鍏ヨ溅鍚庣墝鐓у彿' }}</text>
- <text class="copy">澶嶅埗杞﹀墠鐗岀収鍙�</text>
- </view>
- </view>
- <!-- -->
+ <view class="main_app">
+ <view class="status_wrap">
+ <image
+ class="bg"
+ src="../../static/driver/bg_renwu@2x.png"
+ mode=""
+ ></image>
+ <view class="name">浣滀笟宸插畬鎴�</view>
+ <view class="id_card">鐨朅D1212</view>
+ <view class="status">浣滀笟瀹屾垚</view>
+ </view>
+ <!-- -->
+ <view class="main_content">
+ <view class="line">
+ <view class="label">鍙告満濮撳悕</view>
+ <view class="value">鍒樻煇</view>
+ </view>
+ <view class="line">
+ <view class="label">鎵嬫満鍙�</view>
+ <view class="value">188</view>
+ </view>
+ <view class="line">
+ <view class="label">杩愯緭鍗曞彿</view>
+ <view class="value" @click="showDetail = true">
+ <text class="waybill_num">Y111</text>
+ <text class="btn">杩愬崟璇︽儏</text>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">浣滀笟绫诲瀷</view>
+ <view class="value">鍏ュ洯瑁呰揣</view>
+ </view>
+ <view class="empty"></view>
+ <!-- -->
+ <view class="line">
+ <view class="label">杞﹀墠鐗岀収鍙�</view>
+ <view class="value" @click="openInput(1)">
+ <text :style="{ color: param.carNos ? '#000000' : '#999999' }">{{
+ param.carNos ? param.carNos : "璇疯緭鍏ヨ溅鍓嶇墝鐓у彿"
+ }}</text>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">杞﹀悗鐗岀収鍙�</view>
+ <view class="value">
+ <text
+ @click="openInput(1)"
+ :style="{ color: param.carNos ? '#000000' : '#999999' }"
+ >{{ param.carNos ? param.carNos : "璇疯緭鍏ヨ溅鍚庣墝鐓у彿" }}</text
+ >
+ <text class="copy">澶嶅埗杞﹀墠鐗岀収鍙�</text>
+ </view>
+ </view>
+ <!-- -->
+ </view>
+ <view class="space"></view>
+ <!-- 绛夊緟鍙彿 -->
+ <view class="sub_wrap">
+ <view class="btn check">纭浠诲姟</view>
+ </view>
- </view>
- <view class="space"></view>
- <!-- 绛夊緟鍙彿 -->
- <view class="sub_wrap">
- <view class="btn check">纭浠诲姟</view>
- </view>
-
- <!-- modal -->
- <u-popup :show="showDetail" :round="10" :safeAreaInsetBottom="true" closeOnClickOverlay :closeable="true"
- mode="bottom" @close="showDetail = false">
- <view class="detail_modal">
- <view class="modal_title">杩愬崟璇︽儏</view>
- <view class="id_card">
- <view class="last">鐨�</view>
- <view class="name">AD1111</view>
- </view>
- <!-- -->
- <view class="info">
- <view class="line">
- <view class="label">杩愯緭鍗曞彿</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">椹鹃┒鍛�</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">鎬昏繍杈撻噺</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">杩愯緭鍏徃</view>
- <view class="value">2222</view>
- </view>
- </view>
- <view class="separate"></view>
- <view class="contract_list">
- <view class="title">鍚堝悓鍙凤細111</view>
- <view class="address">aadd</view>
- <view class="list">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- </view>
- </view>
- </view>
- </u-popup>
- <keyboardInput ref="keyboard" @export="setPlate" @close="closeInput" />
- </view>
- <!-- -->
+ <!-- modal -->
+ <u-popup
+ :show="showDetail"
+ :round="10"
+ :safeAreaInsetBottom="true"
+ closeOnClickOverlay
+ :closeable="true"
+ mode="bottom"
+ @close="showDetail = false"
+ >
+ <view class="detail_modal">
+ <view class="modal_title">杩愬崟璇︽儏</view>
+ <view class="id_card">
+ <view class="last">鐨�</view>
+ <view class="name">AD1111</view>
+ </view>
+ <!-- -->
+ <view class="info">
+ <view class="line">
+ <view class="label">杩愯緭鍗曞彿</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">椹鹃┒鍛�</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">鎬昏繍杈撻噺</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">杩愯緭鍏徃</view>
+ <view class="value">2222</view>
+ </view>
+ </view>
+ <view class="separate"></view>
+ <view class="contract_list">
+ <view class="title">鍚堝悓鍙凤細111</view>
+ <view class="address">aadd</view>
+ <view class="list">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-popup>
+ <keyboardInput ref="keyboard" @export="setPlate" @close="closeInput" />
+ </view>
+ <!-- -->
</template>
<script>
import keyboardInput from '@/components/keyboard-input/keyboard-input.vue'
export default {
- components: {
- keyboardInput
- },
- data() {
- return {
- param: {
- status: '0'
- },
- showDetail: false,
+ components: {
+ keyboardInput
+ },
+ data() {
+ return {
+ param: {
+ status: '0'
+ },
+ showDetail: false,
- inputType: ''
- }
- },
- methods: {
- handleSignIn() {
- const { param } = this
- this.param.status = param.status == '0' ? '1' : '0'
- },
- getLocation() {
- uni.getLocation({
- type: 'wgs84',
- success: function (res) {
- console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude)
- console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude)
- }
- })
- },
- openInput(type) {
- this.inputType = type
- this.$refs.keyboard.open()
- },
- setPlate(e) {
- if (this.inputType === 1) {
- this.param.carNos = e
- } else if (this.inputType === 2) {
- this.param.carNos = e
- }
- this.$forceUpdate()
- this.closeInput()
- },
- closeInput() {
- this.$refs.keyboard.close()
- }
- }
+ inputType: ''
+ }
+ },
+ methods: {
+ handleSignIn() {
+ const { param } = this
+ this.param.status = param.status == '0' ? '1' : '0'
+ },
+ getLocation() {
+ uni.getLocation({
+ type: 'wgs84',
+ success: function (res) {
+ console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude)
+ console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude)
+ }
+ })
+ },
+ openInput(type) {
+ this.inputType = type
+ this.$refs.keyboard.open()
+ },
+ setPlate(e) {
+ if (this.inputType === 1) {
+ this.param.carNos = e
+ } else if (this.inputType === 2) {
+ this.param.carNos = e
+ }
+ this.$forceUpdate()
+ this.closeInput()
+ },
+ closeInput() {
+ this.$refs.keyboard.close()
+ }
+ }
}
</script>
<style lang="scss">
page {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
.main_app {
- padding: 0;
+ padding: 0;
- .main_content {
- background: #FFFFFF;
- border-radius: 20rpx 20rpx 0rpx 0rpx;
- padding: 16rpx 30rpx;
- position: relative;
- bottom: 32rpx;
+ .main_content {
+ background: #ffffff;
+ border-radius: 20rpx 20rpx 0rpx 0rpx;
+ padding: 16rpx 30rpx;
+ position: relative;
+ bottom: 32rpx;
- .line {
- padding: 24rpx 0 28rpx;
- border-bottom: 1rpx solid #E5E5E5;
+ .line {
+ padding: 24rpx 0 28rpx;
+ border-bottom: 1rpx solid #e5e5e5;
- .label {
- font-size: 26rpx;
- color: #666666;
- margin-bottom: 20rpx;
- }
+ .label {
+ font-size: 26rpx;
+ color: #666666;
+ margin-bottom: 20rpx;
+ }
- .value {
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 30rpx;
+ .value {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 30rpx;
- .waybill_num {
- flex: 1;
- }
+ .waybill_num {
+ flex: 1;
+ }
- .copy {
- font-size: 26rpx;
- color: $uni-color-primary;
- }
+ .copy {
+ font-size: 26rpx;
+ color: $uni-color-primary;
+ }
- .btn {
- font-size: 28rpx;
- color: $uni-color-primary;
- display: flex;
- }
- }
- }
- .empty{
- width: 750rpx;
- height: 20rpx;
- background-color: #f7f7f7;
- margin: 0 -30rpx;
- }
- .warnning {
- display: flex;
- color: #ED4545;
- align-items: center;
- margin: 40rpx 0;
- }
+ .btn {
+ font-size: 28rpx;
+ color: $uni-color-primary;
+ display: flex;
+ }
+ }
+ }
+ .empty {
+ width: 750rpx;
+ height: 20rpx;
+ background-color: #f7f7f7;
+ margin: 0 -30rpx;
+ }
+ .warnning {
+ display: flex;
+ color: #ed4545;
+ align-items: center;
+ margin: 40rpx 0;
+ }
- .signIn_wrap {
- margin: 80rpx auto;
- width: 260rpx;
- height: 260rpx;
- position: relative;
- color: #fff;
- z-index: 1;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
+ .signIn_wrap {
+ margin: 80rpx auto;
+ width: 260rpx;
+ height: 260rpx;
+ position: relative;
+ color: #fff;
+ z-index: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
- .handle {
- font-weight: 500;
- font-size: 40rpx;
- line-height: 56rpx;
- }
+ .handle {
+ font-weight: 600;
+ font-size: 40rpx;
+ line-height: 56rpx;
+ }
- .time {
- color: rgba(255, 255, 255, 0.7);
- }
+ .time {
+ color: rgba(255, 255, 255, 0.7);
+ }
- .img {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
- }
- }
+ .img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
+ }
+ }
- .status_wrap {
- height: 200rpx;
- width: 100%;
- padding: 30rpx;
- position: relative;
- z-index: 99;
- color: #fff;
- .bg {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
+ .status_wrap {
+ height: 200rpx;
+ width: 100%;
+ padding: 30rpx;
+ position: relative;
+ z-index: 99;
+ color: #fff;
+ .bg {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
- .name {
- font-weight: 500;
- font-size: 40rpx;
- line-height: 56rpx;
- margin-bottom: 12rpx;
- }
+ .name {
+ font-weight: 600;
+ font-size: 40rpx;
+ line-height: 56rpx;
+ margin-bottom: 12rpx;
+ }
- .id_card {
- color: rgba(255, 255, 255, 0.8);
- }
- .status {
- position: absolute;
- right: 0;
- top: 30rpx;
- height: 68rpx;
- line-height: 68rpx;
- background: #FFFFFF;
- padding: 0 24rpx;
- border-radius: 34rpx 0rpx 0rpx 34rpx;
- font-size: 26rpx;
- color: $uni-color-primary;
+ .id_card {
+ color: rgba(255, 255, 255, 0.8);
+ }
+ .status {
+ position: absolute;
+ right: 0;
+ top: 30rpx;
+ height: 68rpx;
+ line-height: 68rpx;
+ background: #ffffff;
+ padding: 0 24rpx;
+ border-radius: 34rpx 0rpx 0rpx 34rpx;
+ font-size: 26rpx;
+ color: $uni-color-primary;
+ }
+ }
- }
- }
+ .space {
+ width: 750rpx;
+ height: 200rpx;
+ }
- .space {
- width: 750rpx;
- height: 200rpx;
- }
+ .sub_wrap {
+ position: fixed;
+ padding: 16rpx 30rpx 64rpx;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ display: flex;
+ z-index: 1;
+ justify-content: space-between;
+ background-color: #fff;
+ .btn {
+ height: 96rpx;
+ line-height: 96rpx;
+ text-align: center;
+ width: 690rpx;
+ font-size: 36rpx;
+ color: #333333;
+ background: #ffffff;
+ border-radius: 48rpx;
+ border: 1rpx solid #999999;
+ }
- .sub_wrap {
- position: fixed;
- padding: 16rpx 30rpx 64rpx;
- bottom: 0;
- left: 0;
- width: 100%;
- display: flex;
- z-index: 1;
- justify-content: space-between;
- background-color: #fff;
- .btn {
- height: 96rpx;
- line-height: 96rpx;
- text-align: center;
- width: 690rpx;
- font-size: 36rpx;
- color: #333333;
- background: #FFFFFF;
- border-radius: 48rpx;
- border: 1rpx solid #999999;
- }
-
- .check {
- background: $uni-color-primary;
- border: 1rpx solid $uni-color-primary;
- color: #fff;
- }
- }
+ .check {
+ background: $uni-color-primary;
+ border: 1rpx solid $uni-color-primary;
+ color: #fff;
+ }
+ }
}
.detail_modal {
- padding: 36rpx 30rpx;
+ padding: 36rpx 30rpx;
- .modal_title {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 44rpx;
- text-align: center;
- margin-bottom: 36rpx;
- }
+ .modal_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 44rpx;
+ text-align: center;
+ margin-bottom: 36rpx;
+ }
- .contract_list {
- .list {
- background: #F7F7F7;
- border-radius: 8rpx;
- padding: 20rpx;
+ .contract_list {
+ .list {
+ background: #f7f7f7;
+ border-radius: 8rpx;
+ padding: 20rpx;
- .line {
- display: flex;
- margin-bottom: 20rpx;
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
- &:nth-of-type(3n) {
- border-top: 1rpx solid #E5E5E5;
- padding-top: 20rpx;
- }
+ &:nth-of-type(3n) {
+ border-top: 1rpx solid #e5e5e5;
+ padding-top: 20rpx;
+ }
- .label {
- color: #666666;
- width: 86rpx;
- }
+ .label {
+ color: #666666;
+ width: 86rpx;
+ }
- .value {
- flex: 1;
- color: #222222;
- }
- }
- }
+ .value {
+ flex: 1;
+ color: #222222;
+ }
+ }
+ }
- .title {
- font-weight: 500;
- font-size: 30rpx;
- color: $uni-color-primary;
- margin-bottom: 12rpx;
- }
+ .title {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: $uni-color-primary;
+ margin-bottom: 12rpx;
+ }
- .address {
- font-size: 26rpx;
- color: #666666;
- margin-bottom: 20rpx;
- }
- }
+ .address {
+ font-size: 26rpx;
+ color: #666666;
+ margin-bottom: 20rpx;
+ }
+ }
- .info {
- .line {
- display: flex;
- margin-bottom: 20rpx;
+ .info {
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
- .label {
- font-size: 30rpx;
- color: #666666;
- width: 150rpx;
- }
+ .label {
+ font-size: 30rpx;
+ color: #666666;
+ width: 150rpx;
+ }
- .value {
- flex: 1;
- font-size: 30rpx;
- color: #222222;
- }
- }
- }
+ .value {
+ flex: 1;
+ font-size: 30rpx;
+ color: #222222;
+ }
+ }
+ }
- .separate {
- width: 750rpx;
- height: 2rpx;
- margin: 30rpx -30rpx;
- border: 1rpx solid #E5E5E5;
- }
+ .separate {
+ width: 750rpx;
+ height: 2rpx;
+ margin: 30rpx -30rpx;
+ border: 1rpx solid #e5e5e5;
+ }
- .id_card {
- border-radius: 8rpx;
- display: flex;
- height: 60rpx;
- line-height: 60rpx;
- font-weight: 600;
- font-size: 36rpx;
- color: #111111;
- text-align: center;
- margin-bottom: 30rpx;
+ .id_card {
+ border-radius: 8rpx;
+ display: flex;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-weight: 600;
+ font-size: 36rpx;
+ color: #111111;
+ text-align: center;
+ margin-bottom: 30rpx;
- .last {
- background: #E9F5F6;
- width: 60rpx;
- border-radius: 8rpx 0rpx 0rpx 8rpx;
- border: 1rpx solid #DFDEDE;
- }
+ .last {
+ background: #e9f5f6;
+ width: 60rpx;
+ border-radius: 8rpx 0rpx 0rpx 8rpx;
+ border: 1rpx solid #dfdede;
+ }
- .name {
- width: 186rpx;
- border: 1rpx solid #DFDEDE;
- }
- }
+ .name {
+ width: 186rpx;
+ border: 1rpx solid #dfdede;
+ }
+ }
}
</style>
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 05aa40e..7d8e014 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -1,52 +1,60 @@
<template>
- <view class="main_app">
- <view class="status_wrap">
- <image class="bg" src="../../static/driver/bg_renwu@2x.png" mode=""></image>
- <view class="name">浣滀笟宸插畬鎴�</view>
- <view class="id_card">鐨朅D1212</view>
- <view class="status">浣滀笟瀹屾垚</view>
- </view>
- <!-- -->
- <view class="main_content">
- <view class="line">
- <view class="label">鍙告満濮撳悕</view>
- <view class="value">鍒樻煇</view>
- </view>
- <view class="line">
- <view class="label">鎵嬫満鍙�</view>
- <view class="value">188</view>
- </view>
- <view class="line">
- <view class="label">杩愯緭鍗曞彿</view>
- <view class="value" @click="showDetail = true">
- <text class="waybill_num">Y111</text>
- <text class="btn">杩愬崟璇︽儏</text>
- </view>
- </view>
- <view class="line">
- <view class="label">浣滀笟绫诲瀷</view>
- <view class="value">鍏ュ洯瑁呰揣</view>
- </view>
- <view class="line">
- <view class="label">杞︾墝鐓�</view>
- <view class="value">鍓嶏細鐨朅21</view>
- </view>
- <!-- -->
- <view class="line">
- <view class="label">璺濈鍥尯</view>
- <view class="value">
- <view class="">0 鍏噷</view>
- <view class="btn" @click="getLocation">
- <u-icon name="map" :color="$store.state.primaryColor" class="mr6"></u-icon>
- 閲嶆柊瀹氫綅
- </view>
- </view>
- </view>
- <view class="warnning">
- <u-icon name="info-circle" color="#ED4545" class="mr12"></u-icon>
- 濡傛棤娉曡幏鍙栧畾浣嶏紝璇风敤寰俊鎵弿鍥尯澶у睆浜岀淮
- </view>
-<!-- <view class="line">
+ <view class="main_app">
+ <view class="status_wrap">
+ <image
+ class="bg"
+ src="../../static/driver/bg_renwu@2x.png"
+ mode=""
+ ></image>
+ <view class="name">浣滀笟宸插畬鎴�</view>
+ <view class="id_card">鐨朅D1212</view>
+ <view class="status">浣滀笟瀹屾垚</view>
+ </view>
+ <!-- -->
+ <view class="main_content">
+ <view class="line">
+ <view class="label">鍙告満濮撳悕</view>
+ <view class="value">鍒樻煇</view>
+ </view>
+ <view class="line">
+ <view class="label">鎵嬫満鍙�</view>
+ <view class="value">188</view>
+ </view>
+ <view class="line">
+ <view class="label">杩愯緭鍗曞彿</view>
+ <view class="value" @click="showDetail = true">
+ <text class="waybill_num">Y111</text>
+ <text class="btn">杩愬崟璇︽儏</text>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">浣滀笟绫诲瀷</view>
+ <view class="value">鍏ュ洯瑁呰揣</view>
+ </view>
+ <view class="line">
+ <view class="label">杞︾墝鐓�</view>
+ <view class="value">鍓嶏細鐨朅21</view>
+ </view>
+ <!-- -->
+ <view class="line">
+ <view class="label">璺濈鍥尯</view>
+ <view class="value">
+ <view class="">0 鍏噷</view>
+ <view class="btn" @click="getLocation">
+ <u-icon
+ name="map"
+ :color="$store.state.primaryColor"
+ class="mr6"
+ ></u-icon>
+ 閲嶆柊瀹氫綅
+ </view>
+ </view>
+ </view>
+ <view class="warnning">
+ <u-icon name="info-circle" color="#ED4545" class="mr12"></u-icon>
+ 濡傛棤娉曡幏鍙栧畾浣嶏紝璇风敤寰俊鎵弿鍥尯澶у睆浜岀淮
+ </view>
+ <!-- <view class="line">
<view class="label">绛惧埌鏃堕棿</view>
<view class="value">2022</view>
</view>
@@ -58,323 +66,338 @@
<view class="label">浣滀笟瀹屾垚</view>
<view class="value">2022</view>
</view> -->
- <view class="signIn_wrap" @click="handleSignIn">
- <image :src="param.status == '0' ? require('@/static/driver/btn_qiandao@2x.png') : require('@/static/driver/btn_qiandao_fail@2x.png')" class="img" mode="widthFix"></image>
- <view class="handle">绛惧埌</view>
- <view class="time">09:10</view>
- </view>
- </view>
- <view class="space"></view>
- <!-- 绛夊緟鍙彿 -->
- <view class="padding_wrap">
- <view class="btn cancel">鍙栨秷绛惧埌</view>
- <view class="btn check">鏌ョ湅鎺掗槦鎯呭喌</view>
- </view>
-
- <!-- modal -->
- <u-popup :show="showDetail" :round="10" :safeAreaInsetBottom="true" closeOnClickOverlay :closeable="true" mode="bottom" @close="showDetail = false">
- <view class="detail_modal">
- <view class="modal_title">杩愬崟璇︽儏</view>
- <view class="id_card">
- <view class="last">鐨�</view>
- <view class="name">AD1111</view>
- </view>
- <!-- -->
- <view class="info">
- <view class="line">
- <view class="label">杩愯緭鍗曞彿</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">椹鹃┒鍛�</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">鎬昏繍杈撻噺</view>
- <view class="value">2222</view>
- </view>
- <view class="line">
- <view class="label">杩愯緭鍏徃</view>
- <view class="value">2222</view>
- </view>
- </view>
- <view class="separate"></view>
- <view class="contract_list">
- <view class="title">鍚堝悓鍙凤細111</view>
- <view class="address">aadd</view>
- <view class="list">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">榛勫北榛戦┈</view>
- </view>
- </view>
- </view>
- </view>
- </u-popup>
- </view>
+ <view class="signIn_wrap" @click="handleSignIn">
+ <image
+ :src="
+ param.status == '0'
+ ? require('@/static/driver/btn_qiandao@2x.png')
+ : require('@/static/driver/btn_qiandao_fail@2x.png')
+ "
+ class="img"
+ mode="widthFix"
+ ></image>
+ <view class="handle">绛惧埌</view>
+ <view class="time">09:10</view>
+ </view>
+ </view>
+ <view class="space"></view>
+ <!-- 绛夊緟鍙彿 -->
+ <view class="padding_wrap">
+ <view class="btn cancel">鍙栨秷绛惧埌</view>
+ <view class="btn check">鏌ョ湅鎺掗槦鎯呭喌</view>
+ </view>
+
+ <!-- modal -->
+ <u-popup
+ :show="showDetail"
+ :round="10"
+ :safeAreaInsetBottom="true"
+ closeOnClickOverlay
+ :closeable="true"
+ mode="bottom"
+ @close="showDetail = false"
+ >
+ <view class="detail_modal">
+ <view class="modal_title">杩愬崟璇︽儏</view>
+ <view class="id_card">
+ <view class="last">鐨�</view>
+ <view class="name">AD1111</view>
+ </view>
+ <!-- -->
+ <view class="info">
+ <view class="line">
+ <view class="label">杩愯緭鍗曞彿</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">椹鹃┒鍛�</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">鎬昏繍杈撻噺</view>
+ <view class="value">2222</view>
+ </view>
+ <view class="line">
+ <view class="label">杩愯緭鍏徃</view>
+ <view class="value">2222</view>
+ </view>
+ </view>
+ <view class="separate"></view>
+ <view class="contract_list">
+ <view class="title">鍚堝悓鍙凤細111</view>
+ <view class="address">aadd</view>
+ <view class="list">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">榛勫北榛戦┈</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-popup>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
- param: {
- status: '0'
- },
- showDetail: false,
- };
- },
- methods: {
- handleSignIn() {
- const { param } = this
- this.param.status = param.status == '0' ? '1' : '0'
- },
- getLocation() {
- uni.getLocation({
- type: 'wgs84',
- success: function (res) {
- console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude);
- console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude);
- }
- });
- }
- }
- }
+export default {
+ data() {
+ return {
+ param: {
+ status: '0'
+ },
+ showDetail: false,
+ }
+ },
+ methods: {
+ handleSignIn() {
+ const { param } = this
+ this.param.status = param.status == '0' ? '1' : '0'
+ },
+ getLocation() {
+ uni.getLocation({
+ type: 'wgs84',
+ success: function (res) {
+ console.log('褰撳墠浣嶇疆鐨勭粡搴︼細' + res.longitude)
+ console.log('褰撳墠浣嶇疆鐨勭含搴︼細' + res.latitude)
+ }
+ })
+ }
+ }
+}
</script>
<style lang="scss">
-.main_app{
- padding: 0;
- .main_content{
- background: #FFFFFF;
- border-radius: 20rpx 20rpx 0rpx 0rpx;
- padding: 16rpx 30rpx;
- position: relative;
- bottom: 32rpx;
- .line{
- padding: 24rpx 0 28rpx;
- border-bottom: 1rpx solid #E5E5E5;
- display: flex;
- .label{
- width: 150rpx;
- font-size: 30rpx;
- color: #666666;
- }
- .value{
- flex: 1;
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 30rpx;
- .waybill_num{
- flex: 1;
- }
- .btn{
- font-size: 28rpx;
- color: $uni-color-primary;
- display: flex;
- }
- }
- }
- .warnning{
- display: flex;
- color: #ED4545;
- align-items: center;
- margin: 40rpx 0;
- }
- .signIn_wrap{
- margin: 80rpx auto;
- width: 260rpx;
- height: 260rpx;
- position: relative;
- color: #fff;
- z-index: 1;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- .handle{
- font-weight: 500;
- font-size: 40rpx;
- line-height: 56rpx;
- }
- .time{
- color: rgba(255,255,255,0.7);
- }
- .img{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
- }
- }
- .status_wrap{
- height: 200rpx;
- width: 100%;
- padding: 30rpx;
- position: relative;
- color: #fff;
- .bg{
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- .name{
- font-weight: 500;
- font-size: 40rpx;
- line-height: 56rpx;
- margin-bottom: 12rpx;
- }
- .id_card{
- color: rgba(255,255,255,0.8);
- }
- .status{
- position: absolute;
- right: 0;
- top: 30rpx;
- height: 68rpx;
- line-height: 68rpx;
- background: #FFFFFF;
- padding: 0 24rpx;
- border-radius: 34rpx 0rpx 0rpx 34rpx;
- font-size: 26rpx;
- color: $uni-color-primary;
-
- }
- }
- .space{
- width: 750rpx;
- height: 200rpx;
- }
- .padding_wrap{
- position: fixed;
- padding: 0 30rpx 64rpx;
- bottom: 0;
- left: 0;
- width: 100%;
- display: flex;
- justify-content: space-between;
- .btn{
- height: 96rpx;
- line-height: 96rpx;
- text-align: center;
- width: 336rpx;
- font-size: 36rpx;
- color: #333333;
- background: #FFFFFF;
- border-radius: 48rpx;
- border: 1rpx solid #999999;
- }
- .check{
- background: $uni-color-primary;
- border: 1rpx solid $uni-color-primary;
- color: #fff;
- }
- }
+.main_app {
+ padding: 0;
+ .main_content {
+ background: #ffffff;
+ border-radius: 20rpx 20rpx 0rpx 0rpx;
+ padding: 16rpx 30rpx;
+ position: relative;
+ bottom: 32rpx;
+ .line {
+ padding: 24rpx 0 28rpx;
+ border-bottom: 1rpx solid #e5e5e5;
+ display: flex;
+ .label {
+ width: 150rpx;
+ font-size: 30rpx;
+ color: #666666;
+ }
+ .value {
+ flex: 1;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 30rpx;
+ .waybill_num {
+ flex: 1;
+ }
+ .btn {
+ font-size: 28rpx;
+ color: $uni-color-primary;
+ display: flex;
+ }
+ }
+ }
+ .warnning {
+ display: flex;
+ color: #ed4545;
+ align-items: center;
+ margin: 40rpx 0;
+ }
+ .signIn_wrap {
+ margin: 80rpx auto;
+ width: 260rpx;
+ height: 260rpx;
+ position: relative;
+ color: #fff;
+ z-index: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .handle {
+ font-weight: 600;
+ font-size: 40rpx;
+ line-height: 56rpx;
+ }
+ .time {
+ color: rgba(255, 255, 255, 0.7);
+ }
+ .img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
+ }
+ }
+ .status_wrap {
+ height: 200rpx;
+ width: 100%;
+ padding: 30rpx;
+ position: relative;
+ color: #fff;
+ .bg {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ .name {
+ font-weight: 600;
+ font-size: 40rpx;
+ line-height: 56rpx;
+ margin-bottom: 12rpx;
+ }
+ .id_card {
+ color: rgba(255, 255, 255, 0.8);
+ }
+ .status {
+ position: absolute;
+ right: 0;
+ top: 30rpx;
+ height: 68rpx;
+ line-height: 68rpx;
+ background: #ffffff;
+ padding: 0 24rpx;
+ border-radius: 34rpx 0rpx 0rpx 34rpx;
+ font-size: 26rpx;
+ color: $uni-color-primary;
+ }
+ }
+ .space {
+ width: 750rpx;
+ height: 200rpx;
+ }
+ .padding_wrap {
+ position: fixed;
+ padding: 0 30rpx 64rpx;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ .btn {
+ height: 96rpx;
+ line-height: 96rpx;
+ text-align: center;
+ width: 336rpx;
+ font-size: 36rpx;
+ color: #333333;
+ background: #ffffff;
+ border-radius: 48rpx;
+ border: 1rpx solid #999999;
+ }
+ .check {
+ background: $uni-color-primary;
+ border: 1rpx solid $uni-color-primary;
+ color: #fff;
+ }
+ }
}
-.detail_modal{
- padding: 36rpx 30rpx;
- .modal_title{
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 44rpx;
- text-align: center;
- margin-bottom: 36rpx;
- }
- .contract_list{
- .list{
- background: #F7F7F7;
- border-radius: 8rpx;
- padding: 20rpx;
- .line{
- display: flex;
- margin-bottom: 20rpx;
- &:nth-of-type(3n){
- border-top: 1rpx solid #E5E5E5;
- padding-top: 20rpx;
- }
- .label{
- color: #666666;
- width: 86rpx;
- }
- .value{
- flex: 1;
- color: #222222;
- }
- }
- }
- .title{
- font-weight: 500;
- font-size: 30rpx;
- color: $uni-color-primary;
- margin-bottom: 12rpx;
- }
- .address{
- font-size: 26rpx;
- color: #666666;
- margin-bottom: 20rpx;
- }
- }
- .info{
- .line{
- display: flex;
- margin-bottom: 20rpx;
- .label{
- font-size: 30rpx;
- color: #666666;
- width: 150rpx;
- }
- .value{
- flex: 1;
- font-size: 30rpx;
- color: #222222;
- }
- }
- }
- .separate{
- width: 750rpx;
- height: 2rpx;
- margin: 30rpx -30rpx;
- border: 1rpx solid #E5E5E5;
- }
- .id_card{
- border-radius: 8rpx;
- display: flex;
- height: 60rpx;
- line-height: 60rpx;
- font-weight: 600;
- font-size: 36rpx;
- color: #111111;
- text-align: center;
- margin-bottom: 30rpx;
- .last{
- background: #E9F5F6;
- width: 60rpx;
- border-radius: 8rpx 0rpx 0rpx 8rpx;
- border: 1rpx solid #DFDEDE;
- }
- .name{
- width: 186rpx;
- border: 1rpx solid #DFDEDE;
- }
- }
+.detail_modal {
+ padding: 36rpx 30rpx;
+ .modal_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 44rpx;
+ text-align: center;
+ margin-bottom: 36rpx;
+ }
+ .contract_list {
+ .list {
+ background: #f7f7f7;
+ border-radius: 8rpx;
+ padding: 20rpx;
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
+ &:nth-of-type(3n) {
+ border-top: 1rpx solid #e5e5e5;
+ padding-top: 20rpx;
+ }
+ .label {
+ color: #666666;
+ width: 86rpx;
+ }
+ .value {
+ flex: 1;
+ color: #222222;
+ }
+ }
+ }
+ .title {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: $uni-color-primary;
+ margin-bottom: 12rpx;
+ }
+ .address {
+ font-size: 26rpx;
+ color: #666666;
+ margin-bottom: 20rpx;
+ }
+ }
+ .info {
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
+ .label {
+ font-size: 30rpx;
+ color: #666666;
+ width: 150rpx;
+ }
+ .value {
+ flex: 1;
+ font-size: 30rpx;
+ color: #222222;
+ }
+ }
+ }
+ .separate {
+ width: 750rpx;
+ height: 2rpx;
+ margin: 30rpx -30rpx;
+ border: 1rpx solid #e5e5e5;
+ }
+ .id_card {
+ border-radius: 8rpx;
+ display: flex;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-weight: 600;
+ font-size: 36rpx;
+ color: #111111;
+ text-align: center;
+ margin-bottom: 30rpx;
+ .last {
+ background: #e9f5f6;
+ width: 60rpx;
+ border-radius: 8rpx 0rpx 0rpx 8rpx;
+ border: 1rpx solid #dfdede;
+ }
+ .name {
+ width: 186rpx;
+ border: 1rpx solid #dfdede;
+ }
+ }
}
</style>
diff --git a/h5/pages/laborApplication/laborApplication.vue b/h5/pages/laborApplication/laborApplication.vue
index cf1d7ff..3e4e4d3 100644
--- a/h5/pages/laborApplication/laborApplication.vue
+++ b/h5/pages/laborApplication/laborApplication.vue
@@ -400,7 +400,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.adduser_list {
@@ -490,7 +490,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
@@ -547,7 +547,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search-box {
@@ -690,7 +690,7 @@
background: #025eef;
border-radius: 8rpx;
font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
@@ -794,7 +794,7 @@
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
@@ -870,7 +870,7 @@
background: #025eef;
border-radius: 44rpx;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
diff --git a/h5/pages/meeting/login/login.vue b/h5/pages/meeting/login/login.vue
index 9d4bc9f..098af3d 100644
--- a/h5/pages/meeting/login/login.vue
+++ b/h5/pages/meeting/login/login.vue
@@ -1,139 +1,173 @@
-<template>
- <view class="login">
- <!-- 澶撮儴鑳屾櫙鍥剧墖 -->
- <view class="login_head"
- :style="{ height: 'calc(' + height + ' + ' + '388rpx)', backgroundImage: 'url(' + backgroundImage + ')' }"></view>
-
- <!-- 鐧诲綍妗� -->
- <view class="login_box">
- <view class="login_box_input">
- <input type="text" v-model="from.account" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" placeholder-class="placeholder" />
- </view>
- <view class="login_box_input">
- <input type="password" v-if="!isOpen" v-model="from.password" placeholder="璇疯緭鍏ュ瘑鐮�" placeholder-class="placeholder" />
- <input type="text" v-else v-model="from.password" placeholder="璇疯緭鍏ュ瘑鐮�" placeholder-class="placeholder" />
- <u-icon name="eye-fill" color="#999999" size="20" v-if="!isOpen" @click="isOpen = true"></u-icon>
- <u-icon name="eye-off" color="#999999" size="20" v-else @click="isOpen = false"></u-icon>
- </view>
- <view class="login_box_sub" @click="login">鐧诲綍</view>
- </view>
-
- <u-toast ref="uToast"></u-toast>
- </view>
-</template>
-
+<template>
+ <view class="login">
+ <!-- 澶撮儴鑳屾櫙鍥剧墖 -->
+ <view
+ class="login_head"
+ :style="{
+ height: 'calc(' + height + ' + ' + '388rpx)',
+ backgroundImage: 'url(' + backgroundImage + ')',
+ }"
+ ></view>
+
+ <!-- 鐧诲綍妗� -->
+ <view class="login_box">
+ <view class="login_box_input">
+ <input
+ type="text"
+ v-model="from.account"
+ placeholder="璇疯緭鍏ヨ处鍙峰悕绉�"
+ placeholder-class="placeholder"
+ />
+ </view>
+ <view class="login_box_input">
+ <input
+ type="password"
+ v-if="!isOpen"
+ v-model="from.password"
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ placeholder-class="placeholder"
+ />
+ <input
+ type="text"
+ v-else
+ v-model="from.password"
+ placeholder="璇疯緭鍏ュ瘑鐮�"
+ placeholder-class="placeholder"
+ />
+ <u-icon
+ name="eye-fill"
+ color="#999999"
+ size="20"
+ v-if="!isOpen"
+ @click="isOpen = true"
+ ></u-icon>
+ <u-icon
+ name="eye-off"
+ color="#999999"
+ size="20"
+ v-else
+ @click="isOpen = false"
+ ></u-icon>
+ </view>
+ <view class="login_box_sub" @click="login">鐧诲綍</view>
+ </view>
+
+ <u-toast ref="uToast"></u-toast>
+ </view>
+</template>
+
<script>
- import { mapState, mapMutations } from 'vuex'
-
- export default {
- data() {
- return {
- backgroundImage: 'https://dmtest.ahapp.net/file/projects/20230511/13f256b832db4a4fadc5e6770f5727bf.png',
- from: {
- account: '',
- password: ''
- },
- isOpen: false
- };
- },
- computed: {
- ...mapState(['statusbarHeight', 'navHeight']),
-
- height() {
- return `${this.statusbarHeight + this.navHeight}px`;
- }
- },
- methods: {
- ...mapMutations(["setToken", "setUserInfo"]),
-
- login() {
- if (!this.from.account) return this.$refs.uToast.show({ message: '璐﹀彿涓嶈兘涓虹┖' })
- if (!this.from.password) return this.$refs.uToast.show({ message: '瀵嗙爜涓嶈兘涓虹┖' })
- var that = this
- that.$u.api.ordinaryLogin(that.from)
- .then(res => {
- if (res.code === 200) {
- that.setToken(res.data.token)
- that.setUserInfo(res.data.userResponse)
- uni.login({
- provider: 'MP-WEIXIN',
- success: function (loginRes) {
- that.$u.api.wxEmpower({ code: loginRes.code })
- .then(resa => {
- uni.switchTab({
- url: '/pages/index/index'
- });
- })
- }
- });
- }
- })
- }
- }
- }
-</script>
+import { mapState, mapMutations } from 'vuex'
+
+export default {
+ data() {
+ return {
+ backgroundImage: 'https://dmtest.ahapp.net/file/projects/20230511/13f256b832db4a4fadc5e6770f5727bf.png',
+ from: {
+ account: '',
+ password: ''
+ },
+ isOpen: false
+ }
+ },
+ computed: {
+ ...mapState(['statusbarHeight', 'navHeight']),
+
+ height() {
+ return `${this.statusbarHeight + this.navHeight}px`
+ }
+ },
+ methods: {
+ ...mapMutations(["setToken", "setUserInfo"]),
+
+ login() {
+ if (!this.from.account) return this.$refs.uToast.show({ message: '璐﹀彿涓嶈兘涓虹┖' })
+ if (!this.from.password) return this.$refs.uToast.show({ message: '瀵嗙爜涓嶈兘涓虹┖' })
+ var that = this
+ that.$u.api.ordinaryLogin(that.from)
+ .then(res => {
+ if (res.code === 200) {
+ that.setToken(res.data.token)
+ that.setUserInfo(res.data.userResponse)
+ uni.login({
+ provider: 'MP-WEIXIN',
+ success: function (loginRes) {
+ that.$u.api.wxEmpower({ code: loginRes.code })
+ .then(resa => {
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
+ })
+ }
+ })
+ }
+ })
+ }
+ }
+}
+</script>
<style>
- page {
- background-color: #fff !important;
- }
+page {
+ background-color: #fff !important;
+}
</style>
-
-<style lang="scss">
+
+<style lang="scss">
.login {
- width: 100%;
- .login_head {
- width: 100%;
- background-repeat: no-repeat;
- background-size: 100%;
- }
- .login_box {
- width: 100%;
- position: relative;
- top: -114rpx;
- padding: 80rpx 60rpx;
- box-sizing: border-box;
- background-color: #ffffff;
- border-radius: 48rpx 48rpx 0rpx 0rpx;
- .login_box_input {
- width: 100%;
- height: 100rpx;
- display: flex;
- align-items: center;
- background: #F7F7F7;
- border-radius: 4rpx;
- margin-bottom: 40rpx;
- padding: 0 40rpx;
- box-sizing: border-box;
- .placeholder {
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- input {
- width: 100%;
- height: 100%;
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #000000;
- margin-right: 20rpx;
- }
- }
- .login_box_sub {
- width: 100%;
- height: 100rpx;
- line-height: 100rpx;
- text-align: center;
- background: #0055FF;
- border-radius: 4rpx;
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #FFFFFF;
- margin-top: 60rpx;
- }
- }
-}
-</style>
+ width: 100%;
+ .login_head {
+ width: 100%;
+ background-repeat: no-repeat;
+ background-size: 100%;
+ }
+ .login_box {
+ width: 100%;
+ position: relative;
+ top: -114rpx;
+ padding: 80rpx 60rpx;
+ box-sizing: border-box;
+ background-color: #ffffff;
+ border-radius: 48rpx 48rpx 0rpx 0rpx;
+ .login_box_input {
+ width: 100%;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ background: #f7f7f7;
+ border-radius: 4rpx;
+ margin-bottom: 40rpx;
+ padding: 0 40rpx;
+ box-sizing: border-box;
+ .placeholder {
+ font-size: 30rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ input {
+ width: 100%;
+ height: 100%;
+ font-size: 30rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ margin-right: 20rpx;
+ }
+ }
+ .login_box_sub {
+ width: 100%;
+ height: 100rpx;
+ line-height: 100rpx;
+ text-align: center;
+ background: #0055ff;
+ border-radius: 4rpx;
+ font-size: 32rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #ffffff;
+ margin-top: 60rpx;
+ }
+ }
+}
+</style>
diff --git a/h5/pages/meeting/myAppointment/myAppointment.vue b/h5/pages/meeting/myAppointment/myAppointment.vue
index 3543f76..26772c4 100644
--- a/h5/pages/meeting/myAppointment/myAppointment.vue
+++ b/h5/pages/meeting/myAppointment/myAppointment.vue
@@ -1,618 +1,667 @@
<template>
- <page-meta :page-style="'overflow:'+(pageShow?'hidden':'visible')"></page-meta>
- <view class="yuyue">
- <view class="yuyue_head">
- <view class="yuyue_head_input">
- <u--input
- placeholder="鎼滅储"
- prefixIcon="search"
- v-model="meetingName"
- @confirm="sou"
- prefixIconStyle="font-size: 22px; color: #909399"
- ></u--input>
- </view>
- <view class="yuyue_head_list">
- <view class="yuyue_head_list_item" v-for="(item, index) in cate" :key="index" @click="clickItem(index)">
- <text :class="i === index ? 'yuyue_head_list_item_active' : ''">{{item.name}}</text>
- <view class="yuyue_head_list_item_h" v-show="i === index"></view>
- </view>
- </view>
- </view>
-
- <view class="yuyue_content" v-if="list && list.length > 0">
- <view class="yuyue_content_item" v-for="(item, index) in list" :key="index">
- <view class="item_a" @click="jump(item.id)">
- <view class="item_a_title">{{item.meetingName}}</view>
- <view class="item_a_1 item_a_two" v-if="item.meetingStatus === 1">鏈紑濮�</view>
- <view class="item_a_1 item_a_one" v-else-if="item.meetingStatus === 2">杩涜涓�</view>
- <view class="item_a_1 item_a_three" v-else>宸茬粨鏉�</view>
- </view>
- <view class="item_b" @click="jump(item.id)"></view>
- <view class="item_c" @click="jump(item.id)">
- <view class="item_c_item">
- <text>浼氳鏃堕棿锛�</text>
- <text>{{item.meetingDate}} {{item.meetingTime}}</text>
- </view>
- <view class="item_c_item">
- <text>浼氳瀹わ細</text>
- <text>{{item.roomName}}</text>
- </view>
- <view class="item_c_item">
- <text>棰勭害浜猴細</text>
- <text>{{item.bookingUser}}</text>
- </view>
- </view>
- <view class="item_d" v-if="i === 0">
- <view class="item_d_left">
- <view class="item_d_left_item" @click.stop="copy(item)" v-if="item.meetingStatus !== 3">
- <image src="@/static/meeting/icon/ic_copy@2x.png" mode="widthFix"></image>
- <text>澶嶅埗</text>
- </view>
- <view class="item_d_left_item" @click="fenxiang(item)" v-if="item.meetingStatus !== 3">
- <button open-type="share"></button>
- <image src="@/static/meeting/icon/ic_fenxiang@2x.png" mode="widthFix"></image>
- <text>鍒嗕韩</text>
- </view>
- <view class="item_d_left_item" v-if="item.meetingStatus === 1" @click.stop="closeRoom(item.meetingStatus, item.id)">
- <image src="@/static/meeting/icon/ic_cancel@2x.png" mode="widthFix"></image>
- <text>鍙栨秷</text>
- </view>
- </view>
- <view class="item_d_right" @click.stop="getQrCodes(item.id, item.roomName)">
- 寮�闂ㄧ爜
- </view>
- </view>
- </view>
- </view>
-
- <view class="yuyue_content" v-else>
- <view class="yuyue_content_wu">
- <image src="@/static/meeting/common/364.png" mode="widthFix"></image>
- </view>
- </view>
-
- <!-- 寮�闂ㄧ爜 -->
- <view class="details_ma">
- <u-popup :show="show" :closeable="true" :safeAreaInsetBottom="false" :round="0" mode="center" @close="close">
- <view class="box">
- <text class="box_a">{{roomName || ''}}</text>
- <!-- <text class="box_b">浜岀淮鐮亄{time}}绉掑唴鏈夋晥</text> -->
- <text class="box_b" v-if="time > 0">浜岀淮鐮亄{time}}绉掑唴鏈夋晥</text>
- <text class="box_b" v-else>浜岀淮鐮佸凡杩囨湡锛岃鐐瑰嚮浜岀淮鐮佸埛鏂�</text>
- <view class="qrcode" @click="Refresh(1)">
- <image :src="qrurl" mode="widthFix"></image>
- </view>
- <!-- <text class="box_c">鍑虹ず璇ヤ簩缁寸爜锛屾壂鐮佽繘鍏ヤ細璁</text>
+ <page-meta
+ :page-style="'overflow:' + (pageShow ? 'hidden' : 'visible')"
+ ></page-meta>
+ <view class="yuyue">
+ <view class="yuyue_head">
+ <view class="yuyue_head_input">
+ <u--input
+ placeholder="鎼滅储"
+ prefixIcon="search"
+ v-model="meetingName"
+ @confirm="sou"
+ prefixIconStyle="font-size: 22px; color: #909399"
+ ></u--input>
+ </view>
+ <view class="yuyue_head_list">
+ <view
+ class="yuyue_head_list_item"
+ v-for="(item, index) in cate"
+ :key="index"
+ @click="clickItem(index)"
+ >
+ <text :class="i === index ? 'yuyue_head_list_item_active' : ''">{{
+ item.name
+ }}</text>
+ <view class="yuyue_head_list_item_h" v-show="i === index"></view>
+ </view>
+ </view>
+ </view>
+
+ <view class="yuyue_content" v-if="list && list.length > 0">
+ <view
+ class="yuyue_content_item"
+ v-for="(item, index) in list"
+ :key="index"
+ >
+ <view class="item_a" @click="jump(item.id)">
+ <view class="item_a_title">{{ item.meetingName }}</view>
+ <view class="item_a_1 item_a_two" v-if="item.meetingStatus === 1"
+ >鏈紑濮�</view
+ >
+ <view class="item_a_1 item_a_one" v-else-if="item.meetingStatus === 2"
+ >杩涜涓�</view
+ >
+ <view class="item_a_1 item_a_three" v-else>宸茬粨鏉�</view>
+ </view>
+ <view class="item_b" @click="jump(item.id)"></view>
+ <view class="item_c" @click="jump(item.id)">
+ <view class="item_c_item">
+ <text>浼氳鏃堕棿锛�</text>
+ <text>{{ item.meetingDate }} {{ item.meetingTime }}</text>
+ </view>
+ <view class="item_c_item">
+ <text>浼氳瀹わ細</text>
+ <text>{{ item.roomName }}</text>
+ </view>
+ <view class="item_c_item">
+ <text>棰勭害浜猴細</text>
+ <text>{{ item.bookingUser }}</text>
+ </view>
+ </view>
+ <view class="item_d" v-if="i === 0">
+ <view class="item_d_left">
+ <view
+ class="item_d_left_item"
+ @click.stop="copy(item)"
+ v-if="item.meetingStatus !== 3"
+ >
+ <image
+ src="@/static/meeting/icon/ic_copy@2x.png"
+ mode="widthFix"
+ ></image>
+ <text>澶嶅埗</text>
+ </view>
+ <view
+ class="item_d_left_item"
+ @click="fenxiang(item)"
+ v-if="item.meetingStatus !== 3"
+ >
+ <button open-type="share"></button>
+ <image
+ src="@/static/meeting/icon/ic_fenxiang@2x.png"
+ mode="widthFix"
+ ></image>
+ <text>鍒嗕韩</text>
+ </view>
+ <view
+ class="item_d_left_item"
+ v-if="item.meetingStatus === 1"
+ @click.stop="closeRoom(item.meetingStatus, item.id)"
+ >
+ <image
+ src="@/static/meeting/icon/ic_cancel@2x.png"
+ mode="widthFix"
+ ></image>
+ <text>鍙栨秷</text>
+ </view>
+ </view>
+ <view
+ class="item_d_right"
+ @click.stop="getQrCodes(item.id, item.roomName)"
+ >
+ 寮�闂ㄧ爜
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view class="yuyue_content" v-else>
+ <view class="yuyue_content_wu">
+ <image src="@/static/meeting/common/364.png" mode="widthFix"></image>
+ </view>
+ </view>
+
+ <!-- 寮�闂ㄧ爜 -->
+ <view class="details_ma">
+ <u-popup
+ :show="show"
+ :closeable="true"
+ :safeAreaInsetBottom="false"
+ :round="0"
+ mode="center"
+ @close="close"
+ >
+ <view class="box">
+ <text class="box_a">{{ roomName || "" }}</text>
+ <!-- <text class="box_b">浜岀淮鐮亄{time}}绉掑唴鏈夋晥</text> -->
+ <text class="box_b" v-if="time > 0">浜岀淮鐮亄{ time }}绉掑唴鏈夋晥</text>
+ <text class="box_b" v-else>浜岀淮鐮佸凡杩囨湡锛岃鐐瑰嚮浜岀淮鐮佸埛鏂�</text>
+ <view class="qrcode" @click="Refresh(1)">
+ <image :src="qrurl" mode="widthFix"></image>
+ </view>
+ <!-- <text class="box_c">鍑虹ず璇ヤ簩缁寸爜锛屾壂鐮佽繘鍏ヤ細璁</text>
<text class="box_d">濡傛灉鎵撲笉寮�璇疯仈绯荤鐞嗗憳锛�</text>
<text class="box_e">鏉庣孩鍜� 18899039483</text> -->
- </view>
- </u-popup>
- </view>
-
- <!-- 鍙栨秷浼氳 -->
- <u-modal
- :show="show1"
- title="鎻愮ず"
- content='鏄惁纭鍙栨秷褰撳墠浼氳'
- @confirm="confirm"
- @cancel="close1"
- ref="uModal"
- :showCancelButton="true"
- asyncClose="true"></u-modal>
- </view>
+ </view>
+ </u-popup>
+ </view>
+
+ <!-- 鍙栨秷浼氳 -->
+ <u-modal
+ :show="show1"
+ title="鎻愮ず"
+ content="鏄惁纭鍙栨秷褰撳墠浼氳"
+ @confirm="confirm"
+ @cancel="close1"
+ ref="uModal"
+ :showCancelButton="true"
+ asyncClose="true"
+ ></u-modal>
+ </view>
</template>
<script>
- import { mapState } from 'vuex'
- import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
- export default {
- data() {
- return {
- i: 0,
- show: false,
- cate: [
- { name: '鏈紑濮�', id: 1 },
- { name: '宸茬粨鏉�', id: 2 }
- ],
- pageShow: false,
- id: '',
- meetingName: '',
- show1: false,
- val: '',
- list: [],
- next: false,
- page: 0,
- time: 0,
- roomName: '',
- link: '',
- qrurl: '',
- timer: null,
- timeValue: '',
- Id: '',
- share: {
- title: '',
- path: '',
- imageUrl: 'https://dmtest.ahapp.net/file/projects/20230511/13f256b832db4a4fadc5e6770f5727bf.png'
- }
- };
- },
- computed: {
- ...mapState(['token'])
- },
- components: { tkiQrcode },
- onReachBottom() {
- this.getList()
- },
- onLoad() {
- this.getList()
- this.getSYSTEM()
- },
- onShareAppMessage({from,target}) {
- if (from == 'button') {
- return this.share
- }
- },
- methods: {
- // 鍒嗕韩
- fenxiang(item) {
- this.share.title = item.meetingName
- this.share.path = `/packagesMine/meetingDetails/meetingDetails?shareId=${item.id}`
- },
- // 鍒锋柊浜岀淮鐮�
- Refresh(type) {
- if (this.time !== 0) return
- uni.showLoading({
- title: '鍔犺浇涓�',
- mask: true
- });
- uni.request({
- url: `${this.$baseUrl}web/meeting/getQrCodeImg?id=${this.Id}&token=${this.token}`, //url鍦板潃
- method: 'GET',
- responseType: 'arraybuffer',
- header: {
- 'Content-Type': 'application/json'
- },
- success: res => {
- const arrayBuffer = new Uint8Array(res.data)
- const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(arrayBuffer) //杩欓噷闇�瑕佹坊鍔犲墠缂�
- this.qrurl = base64
- if (type === 1) {
- this.time = Number(this.timeValue) * 60
- this.getTime()
- }
- },
- complete() {
- uni.hideLoading();
- }
- });
- },
- getTime() {
- this.timer = setInterval(() => {
- if (this.time === 0) {
- clearInterval(this.timer)
- this.timer = null
- this.time = 0
- return
- }
- this.time = this.time - 1
- }, 1000)
- },
- getSYSTEM() {
- this.$u.api.getSystemDictData({
- dictCode: 'SYSTEM',
- label: 'QR_OPENBOOK_VALIDTIME'
- }).then(res => {
- this.time = Number(res.data.code) * 60
- this.timeValue = Number(res.data.code)
- })
- this.$u.api.getSystemDictData({
- dictCode: 'SYSTEM',
- label: 'H5_LINK_ADDR'
- }).then(res => {
- this.link = res.data.code
- })
- },
- sou() {
- this.list = []
- this.next = false
- this.page = 0
- this.getList()
- },
- copy(item) {
- let val = `${item.bookingUser} 閭�璇锋偍鍔犲叆浼氳
+import { mapState } from 'vuex'
+import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+export default {
+ data() {
+ return {
+ i: 0,
+ show: false,
+ cate: [
+ { name: '鏈紑濮�', id: 1 },
+ { name: '宸茬粨鏉�', id: 2 }
+ ],
+ pageShow: false,
+ id: '',
+ meetingName: '',
+ show1: false,
+ val: '',
+ list: [],
+ next: false,
+ page: 0,
+ time: 0,
+ roomName: '',
+ link: '',
+ qrurl: '',
+ timer: null,
+ timeValue: '',
+ Id: '',
+ share: {
+ title: '',
+ path: '',
+ imageUrl: 'https://dmtest.ahapp.net/file/projects/20230511/13f256b832db4a4fadc5e6770f5727bf.png'
+ }
+ }
+ },
+ computed: {
+ ...mapState(['token'])
+ },
+ components: { tkiQrcode },
+ onReachBottom() {
+ this.getList()
+ },
+ onLoad() {
+ this.getList()
+ this.getSYSTEM()
+ },
+ onShareAppMessage({ from, target }) {
+ if (from == 'button') {
+ return this.share
+ }
+ },
+ methods: {
+ // 鍒嗕韩
+ fenxiang(item) {
+ this.share.title = item.meetingName
+ this.share.path = `/packagesMine/meetingDetails/meetingDetails?shareId=${item.id}`
+ },
+ // 鍒锋柊浜岀淮鐮�
+ Refresh(type) {
+ if (this.time !== 0) return
+ uni.showLoading({
+ title: '鍔犺浇涓�',
+ mask: true
+ })
+ uni.request({
+ url: `${this.$baseUrl}web/meeting/getQrCodeImg?id=${this.Id}&token=${this.token}`, //url鍦板潃
+ method: 'GET',
+ responseType: 'arraybuffer',
+ header: {
+ 'Content-Type': 'application/json'
+ },
+ success: res => {
+ const arrayBuffer = new Uint8Array(res.data)
+ const base64 = "data:image/png;base64," + uni.arrayBufferToBase64(arrayBuffer) //杩欓噷闇�瑕佹坊鍔犲墠缂�
+ this.qrurl = base64
+ if (type === 1) {
+ this.time = Number(this.timeValue) * 60
+ this.getTime()
+ }
+ },
+ complete() {
+ uni.hideLoading()
+ }
+ })
+ },
+ getTime() {
+ this.timer = setInterval(() => {
+ if (this.time === 0) {
+ clearInterval(this.timer)
+ this.timer = null
+ this.time = 0
+ return
+ }
+ this.time = this.time - 1
+ }, 1000)
+ },
+ getSYSTEM() {
+ this.$u.api.getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'QR_OPENBOOK_VALIDTIME'
+ }).then(res => {
+ this.time = Number(res.data.code) * 60
+ this.timeValue = Number(res.data.code)
+ })
+ this.$u.api.getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'H5_LINK_ADDR'
+ }).then(res => {
+ this.link = res.data.code
+ })
+ },
+ sou() {
+ this.list = []
+ this.next = false
+ this.page = 0
+ this.getList()
+ },
+ copy(item) {
+ let val = `${item.bookingUser} 閭�璇锋偍鍔犲叆浼氳
浼氳涓婚锛�${item.meetingName}
浼氳瀹わ細${item.roomName}
浼氳鏃堕棿锛�${item.meetingDate} ${item.meetingTime}
鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛�
${this.link}?id=${item.id}`
- uni.setClipboardData({
- data: val,
- success: function () {
- uni.showToast({
- title: '浼氳淇℃伅澶嶅埗鎴愬姛锛屽幓鍒嗕韩缁欏悓浜嬪惂~',
- icon:'none',
- duration: 2000
- });
- }
- });
- },
- close1() {
- this.show1 = false
- },
- closeRoom(status, id) {
- if (status !== 1) {
- uni.showToast({
- title: '浼氳涓嶅彲鍙栨秷',
- icon: "none",
- duration: 2000
- });
- return
- }
- this.id = id
- this.show1 = true;
- },
- confirm() {
- this.$u.api.reservationCancel({
- id: this.id
- }).then(res => {
- this.show1 = false;
- if (res.code === 200) {
- uni.showToast({
- title: '鍙栨秷鎴愬姛',
- icon: "none",
- duration: 2000
- });
- this.list.forEach((item, index) => {
- if (item.id === this.id) {
- this.list.splice(index, 1)
- }
- })
- }
- })
- },
- jump(id) {
- uni.navigateTo({
- url: `/packagesMine/meetingDetails/meetingDetails?id=${id}`
- });
- },
- close() {
- this.time = 0
- clearInterval(this.timer)
- this.timer = null
- this.show = false
- this.pageShow = false
- uni.setScreenBrightness({
- value: 0.5,
- success: function () {
- console.log('success');
- }
- });
- },
- getQrCodes(id, roomName) {
- this.Id = id
- this.time = 0
- this.Refresh()
- this.time = this.timeValue * 60
- this.getTime()
- this.pageShow = true
- this.roomName = roomName
-
- this.show = true
- uni.setScreenBrightness({
- value: 1,
- success: function () {
- console.log('success');
- }
- });
- },
- clickItem(index) {
- this.i = index
- this.list = []
- this.next = false
- this.page = 0
- this.getList()
- },
- getList() {
- if (!this.next) {
- this.page = this.page + 1
- this.$u.api.myMeetingPage({
- capacity: 10,
- page: this.page,
- model: {
- queryType: 2,
- roomsName: this.meetingName,
- status: this.cate[this.i].id
- }
- }).then(res => {
- if (res.data.records.length > 0) {
- this.list = [...this.list, ...res.data.records]
- }
- if (res.data.records.length < 10) {
- this.next = true
- }
- })
- }
- }
- }
- }
+ uni.setClipboardData({
+ data: val,
+ success: function () {
+ uni.showToast({
+ title: '浼氳淇℃伅澶嶅埗鎴愬姛锛屽幓鍒嗕韩缁欏悓浜嬪惂~',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ },
+ close1() {
+ this.show1 = false
+ },
+ closeRoom(status, id) {
+ if (status !== 1) {
+ uni.showToast({
+ title: '浼氳涓嶅彲鍙栨秷',
+ icon: "none",
+ duration: 2000
+ })
+ return
+ }
+ this.id = id
+ this.show1 = true
+ },
+ confirm() {
+ this.$u.api.reservationCancel({
+ id: this.id
+ }).then(res => {
+ this.show1 = false
+ if (res.code === 200) {
+ uni.showToast({
+ title: '鍙栨秷鎴愬姛',
+ icon: "none",
+ duration: 2000
+ })
+ this.list.forEach((item, index) => {
+ if (item.id === this.id) {
+ this.list.splice(index, 1)
+ }
+ })
+ }
+ })
+ },
+ jump(id) {
+ uni.navigateTo({
+ url: `/packagesMine/meetingDetails/meetingDetails?id=${id}`
+ })
+ },
+ close() {
+ this.time = 0
+ clearInterval(this.timer)
+ this.timer = null
+ this.show = false
+ this.pageShow = false
+ uni.setScreenBrightness({
+ value: 0.5,
+ success: function () {
+ console.log('success')
+ }
+ })
+ },
+ getQrCodes(id, roomName) {
+ this.Id = id
+ this.time = 0
+ this.Refresh()
+ this.time = this.timeValue * 60
+ this.getTime()
+ this.pageShow = true
+ this.roomName = roomName
+
+ this.show = true
+ uni.setScreenBrightness({
+ value: 1,
+ success: function () {
+ console.log('success')
+ }
+ })
+ },
+ clickItem(index) {
+ this.i = index
+ this.list = []
+ this.next = false
+ this.page = 0
+ this.getList()
+ },
+ getList() {
+ if (!this.next) {
+ this.page = this.page + 1
+ this.$u.api.myMeetingPage({
+ capacity: 10,
+ page: this.page,
+ model: {
+ queryType: 2,
+ roomsName: this.meetingName,
+ status: this.cate[this.i].id
+ }
+ }).then(res => {
+ if (res.data.records.length > 0) {
+ this.list = [...this.list, ...res.data.records]
+ }
+ if (res.data.records.length < 10) {
+ this.next = true
+ }
+ })
+ }
+ }
+ }
+}
</script>
<style lang="scss">
- .yuyue {
- width: 100%;
- .details_ma /deep/ {
- .u-popup__content {
- width: 100%;
- .box {
- width: 100%;
- padding: 80rpx 0;
- box-sizing: border-box;
- background-color: #ffffff;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- .box_a {
- padding: 0 30rpx;
- box-sizing: border-box;
- font-size: 36rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #222222;
- }
- .box_b {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #0055FF;
- margin-top: 40rpx;
- }
- .qrcode {
- width: 440rpx;
- height: 440rpx;
- margin-top: 40rpx;
- image {
- width: 100%;
- height: 100%;
- }
- }
- .box_c {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- margin-top: 40rpx;
- }
- .box_d {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- margin-top: 32rpx;
- }
- .box_e {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- }
- }
- }
- .yuyue_head {
- padding: 30rpx;
- background-color: #ffffff;
- box-sizing: border-box;
- position: sticky;
- top: 0;
- z-index: 999;
- .yuyue_head_input /deep/ {
- width: 100%;
- height: 72rpx;
- background: #F7F7F7;
- border-radius: 4rpx;
- .u-border {
- border: none !important;
- }
- }
- .yuyue_head_list {
- width: 100%;
- display: flex;
- align-items: center;
- margin-top: 30rpx;
- .yuyue_head_list_item {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- position: relative;
- text {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- .yuyue_head_list_item_active {
- font-size: 30rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #222222;
- }
- .yuyue_head_list_item_h {
- width: 60rpx;
- height: 4rpx;
- background: #0055FF;
- border-radius: 3rpx;
- position: absolute;
- bottom: -30rpx;
- left: 50%;
- transform: translate(-50%, 0);
- }
- }
- }
- }
- .yuyue_content {
- width: 100%;
- padding: 20rpx 30rpx;
- box-sizing: border-box;
- .yuyue_content_wu {
- width: 100%;
- margin-top: 50rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- image {
- width: 340rpx;
- height: 364rpx;
- }
- }
- .yuyue_content_item {
- width: 100%;
- padding: 30rpx;
- box-sizing: border-box;
- background: #ffffff;
- margin-bottom: 20rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
- .item_a {
- width: 100%;
- height: 50rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .item_a_title {
- flex: 1;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- font-size: 32rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #222222;
- }
- .item_a_one {
- border: 2rpx solid #F62710 !important;
- font-size: 22rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #F62710;
- }
- .item_a_two {
- border: 2rpx solid #0055FF !important;
- font-size: 22rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #0055FF;
- }
- .item_a_three {
- border: 2rpx solid #999999 !important;
- font-size: 22rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- .item_a_1 {
- flex-shrink: 0;
- padding: 0 8rpx;
- height: 38rpx;
- box-sizing: border-box;
- line-height: 38rpx;
- text-align: center;
- border-radius: 4rpx;
- margin-left: 20rpx;
- }
- }
- .item_b {
- width: 100%;
- height: 1rpx;
- background-color: #E5E5E5;
- margin: 28rpx 0 30rpx 0;
- }
- .item_c {
- width: 100%;
- display: flex;
- flex-direction: column;
- .item_c_item {
- display: flex;
- align-items: flex-start;
- margin-bottom: 24rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
- text {
- &:first-child {
- flex-shrink: 0;
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- &:last-child {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- }
- }
- }
- }
- .item_d {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 40rpx;
- .item_d_left {
- display: flex;
- align-items: center;
- .item_d_left_item {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 40rpx;
- position: relative;
- overflow: hidden;
- &:last-child {
- margin-right: 0 !important;
- }
- button {
- position: absolute;
- width: 300rpx;
- height: 300rpx;
- border: none;
- top: -20rpx;
- left: -20rpx;
- background: rgba(0, 0, 0, 0);
- }
- image {
- width: 44rpx;
- height: 44rpx;
- margin-right: 8rpx;
- }
- text {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- }
- }
- .item_d_right {
- width: 136rpx;
- height: 56rpx;
- line-height: 56rpx;
- text-align: center;
- background: #0055FF;
- border-radius: 4rpx;
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #FFFFFF;
- }
- }
- }
- }
- }
+.yuyue {
+ width: 100%;
+ .details_ma /deep/ {
+ .u-popup__content {
+ width: 100%;
+ .box {
+ width: 100%;
+ padding: 80rpx 0;
+ box-sizing: border-box;
+ background-color: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ .box_a {
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ font-size: 36rpx;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ }
+ .box_b {
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #0055ff;
+ margin-top: 40rpx;
+ }
+ .qrcode {
+ width: 440rpx;
+ height: 440rpx;
+ margin-top: 40rpx;
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .box_c {
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ margin-top: 40rpx;
+ }
+ .box_d {
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ margin-top: 32rpx;
+ }
+ .box_e {
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+ }
+ }
+ .yuyue_head {
+ padding: 30rpx;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ position: sticky;
+ top: 0;
+ z-index: 999;
+ .yuyue_head_input /deep/ {
+ width: 100%;
+ height: 72rpx;
+ background: #f7f7f7;
+ border-radius: 4rpx;
+ .u-border {
+ border: none !important;
+ }
+ }
+ .yuyue_head_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-top: 30rpx;
+ .yuyue_head_list_item {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ position: relative;
+ text {
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ .yuyue_head_list_item_active {
+ font-size: 30rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ }
+ .yuyue_head_list_item_h {
+ width: 60rpx;
+ height: 4rpx;
+ background: #0055ff;
+ border-radius: 3rpx;
+ position: absolute;
+ bottom: -30rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ }
+ }
+ }
+ }
+ .yuyue_content {
+ width: 100%;
+ padding: 20rpx 30rpx;
+ box-sizing: border-box;
+ .yuyue_content_wu {
+ width: 100%;
+ margin-top: 50rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ image {
+ width: 340rpx;
+ height: 364rpx;
+ }
+ }
+ .yuyue_content_item {
+ width: 100%;
+ padding: 30rpx;
+ box-sizing: border-box;
+ background: #ffffff;
+ margin-bottom: 20rpx;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .item_a {
+ width: 100%;
+ height: 50rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .item_a_title {
+ flex: 1;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-size: 32rpx;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #222222;
+ }
+ .item_a_one {
+ border: 2rpx solid #f62710 !important;
+ font-size: 22rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #f62710;
+ }
+ .item_a_two {
+ border: 2rpx solid #0055ff !important;
+ font-size: 22rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #0055ff;
+ }
+ .item_a_three {
+ border: 2rpx solid #999999 !important;
+ font-size: 22rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ .item_a_1 {
+ flex-shrink: 0;
+ padding: 0 8rpx;
+ height: 38rpx;
+ box-sizing: border-box;
+ line-height: 38rpx;
+ text-align: center;
+ border-radius: 4rpx;
+ margin-left: 20rpx;
+ }
+ }
+ .item_b {
+ width: 100%;
+ height: 1rpx;
+ background-color: #e5e5e5;
+ margin: 28rpx 0 30rpx 0;
+ }
+ .item_c {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .item_c_item {
+ display: flex;
+ align-items: flex-start;
+ margin-bottom: 24rpx;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ text {
+ &:first-child {
+ flex-shrink: 0;
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ &:last-child {
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ }
+ }
+ }
+ }
+ .item_d {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-top: 40rpx;
+ .item_d_left {
+ display: flex;
+ align-items: center;
+ .item_d_left_item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 40rpx;
+ position: relative;
+ overflow: hidden;
+ &:last-child {
+ margin-right: 0 !important;
+ }
+ button {
+ position: absolute;
+ width: 300rpx;
+ height: 300rpx;
+ border: none;
+ top: -20rpx;
+ left: -20rpx;
+ background: rgba(0, 0, 0, 0);
+ }
+ image {
+ width: 44rpx;
+ height: 44rpx;
+ margin-right: 8rpx;
+ }
+ text {
+ font-size: 26rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+ }
+ .item_d_right {
+ width: 136rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ text-align: center;
+ background: #0055ff;
+ border-radius: 4rpx;
+ font-size: 24rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #ffffff;
+ }
+ }
+ }
+ }
+}
</style>
diff --git a/h5/pages/meeting/personal/personal.vue b/h5/pages/meeting/personal/personal.vue
index 8be8573..00d563d 100644
--- a/h5/pages/meeting/personal/personal.vue
+++ b/h5/pages/meeting/personal/personal.vue
@@ -1,484 +1,537 @@
<template>
- <view class="personal">
- <view class="personal_image">
- <view class="personal_image_box">
- <image :src="userInfo.avatar ? `${userInfo.prefixUrl}${userInfo.avatar}` : defaultAvatar" mode="widthFix"></image>
- </view>
- <button class="personal_image_box_btn" open-type="chooseAvatar" @chooseavatar="bindchooseavatar">鏇存崲澶村儚</button>
- </view>
- <view class="personal_list">
- <view class="personal_list_item" @click="show1 = true">
- <view class="label">鏄电О</view>
- <view class="right">
- <text :class="userInfo.wechatName ? 'right_info black' : 'right_info'">{{userInfo.wechatName ? userInfo.wechatName : '鐐瑰嚮鑾峰彇寰俊鏄电О'}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
- </view>
- </view>
- <view class="personal_list_item">
- <view class="label">鎵嬫満鍙�</view>
- <view class="right">
- <text :class="userInfo.mobile ? 'right_info black' : 'right_info'">{{userInfo.mobile ? userInfo.mobile : '鐐瑰嚮鑾峰彇寰俊鎵嬫満鍙�'}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
- </view>
- </view>
- <view class="personal_list_item" @click="show = true">
- <view class="label">鐪熷疄濮撳悕</view>
- <view class="right">
- <text :class="userInfo.realname ? 'right_info black' : 'right_info'">{{userInfo.realname ? userInfo.realname : '璇疯緭鍏ョ湡瀹炲鍚�'}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
- </view>
- </view>
- <view class="personal_list_item" @click="sex = true">
- <view class="label">鎬у埆</view>
- <view class="right">
- <text class="right_info black" v-if="userInfo.sex === 1">鐢�</text>
- <text class="right_info black" v-else-if="userInfo.sex === 2">濂�</text>
- <text class="right_info" v-else>璇烽�夋嫨</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
- </view>
- </view>
- <view class="personal_list_item" @click="isShow = true">
- <view class="label">鐢熸棩</view>
- <view class="right">
- <text :class="userInfo.birthday ? 'right_info black' : 'right_info'">{{userInfo.birthday ? userInfo.birthday : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
- </view>
- </view>
- </view>
- <u-modal :show="show" title="鐪熷疄濮撳悕" :showCancelButton="true" @confirm="confirm1" @cancel="cancel">
- <view class="personal_input">
- <input type="text" v-model="from.realname" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" placeholder-class="placeholder">
- </view>
- </u-modal>
- <u-modal :show="show1" title="鏄电О" :showCancelButton="true" @confirm="confirm2" @cancel="cancel1">
- <view class="personal_input">
- <input type="nickname" @change="changeName" v-model="from.wechatName" placeholder="璇疯緭鍏ユ樀绉�" placeholder-class="placeholder">
- </view>
- </u-modal>
- <u-picker
- :show="sex"
- :columns="columns"
- @cancel="sex = false"
- :immediateChange="true"
- @confirm="confirm"
- ></u-picker>
- <u-datetime-picker
- ref="datetimePicker"
- :show="isShow"
- v-model="value1"
- :minDate="minDate"
- :maxDate="maxDate"
- mode="date"
- @confirm="confirmDate"
- @cancel="isShow = false"
- ></u-datetime-picker>
- </view>
+ <view class="personal">
+ <view class="personal_image">
+ <view class="personal_image_box">
+ <image
+ :src="
+ userInfo.avatar
+ ? `${userInfo.prefixUrl}${userInfo.avatar}`
+ : defaultAvatar
+ "
+ mode="widthFix"
+ ></image>
+ </view>
+ <button
+ class="personal_image_box_btn"
+ open-type="chooseAvatar"
+ @chooseavatar="bindchooseavatar"
+ >
+ 鏇存崲澶村儚
+ </button>
+ </view>
+ <view class="personal_list">
+ <view class="personal_list_item" @click="show1 = true">
+ <view class="label">鏄电О</view>
+ <view class="right">
+ <text
+ :class="userInfo.wechatName ? 'right_info black' : 'right_info'"
+ >{{
+ userInfo.wechatName ? userInfo.wechatName : "鐐瑰嚮鑾峰彇寰俊鏄电О"
+ }}</text
+ >
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+ <view class="personal_list_item">
+ <view class="label">鎵嬫満鍙�</view>
+ <view class="right">
+ <text :class="userInfo.mobile ? 'right_info black' : 'right_info'">{{
+ userInfo.mobile ? userInfo.mobile : "鐐瑰嚮鑾峰彇寰俊鎵嬫満鍙�"
+ }}</text>
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+ <view class="personal_list_item" @click="show = true">
+ <view class="label">鐪熷疄濮撳悕</view>
+ <view class="right">
+ <text
+ :class="userInfo.realname ? 'right_info black' : 'right_info'"
+ >{{
+ userInfo.realname ? userInfo.realname : "璇疯緭鍏ョ湡瀹炲鍚�"
+ }}</text
+ >
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+ <view class="personal_list_item" @click="sex = true">
+ <view class="label">鎬у埆</view>
+ <view class="right">
+ <text class="right_info black" v-if="userInfo.sex === 1">鐢�</text>
+ <text class="right_info black" v-else-if="userInfo.sex === 2"
+ >濂�</text
+ >
+ <text class="right_info" v-else>璇烽�夋嫨</text>
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+ <view class="personal_list_item" @click="isShow = true">
+ <view class="label">鐢熸棩</view>
+ <view class="right">
+ <text
+ :class="userInfo.birthday ? 'right_info black' : 'right_info'"
+ >{{ userInfo.birthday ? userInfo.birthday : "璇烽�夋嫨" }}</text
+ >
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+ </view>
+ <u-modal
+ :show="show"
+ title="鐪熷疄濮撳悕"
+ :showCancelButton="true"
+ @confirm="confirm1"
+ @cancel="cancel"
+ >
+ <view class="personal_input">
+ <input
+ type="text"
+ v-model="from.realname"
+ placeholder="璇疯緭鍏ョ湡瀹炲鍚�"
+ placeholder-class="placeholder"
+ />
+ </view>
+ </u-modal>
+ <u-modal
+ :show="show1"
+ title="鏄电О"
+ :showCancelButton="true"
+ @confirm="confirm2"
+ @cancel="cancel1"
+ >
+ <view class="personal_input">
+ <input
+ type="nickname"
+ @change="changeName"
+ v-model="from.wechatName"
+ placeholder="璇疯緭鍏ユ樀绉�"
+ placeholder-class="placeholder"
+ />
+ </view>
+ </u-modal>
+ <u-picker
+ :show="sex"
+ :columns="columns"
+ @cancel="sex = false"
+ :immediateChange="true"
+ @confirm="confirm"
+ ></u-picker>
+ <u-datetime-picker
+ ref="datetimePicker"
+ :show="isShow"
+ v-model="value1"
+ :minDate="minDate"
+ :maxDate="maxDate"
+ mode="date"
+ @confirm="confirmDate"
+ @cancel="isShow = false"
+ ></u-datetime-picker>
+ </view>
</template>
<script>
- import { mapState, mapMutations } from 'vuex'
-
- export default {
- data() {
- return {
- sex: false,
- isShow: false,
- show: false,
- show1: false,
- minDate: Number(new Date('1980-01-01')),
- maxDate: Number(new Date()),
- defaultAvatar: require('@/static/meeting/common/default_user@2x.png'),
- columns: [
- ['鐢�', '濂�']
- ],
- value1: Number(new Date()),
- action: this.$baseUrl + 'public/uploadLocal',
- from: {
- realname: '',
- wechatName: ''
- }
- }
- },
- computed: {
- ...mapState(['userInfo'])
- },
- methods: {
- ...mapMutations(["setUserInfo"]),
- changeName(e) {
- this.from.wechatName = e.detail.value
- },
- bindchooseavatar(e) {
- var that = this
- uni.uploadFile({
- url: that.action,
- files: 'filePath',
- filePath: e.detail.avatarUrl,
- name: 'file',
- formData: {
- 'folder': 'projects'
- },
- success: (uploadFileRes) => {
- console.log(JSON.parse(uploadFileRes.data))
- let avatar = JSON.parse(uploadFileRes.data).data.imgaddr
- that.$u.api.editUserInfo({ avatar })
- .then(res => {
- that.getUser()
- })
- },
- fail: (err) => {
- uni.showToast({
- title: '涓婁紶澶辫触',
- icon: "error",
- duration: 2000
- });
- }
- });
- },
- confirm(e) {
- let sex = null
- if (e.value[0] === '鐢�') {
- sex = 1
- } else if (e.value[0] === '濂�') {
- sex = 2
- }
- this.$u.api.editUserInfo({ sex })
- .then(res => {
- this.getUser()
- this.sex = false
- })
- },
- confirmDate(e) {
- let birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd');
- this.$u.api.editUserInfo({ birthday })
- .then(res => {
- this.getUser()
- this.isShow = false
- })
- },
- // 纭鐪熷疄濮撳悕
- confirm1() {
- this.$u.api.editUserInfo({ realname: this.from.realname })
- .then(res => {
- this.getUser()
- this.from.realname = ''
- this.show = false
- })
- },
- // 鏄电О
- confirm2() {
- this.$u.api.editUserInfo({ wechatName: this.from.wechatName })
- .then(res => {
- this.getUser()
- this.from.wechatName = ''
- this.show1 = false
- })
- },
- cancel1() {
- this.show1 = false
- },
- // 鍏抽棴鐪熷疄濮撳悕
- cancel() {
- this.show = false
- },
- getUser() {
- this.$u.api.getUserInfo({})
- .then(res => {
- this.setUserInfo(res.data)
- })
- }
- }
- }
+import { mapState, mapMutations } from 'vuex'
+
+export default {
+ data() {
+ return {
+ sex: false,
+ isShow: false,
+ show: false,
+ show1: false,
+ minDate: Number(new Date('1980-01-01')),
+ maxDate: Number(new Date()),
+ defaultAvatar: require('@/static/meeting/common/default_user@2x.png'),
+ columns: [
+ ['鐢�', '濂�']
+ ],
+ value1: Number(new Date()),
+ action: this.$baseUrl + 'public/uploadLocal',
+ from: {
+ realname: '',
+ wechatName: ''
+ }
+ }
+ },
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ methods: {
+ ...mapMutations(["setUserInfo"]),
+ changeName(e) {
+ this.from.wechatName = e.detail.value
+ },
+ bindchooseavatar(e) {
+ var that = this
+ uni.uploadFile({
+ url: that.action,
+ files: 'filePath',
+ filePath: e.detail.avatarUrl,
+ name: 'file',
+ formData: {
+ 'folder': 'projects'
+ },
+ success: (uploadFileRes) => {
+ console.log(JSON.parse(uploadFileRes.data))
+ let avatar = JSON.parse(uploadFileRes.data).data.imgaddr
+ that.$u.api.editUserInfo({ avatar })
+ .then(res => {
+ that.getUser()
+ })
+ },
+ fail: (err) => {
+ uni.showToast({
+ title: '涓婁紶澶辫触',
+ icon: "error",
+ duration: 2000
+ })
+ }
+ })
+ },
+ confirm(e) {
+ let sex = null
+ if (e.value[0] === '鐢�') {
+ sex = 1
+ } else if (e.value[0] === '濂�') {
+ sex = 2
+ }
+ this.$u.api.editUserInfo({ sex })
+ .then(res => {
+ this.getUser()
+ this.sex = false
+ })
+ },
+ confirmDate(e) {
+ let birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
+ this.$u.api.editUserInfo({ birthday })
+ .then(res => {
+ this.getUser()
+ this.isShow = false
+ })
+ },
+ // 纭鐪熷疄濮撳悕
+ confirm1() {
+ this.$u.api.editUserInfo({ realname: this.from.realname })
+ .then(res => {
+ this.getUser()
+ this.from.realname = ''
+ this.show = false
+ })
+ },
+ // 鏄电О
+ confirm2() {
+ this.$u.api.editUserInfo({ wechatName: this.from.wechatName })
+ .then(res => {
+ this.getUser()
+ this.from.wechatName = ''
+ this.show1 = false
+ })
+ },
+ cancel1() {
+ this.show1 = false
+ },
+ // 鍏抽棴鐪熷疄濮撳悕
+ cancel() {
+ this.show = false
+ },
+ getUser() {
+ this.$u.api.getUserInfo({})
+ .then(res => {
+ this.setUserInfo(res.data)
+ })
+ }
+ }
+}
</script>
<style>
- page {
- background-color: #fff !important;
- }
+page {
+ background-color: #fff !important;
+}
</style>
<style lang="scss" scoped>
- .personal {
- width: 100%;
- background-color: #ffffff;
- .personal_input {
- width: 100%;
- height: 98rpx;
- background: #F8F9FB;
- border-radius: 8rpx;
- .placeholder {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- input {
- width: 100%;
- height: 100%;
- text-align: center;
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #000000;
- }
- }
- .personal_image {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- padding-top: 64rpx;
- margin-bottom: 60rpx;
- .personal_image_box {
- width: 160rpx;
- height: 160rpx;
- border-radius: 50%;
- overflow: hidden;
- image {
- width: 100%;
- height: 100%;
- }
- }
- .personal_image_box_btn {
- width: 136rpx;
- height: 48rpx;
- line-height: 48rpx;
- padding: 0 !important;
- border-radius: 32rpx;
- border: 1rpx solid #005BFF;
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #005BFF;
- margin-top: 24rpx;
- }
- }
- .personal_list {
- display: flex;
- flex-direction: column;
- padding: 0 34rpx;
- box-sizing: border-box;
- .personal_list_item {
- width: 100%;
- height: 96rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 2rpx solid #E5E5E5;
- &:last-child {
- border: none !important;
- }
- .label {
- flex-shrink: 0;
- font-size: 32rpx;
- font-family: PingFang SC-Medium, PingFang SC;
- font-weight: 500;
- color: #333333;
- margin-right: 30rpx;
- }
- .right {
- display: flex;
- align-items: center;
- .black {
- color: #000000 !important;
- }
- .right_info {
- font-size: 28rpx;
- font-family: PingFang SC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- text {
- font-size: 28rpx;
- font-family: PingFang SC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- margin-right: 12rpx;
- }
- }
- }
- }
- .popup2 /deep/ {
- width: 518rpx;
- background: #FFFFFF;
- border-radius: 24rpx;
- .popup_text {
- width: 100%;
- text-align: center;
- margin: 46rpx 0;
- font-size: 32rpx;
- font-family: PingFang SC-Semibold, PingFang SC;
- font-weight: 600;
- color: #333333;
- }
- .popup2_ipt {
- width: 100%;
- height: 98rpx;
- overflow: hidden;
- border-radius: 8rpx;
- padding: 0 48rpx;
- box-sizing: border-box;
- margin-bottom: 48rpx;
- .popup2_ipt_box {
- width: 100%;
- height: 100%;
- background: #F8F9FB;
- .popup2_ipt_p {
- text-align: center;
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- input {
- width: 100%;
- height: 100%;
- text-align: center;
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #000000;
- }
- }
- }
- .popup_box {
- width: 100%;
- height: 85rpx;
- display: flex;
- align-items: center;
- border-top: 2rpx solid #C8C8C8;
- .blue {
- color: #005BFF !important;
- }
- .popup_box_item {
- flex: 1;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 32rpx;
- font-family: PingFang SC-Semibold, PingFang SC;
- font-weight: 600;
- color: #333333;
- &:first-child {
- border-right: 2rpx solid #C8C8C8;
- }
- }
- }
- }
- .sex {
- padding: 44rpx 32rpx;
- background-color: #FFFFFF;
- box-sizing: border-box;
- .title {
- width: 100%;
- text-align: center;
- position: relative;
- text {
- font-size: 32rpx;
- font-family: PingFang SC-Semibold, PingFang SC;
- font-weight: 600;
- color: #333333;
- }
- .title_icon {
- position: absolute;
- right: 0;
- top: 0;
- }
- }
- .content {
- width: 100%;
- margin-top: 80rpx;
- .picker-view {
- width: 100%;
- height: 200rpx;
- .item {
- height: 40px;
- line-height: 40px;
- text-align: center;
- }
- }
- }
- .submit {
- width: 100%;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #005BFF;
- border-radius: 36rpx;
- font-size: 32rpx;
- font-family: PingFang SC-Medium, PingFang SC;
- font-weight: 500;
- color: #FFFFFF;
- margin-top: 50rpx;
- }
- }
- .date {
- padding: 44rpx 32rpx;
- background-color: #FFFFFF;
- box-sizing: border-box;
- .title {
- width: 100%;
- text-align: center;
- position: relative;
- text {
- font-size: 32rpx;
- font-family: PingFang SC-Semibold, PingFang SC;
- font-weight: 600;
- color: #333333;
- }
- .title_icon {
- position: absolute;
- right: 0;
- top: 0;
- }
- }
- .content {
- width: 100%;
- margin-top: 80rpx;
- .picker-view {
- width: 100%;
- height: 600rpx;
- .item {
- height: 40px;
- line-height: 40px;
- text-align: center;
- }
- }
- }
- .submit {
- width: 100%;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #005BFF;
- border-radius: 36rpx;
- font-size: 32rpx;
- font-family: PingFang SC-Medium, PingFang SC;
- font-weight: 500;
- color: #FFFFFF;
- margin-top: 50rpx;
- }
- }
- .personal_footer {
- position: fixed;
- width: 100%;
- left: 0;
- bottom: 0;
- background-color: #FFFFFF;
- box-sizing: border-box;
- padding: 20rpx 30rpx calc(20rpx + env(safe-area-inset-bottom)) 30rpx;
- .personal_footer_btn {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- background: #005BFF;
- border-radius: 44rpx;
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- }
+.personal {
+ width: 100%;
+ background-color: #ffffff;
+ .personal_input {
+ width: 100%;
+ height: 98rpx;
+ background: #f8f9fb;
+ border-radius: 8rpx;
+ .placeholder {
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ input {
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+ }
+ .personal_image {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ padding-top: 64rpx;
+ margin-bottom: 60rpx;
+ .personal_image_box {
+ width: 160rpx;
+ height: 160rpx;
+ border-radius: 50%;
+ overflow: hidden;
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .personal_image_box_btn {
+ width: 136rpx;
+ height: 48rpx;
+ line-height: 48rpx;
+ padding: 0 !important;
+ border-radius: 32rpx;
+ border: 1rpx solid #005bff;
+ font-size: 24rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #005bff;
+ margin-top: 24rpx;
+ }
+ }
+ .personal_list {
+ display: flex;
+ flex-direction: column;
+ padding: 0 34rpx;
+ box-sizing: border-box;
+ .personal_list_item {
+ width: 100%;
+ height: 96rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 2rpx solid #e5e5e5;
+ &:last-child {
+ border: none !important;
+ }
+ .label {
+ flex-shrink: 0;
+ font-size: 32rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #333333;
+ margin-right: 30rpx;
+ }
+ .right {
+ display: flex;
+ align-items: center;
+ .black {
+ color: #000000 !important;
+ }
+ .right_info {
+ font-size: 28rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ text {
+ font-size: 28rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #666666;
+ margin-right: 12rpx;
+ }
+ }
+ }
+ }
+ .popup2 /deep/ {
+ width: 518rpx;
+ background: #ffffff;
+ border-radius: 24rpx;
+ .popup_text {
+ width: 100%;
+ text-align: center;
+ margin: 46rpx 0;
+ font-size: 32rpx;
+ font-family: PingFang SC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333333;
+ }
+ .popup2_ipt {
+ width: 100%;
+ height: 98rpx;
+ overflow: hidden;
+ border-radius: 8rpx;
+ padding: 0 48rpx;
+ box-sizing: border-box;
+ margin-bottom: 48rpx;
+ .popup2_ipt_box {
+ width: 100%;
+ height: 100%;
+ background: #f8f9fb;
+ .popup2_ipt_p {
+ text-align: center;
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #999999;
+ }
+ input {
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ font-size: 28rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+ }
+ }
+ }
+ .popup_box {
+ width: 100%;
+ height: 85rpx;
+ display: flex;
+ align-items: center;
+ border-top: 2rpx solid #c8c8c8;
+ .blue {
+ color: #005bff !important;
+ }
+ .popup_box_item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ font-family: PingFang SC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333333;
+ &:first-child {
+ border-right: 2rpx solid #c8c8c8;
+ }
+ }
+ }
+ }
+ .sex {
+ padding: 44rpx 32rpx;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ .title {
+ width: 100%;
+ text-align: center;
+ position: relative;
+ text {
+ font-size: 32rpx;
+ font-family: PingFang SC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333333;
+ }
+ .title_icon {
+ position: absolute;
+ right: 0;
+ top: 0;
+ }
+ }
+ .content {
+ width: 100%;
+ margin-top: 80rpx;
+ .picker-view {
+ width: 100%;
+ height: 200rpx;
+ .item {
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ }
+ }
+ }
+ .submit {
+ width: 100%;
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ background: #005bff;
+ border-radius: 36rpx;
+ font-size: 32rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #ffffff;
+ margin-top: 50rpx;
+ }
+ }
+ .date {
+ padding: 44rpx 32rpx;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ .title {
+ width: 100%;
+ text-align: center;
+ position: relative;
+ text {
+ font-size: 32rpx;
+ font-family: PingFang SC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #333333;
+ }
+ .title_icon {
+ position: absolute;
+ right: 0;
+ top: 0;
+ }
+ }
+ .content {
+ width: 100%;
+ margin-top: 80rpx;
+ .picker-view {
+ width: 100%;
+ height: 600rpx;
+ .item {
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ }
+ }
+ }
+ .submit {
+ width: 100%;
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ background: #005bff;
+ border-radius: 36rpx;
+ font-size: 32rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #ffffff;
+ margin-top: 50rpx;
+ }
+ }
+ .personal_footer {
+ position: fixed;
+ width: 100%;
+ left: 0;
+ bottom: 0;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ padding: 20rpx 30rpx calc(20rpx + env(safe-area-inset-bottom)) 30rpx;
+ .personal_footer_btn {
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ background: #005bff;
+ border-radius: 44rpx;
+ font-size: 32rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #ffffff;
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index f12ec94..4e60ae9 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -9,10 +9,7 @@
</div>
<div class="empty"></div>
</scroll-view>
- <div class="button" @click="handleAgree" v-if="num === 6">纭浜嗚В</div>
- <div class="button" @click="toapply" v-else>
- 宸茬煡鏅擄紝涓嬩竴姝�({{ num }}绉�)
- </div>
+ <div class="button" @click="toapply">宸茬煡鏅擄紝涓嬩竴姝�({{ num }}绉�)</div>
</div>
</template>
@@ -25,7 +22,7 @@
return {
content: ``,
answer: '',
- num: 6
+ num: 5
}
},
onLoad() {
@@ -33,18 +30,14 @@
if (!this.$store.state.openId) {
this.initToken()
}
-
+ timer = setInterval(() => {
+ this.num--
+ if (this.num === 0) {
+ this.toapply()
+ }
+ }, 1000)
},
methods: {
- handleAgree() {
- this.num--
- timer = setInterval(() => {
- this.num--
- if (this.num === 0) {
- this.toapply()
- }
- }, 1000)
- },
initToken() {
const appID = 'wxac2a80c2144c4ee0'
// const AppSecret = '922c93596d134fedf5bd22a9354b3bfe'
@@ -106,7 +99,7 @@
height: calc(100% - 170rpx);
.title {
color: #333333;
- font-weight: 500;
+ font-weight: 600;
margin-bottom: 16rpx;
}
.text {
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index c1748bf..341f9b3 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -1,275 +1,289 @@
<template>
- <view class="main_app">
- <view class="title_wrap">
- <view class="name" v-if="userInfo.realname">{{ userInfo.realname || '' }}锛屾杩庣櫥褰曪綖</view>
- <view class="name" v-else>璇峰厛鐧诲綍</view>
- <view class="btn" @click="loginOut">{{ userInfo.realname ? '閫�鍑虹櫥褰�' : '鍘荤櫥褰�' }}</view>
- </view>
- <view class="banner_wrap">
- <view class="h1">瀹夋嘲鐗╂祦</view>
- <view class="h2">瀹夊叏閲嶄簬娉板北 鏈嶅姟杩芥眰鍗撹秺</view>
- <image class="banner" src="../../static/banner.jpg" mode="widthFix"></image>
- </view>
- <view class="title_wrap"><view class="name">涓氬姟鍔炵悊</view></view>
- <view class="container1">
- <view class="left">
- <view class="img_wrap img1" @click="jump('/pages/staff/visitorReport')">
- <image src="@/static/staff/ic_fangkebaobei.png" class="img"></image>
- <view class="h1">璁垮鎶ュ</view>
- <view class="h2">VISITOR REPORTING</view>
- </view>
- <view class="img_wrap img2" @click="jump('/pages/staff/meetingSub')">
- <image src="@/static/staff/ic_yuyuehuiyishi.png" class="img"></image>
- <view class="h1">棰勭害浼氳瀹�</view>
- <view class="h2">BOOK A MEETING ROOM</view>
- </view>
- </view>
- <view class="right">
- <view class="img_wrap img2" @click="jump('/pages/staff/snapshot')">
- <image src="@/static/staff/ic_yinhuansuipai.png" class="img"></image>
- <view class="h1">闅愭偅闅忔墜鎷�</view>
- <view class="h2">HIDDEN DANGER</view>
- </view>
- <view class="img_wrap img2" @click="jump('/pages/staff/vehicle/index')">
- <image src="@/static/staff/ic_yongcheshenqing.png" class="img"></image>
- <view class="h1">鐢ㄨ溅鐢宠</view>
- <view class="h2">VEHICLE APPLICATION</view>
- </view>
- <view class="img_wrap img2" @click="jump('/pages/changePassword/changePassword')">
- <image src="@/static/staff/ic_xiugaimima.png" class="img"></image>
- <view class="h1">淇敼瀵嗙爜</view>
- <view class="h2">CHANGE PASSWORD</view>
- </view>
- </view>
- </view>
- <!-- -->
- <view class="title_wrap"><view class="name">涓氬姟鏌ヨ</view></view>
- <view class="container2">
- <view class="img_wrap" @click="jump('/pages/staff/task/index')">
- <image class="img" src="@/static/staff/ic_renwuzhongxin.png"></image>
- <view class="h1">浠诲姟涓績</view>
- <view class="h2">TASK CENTER</view>
- <view class="task_num">{{ taskNum }}</view>
- </view>
- <view class="img_wrap" @click="jump('/pages/staff/meetingCalendar')">
- <image class="img" src="@/static/staff/ic_wodehuiyi.png"></image>
- <view class="h1">鎴戠殑浼氳鏃ュ巻</view>
- <view class="h2">MY MEETING CALENDAR</view>
- </view>
- <view class="img_wrap" @click="jump('/pages/staff/vehicle/sendACar')">
- <image class="img" src="@/static/staff/ic_paichejilu.png"></image>
- <view class="h1">娲捐溅璁板綍</view>
- <view class="h2">VEHICLE DISPATCH</view>
- </view>
- <view class="img_wrap" @click="jump('/pages/staff/meetingManager')">
- <image class="img" src="@/static/staff/ic_huiyishiguanli.png"></image>
- <view class="h1">浼氳瀹ょ鐞�</view>
- <view class="h2">MANAGE MEETING ROOMS</view>
- </view>
- </view>
- <view class="copyright">
- <image src="@/static/logo_s@2x.png" mode="widthFix" />
- <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
- </view>
- </view>
+ <view class="main_app">
+ <view class="title_wrap">
+ <view class="name" v-if="userInfo.realname"
+ >{{ userInfo.realname || "" }}锛屾杩庣櫥褰曪綖</view
+ >
+ <view class="name" v-else>璇峰厛鐧诲綍</view>
+ <view class="btn" @click="loginOut">{{
+ userInfo.realname ? "閫�鍑虹櫥褰�" : "鍘荤櫥褰�"
+ }}</view>
+ </view>
+ <view class="banner_wrap">
+ <view class="h1">瀹夋嘲鐗╂祦</view>
+ <view class="h2">瀹夊叏閲嶄簬娉板北 鏈嶅姟杩芥眰鍗撹秺</view>
+ <image
+ class="banner"
+ src="../../static/banner.jpg"
+ mode="widthFix"
+ ></image>
+ </view>
+ <view class="title_wrap"><view class="name">涓氬姟鍔炵悊</view></view>
+ <view class="container1">
+ <view class="left">
+ <view class="img_wrap img1" @click="jump('/pages/staff/visitorReport')">
+ <image src="@/static/staff/ic_fangkebaobei.png" class="img"></image>
+ <view class="h1">璁垮鎶ュ</view>
+ <view class="h2">VISITOR REPORTING</view>
+ </view>
+ <view class="img_wrap img2" @click="jump('/pages/staff/meetingSub')">
+ <image src="@/static/staff/ic_yuyuehuiyishi.png" class="img"></image>
+ <view class="h1">棰勭害浼氳瀹�</view>
+ <view class="h2">BOOK A MEETING ROOM</view>
+ </view>
+ </view>
+ <view class="right">
+ <view class="img_wrap img2" @click="jump('/pages/staff/snapshot')">
+ <image src="@/static/staff/ic_yinhuansuipai.png" class="img"></image>
+ <view class="h1">闅愭偅闅忔墜鎷�</view>
+ <view class="h2">HIDDEN DANGER</view>
+ </view>
+ <view class="img_wrap img2" @click="jump('/pages/staff/vehicle/index')">
+ <image
+ src="@/static/staff/ic_yongcheshenqing.png"
+ class="img"
+ ></image>
+ <view class="h1">鐢ㄨ溅鐢宠</view>
+ <view class="h2">VEHICLE APPLICATION</view>
+ </view>
+ <view
+ class="img_wrap img2"
+ @click="jump('/pages/changePassword/changePassword')"
+ >
+ <image src="@/static/staff/ic_xiugaimima.png" class="img"></image>
+ <view class="h1">淇敼瀵嗙爜</view>
+ <view class="h2">CHANGE PASSWORD</view>
+ </view>
+ </view>
+ </view>
+ <!-- -->
+ <view class="title_wrap"><view class="name">涓氬姟鏌ヨ</view></view>
+ <view class="container2">
+ <view class="img_wrap" @click="jump('/pages/staff/task/index')">
+ <image class="img" src="@/static/staff/ic_renwuzhongxin.png"></image>
+ <view class="h1">浠诲姟涓績</view>
+ <view class="h2">TASK CENTER</view>
+ <view class="task_num">{{ taskNum }}</view>
+ </view>
+ <view class="img_wrap" @click="jump('/pages/staff/meetingCalendar')">
+ <image class="img" src="@/static/staff/ic_wodehuiyi.png"></image>
+ <view class="h1">鎴戠殑浼氳鏃ュ巻</view>
+ <view class="h2">MY MEETING CALENDAR</view>
+ </view>
+ <view class="img_wrap" @click="jump('/pages/staff/vehicle/sendACar')">
+ <image class="img" src="@/static/staff/ic_paichejilu.png"></image>
+ <view class="h1">娲捐溅璁板綍</view>
+ <view class="h2">VEHICLE DISPATCH</view>
+ </view>
+ <view class="img_wrap" @click="jump('/pages/staff/meetingManager')">
+ <image class="img" src="@/static/staff/ic_huiyishiguanli.png"></image>
+ <view class="h1">浼氳瀹ょ鐞�</view>
+ <view class="h2">MANAGE MEETING ROOMS</view>
+ </view>
+ </view>
+ <view class="copyright">
+ <image src="@/static/logo_s@2x.png" mode="widthFix" />
+ <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
+ </view>
+ </view>
</template>
<script>
import { logoutPost, stagingHead } from '@/api'
export default {
- data() {
- return {
- userInfo: uni.getStorageSync('userInfo'),
- taskNum: 0
- };
- },
- onLoad(){
- console.log('userInfo', this.userInfo);
-
- },
- onShow() {
- if(this.userInfo && this.userInfo.name){
- this.getTaskInfo()
- }
- },
- methods: {
- jump(path){
- uni.navigateTo({
- url: path
- });
- },
- loginOut() {
- this.$store.commit('empty')
- logoutPost()
- uni.redirectTo({
- url: '/pages/staffLogin/login'
- })
- },
- getTaskInfo() {
+ data() {
+ return {
+ userInfo: uni.getStorageSync('userInfo'),
+ taskNum: 0
+ }
+ },
+ onLoad() {
+ console.log('userInfo', this.userInfo)
+
+ },
+ onShow() {
+ // if (this.userInfo && this.userInfo.name) {
+ this.getTaskInfo()
+ // }
+ },
+ methods: {
+ jump(path) {
+ uni.navigateTo({
+ url: path
+ })
+ },
+ loginOut() {
+ this.$store.commit('empty')
+ logoutPost()
+ uni.redirectTo({
+ url: '/pages/staffLogin/login'
+ })
+ },
+ getTaskInfo() {
stagingHead({
isDetail: '0'
}).then(res => {
this.taskNum = res.data.taskNum
})
},
- }
+ }
};
</script>
<style lang="scss" scoped>
.title_wrap {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-bottom: 24rpx;
- .name {
- font-weight: 500;
- font-size: 34rpx;
- color: #222222;
- }
- .btn {
- width: 144rpx;
- height: 56rpx;
- border-radius: 36rpx;
- border: 1rpx solid $uni-color-primary;
- font-size: 26rpx;
- color: $uni-color-primary;
- display: flex;
- justify-content: center;
- align-items: center;
- }
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 24rpx;
+ .name {
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ }
+ .btn {
+ width: 144rpx;
+ height: 56rpx;
+ border-radius: 36rpx;
+ border: 1rpx solid $uni-color-primary;
+ font-size: 26rpx;
+ color: $uni-color-primary;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
}
.main_app {
- padding-top: 12rpx;
+ padding-top: 12rpx;
}
.banner_wrap {
- padding: 54rpx 44rpx;
- color: #fff;
- position: relative;
- width: 688rpx;
- height: 270rpx;
- margin-bottom: 40rpx;
- .h1 {
- font-weight: bold;
- line-height: 66rpx;
- font-size: 44rpx;
- margin-bottom: 14rpx;
- }
- .banner {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
+ padding: 54rpx 44rpx;
+ color: #fff;
+ position: relative;
+ width: 688rpx;
+ height: 270rpx;
+ margin-bottom: 40rpx;
+ .h1 {
+ font-weight: bold;
+ line-height: 66rpx;
+ font-size: 44rpx;
+ margin-bottom: 14rpx;
+ }
+ .banner {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
}
.container1 {
- display: flex;
- flex-wrap: wrap;
- view {
- width: 336rpx;
- }
- .left {
- margin-right: 18rpx;
- }
- .img_wrap {
- position: relative;
- padding: 24rpx 0rpx 0 28rpx;
- border-radius: 8rpx;
- overflow: hidden;
- .h1 {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 48rpx;
- margin-bottom: 4rpx;
- }
- .h2 {
- font-size: 22rpx;
- color: #7b9da1;
- line-height: 34rpx;
- }
- .img {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- }
- .img1 {
- width: 336rpx;
- height: 296rpx;
- margin-bottom: 16rpx;
- }
- .img2 {
- width: 336rpx;
- height: 140rpx;
- margin-bottom: 16rpx;
- }
+ display: flex;
+ flex-wrap: wrap;
+ view {
+ width: 336rpx;
+ }
+ .left {
+ margin-right: 18rpx;
+ }
+ .img_wrap {
+ position: relative;
+ padding: 24rpx 0rpx 0 28rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ .h1 {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 48rpx;
+ margin-bottom: 4rpx;
+ }
+ .h2 {
+ font-size: 22rpx;
+ color: #7b9da1;
+ line-height: 34rpx;
+ }
+ .img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ }
+ .img1 {
+ width: 336rpx;
+ height: 296rpx;
+ margin-bottom: 16rpx;
+ }
+ .img2 {
+ width: 336rpx;
+ height: 140rpx;
+ margin-bottom: 16rpx;
+ }
}
.container2 {
- display: flex;
- flex-wrap: wrap;
- .img_wrap {
- width: 336rpx;
- height: 140rpx;
- margin-bottom: 16rpx;
- position: relative;
- border-radius: 8rpx;
- overflow: hidden;
- padding: 24rpx 0rpx 0 28rpx;
- &:nth-of-type(2n) {
- margin-left: 18rpx;
- }
- .task_num{
- position: absolute;
- left: 168rpx;
- top: 26rpx;
- width: 52rpx;
- height: 52rpx;
- border-radius: 50%;
- /* border: 1px solid; */
- background-color: #fff;
- color: #db534c;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 24rpx
- }
- .h1 {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 48rpx;
- margin-bottom: 4rpx;
- }
- .h2 {
- font-size: 22rpx;
- color: #7b9da1;
- line-height: 34rpx;
- }
- .img {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- }
+ display: flex;
+ flex-wrap: wrap;
+ .img_wrap {
+ width: 336rpx;
+ height: 140rpx;
+ margin-bottom: 16rpx;
+ position: relative;
+ border-radius: 8rpx;
+ overflow: hidden;
+ padding: 24rpx 0rpx 0 28rpx;
+ &:nth-of-type(2n) {
+ margin-left: 18rpx;
+ }
+ .task_num {
+ position: absolute;
+ left: 168rpx;
+ top: 26rpx;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 50%;
+ /* border: 1px solid; */
+ background-color: #fff;
+ color: #db534c;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 24rpx;
+ }
+ .h1 {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 48rpx;
+ margin-bottom: 4rpx;
+ }
+ .h2 {
+ font-size: 22rpx;
+ color: #7b9da1;
+ line-height: 34rpx;
+ }
+ .img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ }
}
.copyright {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 44rpx;
- font-size: 24rpx;
- color: #666666;
- image {
- width: 40rpx;
- height: 40rpx;
- }
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 44rpx;
+ font-size: 24rpx;
+ color: #666666;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
}
</style>
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 4a58c6d..b39ca85 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -93,8 +93,12 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
- <view v-if="myMeetingList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 60rpx auto 0" mode="widthFix" />
+ <view v-if="myMeetingList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 60rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -145,8 +149,12 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
- <view v-if="recordList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="recordList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -219,9 +227,9 @@
this.initData()
this.getRoomList()
},
- onShow() {
- this.tabClick('0')
- },
+ onShow() {
+ this.tabClick('0')
+ },
onReachBottom() {
const { activeTab } = this
if (activeTab == '0') {
@@ -247,10 +255,10 @@
})
})
},
- getRoomList() {
+ getRoomList() {
roomsListPost({}).then(res => {
this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
- console.log('meetingList', this.meetingList);
+ console.log('meetingList', this.meetingList)
})
},
tabClick(val) {
@@ -269,7 +277,7 @@
}
},
seletedStatus(e) {
- this.myMeetingList = []
+ this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
this.isShowStatus = false
this.myPage = 1
@@ -341,7 +349,7 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [ ...this.myMeetingList, ...res.data.records ]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
})
},
}
@@ -391,7 +399,7 @@
}
}
.active {
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
color: #222222;
.line {
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index ac93057..8772ad0 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -74,8 +74,12 @@
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
- <view v-if="myMeetingList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="myMeetingList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -148,14 +152,14 @@
this.initData()
this.getRoomList()
},
- onShow() {
- this.myPage = 1
+ onShow() {
+ this.myPage = 1
this.myMeetingList = []
this.getDayMeeting()
- },
+ },
onReachBottom() {
this.myPage = this.myPage + 1
- this.getDayMeeting()
+ this.getDayMeeting()
},
methods: {
initData() {
@@ -172,14 +176,14 @@
})
})
},
- getRoomList() {
+ getRoomList() {
roomsListPost({}).then(res => {
this.meetingList = [[{ id: '', name: '鍏ㄩ儴浼氳瀹�' }, ...res.data]]
- console.log('meetingList', this.meetingList);
+ console.log('meetingList', this.meetingList)
})
},
seletedStatus(e) {
- this.myMeetingList = []
+ this.myMeetingList = []
this.activeRoom = { ...e.value[0] }
this.recordPage = 1
this.isShowStatus = false
@@ -238,7 +242,7 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [ ...this.myMeetingList, ...res.data.records ]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
})
},
}
@@ -288,7 +292,7 @@
}
}
.active {
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
color: #222222;
.line {
diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index c33f1b5..5134f06 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -53,9 +53,7 @@
<view class="">{{ item.name }}</view>
</view>
</view>
- <view class="sub" @click="onSubmit"
- >纭棰勭害</view
- >
+ <view class="sub" @click="onSubmit">纭棰勭害</view>
</view>
</view>
<!-- -->
@@ -91,7 +89,7 @@
import {
roomsListPost,
getRoomUseTime,
- meetingDetail
+ meetingDetail
} from '@/api'
export default {
data() {
@@ -99,7 +97,7 @@
activeRoom: {
yudingDate: ''
},
- selDatetime: '',
+ selDatetime: '',
isShowDetail: false,
activeInfo: {},
meetingList: [],
@@ -129,8 +127,8 @@
this.$set(this.activeRoom, 'roomId', item.id)
this.$set(this.activeRoom, 'roomName', item.name)
},
- onSubmit() {
- const { activeRoom } = this
+ onSubmit() {
+ const { activeRoom } = this
const selTimeList = this.timeList.filter(i => i.checked == '1')
if (selTimeList.length == -1) {
return uni.showToast({
@@ -138,14 +136,14 @@
icon: 'none'
})
}
- const obj = {
- startTime: selTimeList[0].startTime,
- endTime: selTimeList[selTimeList.length - 1].endTime,
- bookingTimeList: selTimeList.map(i=>i.id).join(',')
- }
- uni.navigateTo({
- url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}&roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}&bookingTimeList=${obj.bookingTimeList}`
- })
+ const obj = {
+ startTime: selTimeList[0].startTime,
+ endTime: selTimeList[selTimeList.length - 1].endTime,
+ bookingTimeList: selTimeList.map(i => i.id).join(',')
+ }
+ uni.navigateTo({
+ url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}&roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}&bookingTimeList=${obj.bookingTimeList}`
+ })
// this.$jump('/pages/staff/vehicle/apply')
},
getRoomList() {
@@ -171,10 +169,10 @@
})
},
datetimeClick(item, index) {
- if(item.bookingTimeId){
- this.getDetail(item.bookingTimeId)
- return
- }
+ if (item.bookingTimeId) {
+ this.getDetail(item.bookingTimeId)
+ return
+ }
if (item.isUse == '1') return
const { timeList } = this
const selTimeList = timeList.filter(i => i.checked == '1')
@@ -228,14 +226,14 @@
this.yudingDate = dayjs(yudingDate)[fn](1, 'days').format('YYYY-MM-DD')
this.getRoomList()
},
- getDetail(id) {
- meetingDetail({
- id
- }).then(res => {
+ getDetail(id) {
+ meetingDetail({
+ id
+ }).then(res => {
this.activeInfo = res.data
this.isShowDetail = true
})
- },
+ },
}
}
</script>
@@ -245,12 +243,12 @@
padding: 40rpx 30rpx;
.title {
text-align: center;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 40rpx;
}
.h1 {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 30rpx;
}
@@ -273,7 +271,7 @@
text-align: center;
background: $uni-color-primary;
border-radius: 44rpx;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #ffffff;
}
@@ -283,7 +281,7 @@
width: 100%;
left: 0;
bottom: 0;
- background-color: #fff;
+ background-color: #fff;
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
.sel_time {
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 84cd0a7..53620a6 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -21,7 +21,7 @@
@click="statusClick(0)"
:class="{ active: search.queryType === 0 }"
class="box_head_item"
- >寰呭鐞� {{ headData.noticeWaitNum }}</view
+ >寰呭鐞� {{ headData.noticeWaitNum || '' }}</view
>
<view
@click="statusClick(1)"
@@ -39,7 +39,7 @@
@click="statusClick(3)"
:class="{ active: search.queryType === 3 }"
class="box_head_item"
- >鎶勯�佹垜鐨� {{ headData.noticeCopyNum }}</view
+ >鎶勯�佹垜鐨� {{ headData.noticeCopyNum || '' }}</view
>
</view>
</scroll-view>
@@ -114,12 +114,21 @@
<view class="box_list_item_nr_x"></view>
<view class="box_list_item_nr_text">
<text class="time">{{ item.createDate }}鎻愪氦</text>
- <text v-if="item.status == '0'" class="btn" @click="handleAppr(item)">鍘诲鐞�</text>
+ <text
+ v-if="item.status == '0'"
+ class="btn"
+ @click="handleAppr(item)"
+ >鍘诲鐞�</text
+ >
</view>
</view>
</view>
- <view v-if="dataList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120px auto 0" mode="widthFix" />
+ <view v-if="dataList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120px auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -231,11 +240,11 @@
]
}
},
- onLoad() {
- this.getHeadList()
- this.pagination.page = 0
- this.getList()
- },
+ // onLoad() {
+ // this.getHeadList()
+ // this.pagination.page = 0
+ // this.getList()
+ // },
onReachBottom() {
// this.pagination.page = 0
// this.dataList = []
@@ -283,7 +292,7 @@
}).then(res => {
this.dataList = [...this.dataList, ...res.data.records]
this.dataList.forEach(i => {
- if(i.param1){
+ if (i.param1) {
i.param1 = JSON.parse(i.param1)
}
})
@@ -482,7 +491,7 @@
}
.tt {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.info {
@@ -552,7 +561,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search_list {
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 7d48a81..f1a67ba 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -759,7 +759,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -930,7 +930,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -1026,7 +1026,7 @@
.appr_modal {
padding: 36rpx 30rpx 0;
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
diff --git a/h5/pages/staff/task/visitorApprove.vue b/h5/pages/staff/task/visitorApprove.vue
index 06d856a..ad1a40f 100644
--- a/h5/pages/staff/task/visitorApprove.vue
+++ b/h5/pages/staff/task/visitorApprove.vue
@@ -138,7 +138,14 @@
</view>
</view>
<view class="emyty"></view>
- <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
+ <view
+ v-if="
+ info.approveDateVO != null &&
+ info.approveDateVO.canBeApproved != null &&
+ info.approveDateVO.canBeApproved == 1
+ "
+ class="main_footer"
+ >
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
@@ -258,7 +265,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -429,7 +436,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -495,7 +502,7 @@
padding: 36rpx 30rpx 0;
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
diff --git a/h5/pages/staff/task/visitorReport.vue b/h5/pages/staff/task/visitorReport.vue
index 6bc59ab..27b121f 100644
--- a/h5/pages/staff/task/visitorReport.vue
+++ b/h5/pages/staff/task/visitorReport.vue
@@ -131,7 +131,14 @@
</view>
</view>
<view class="emyty"></view>
- <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
+ <view
+ v-if="
+ info.approveDateVO != null &&
+ info.approveDateVO.canBeApproved != null &&
+ info.approveDateVO.canBeApproved == 1
+ "
+ class="main_footer"
+ >
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
@@ -251,7 +258,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -422,7 +429,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -461,7 +468,6 @@
justify-content: space-between;
width: 100%;
left: 0;
- padding: 30rpx 10rpx 60rpx;
display: flex;
justify-content: space-between;
background: #ffffff;
@@ -488,7 +494,7 @@
padding: 36rpx 30rpx 0;
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
diff --git a/h5/pages/staff/vehicle/index.vue b/h5/pages/staff/vehicle/index.vue
index bc22a98..359da62 100644
--- a/h5/pages/staff/vehicle/index.vue
+++ b/h5/pages/staff/vehicle/index.vue
@@ -1,92 +1,104 @@
<template>
- <view class="main_app">
- <image src="../../../static/staff/yongche_bg.png" class="banner" mode="widthFix"></image>
- <view class="emyty"></view>
- <view class="content">
- <view class="title">閫夋嫨鐩殑鍦扮被鍒�</view>
- <view class="item" @click="$jump('/pages/staff/vehicle/shinei')">
- <image src="../../../static/bg_shineiyongche@2x.png" class="img" mode="widthFix"></image>
- <view class="h1">瀹ゅ唴鐢ㄨ溅</view>
- <view class="h2">URBAN AREA</view>
- </view>
- <view class="item" @click="$jump('/pages/staff/vehicle/shiwai')">
- <image src="../../../static/bg_shiwaiyongche@2x.png" class="img" mode="widthFix"></image>
- <view class="h1">瀹ゅ鐢ㄨ溅</view>
- <view class="h2">SUBURB AREA</view>
- </view>
- </view>
- </view>
+ <view class="main_app">
+ <image
+ src="../../../static/staff/yongche_bg.png"
+ class="banner"
+ mode="widthFix"
+ ></image>
+ <view class="emyty"></view>
+ <view class="content">
+ <view class="title">閫夋嫨鐩殑鍦扮被鍒�</view>
+ <view class="item" @click="$jump('/pages/staff/vehicle/shinei')">
+ <image
+ src="../../../static/bg_shineiyongche@2x.png"
+ class="img"
+ mode="widthFix"
+ ></image>
+ <view class="h1">瀹ゅ唴鐢ㄨ溅</view>
+ <view class="h2">URBAN AREA</view>
+ </view>
+ <view class="item" @click="$jump('/pages/staff/vehicle/shiwai')">
+ <image
+ src="../../../static/bg_shiwaiyongche@2x.png"
+ class="img"
+ mode="widthFix"
+ ></image>
+ <view class="h1">瀹ゅ鐢ㄨ溅</view>
+ <view class="h2">SUBURB AREA</view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
- param: {}
- };
- }
- }
+export default {
+ data() {
+ return {
+ param: {}
+ }
+ }
+}
</script>
<style lang="scss">
-.main_app{
- .emyty{
- width: 100%;
- height: 218rpx;
- }
- .content{
- width: 690rpx;
- background: #FFFFFF;
- box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(39,155,170,0.16);
- border-radius: 16rpx;
- padding: 60rpx 30rpx;
- .item{
- width: 630rpx;
- height: 200rpx;
- border-radius: 8rpx;
- margin-bottom: 30rpx;
- &:nth-last-child(1){
- margin-bottom: 0;
- }
- position: relative;
- padding: 40rpx;
- overflow: hidden;
- z-index: 1;
- .h1 {
- font-weight: 500;
- font-size: 32rpx;
- color: #222222;
- line-height: 48rpx;
- margin-bottom: 10rpx;
- }
- .h2 {
- font-size: 22rpx;
- color: #7b9da1;
- line-height: 34rpx;
- }
- .img {
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- }
- .title{
- margin-bottom: 40rpx;
- font-weight: 500;
- font-size: 34rpx;
- color: #222222;
- line-height: 48rpx;
- }
- }
- .banner{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
+.main_app {
+ .emyty {
+ width: 100%;
+ height: 218rpx;
+ }
+ .content {
+ width: 690rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(39, 155, 170, 0.16);
+ border-radius: 16rpx;
+ padding: 60rpx 30rpx;
+ .item {
+ width: 630rpx;
+ height: 200rpx;
+ border-radius: 8rpx;
+ margin-bottom: 30rpx;
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+ position: relative;
+ padding: 40rpx;
+ overflow: hidden;
+ z-index: 1;
+ .h1 {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 48rpx;
+ margin-bottom: 10rpx;
+ }
+ .h2 {
+ font-size: 22rpx;
+ color: #7b9da1;
+ line-height: 34rpx;
+ }
+ .img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ }
+ .title {
+ margin-bottom: 40rpx;
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ line-height: 48rpx;
+ }
+ }
+ .banner {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
}
</style>
diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index aaba5d3..997a031 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/h5/pages/staff/vehicle/sendACar.vue
@@ -47,8 +47,12 @@
</view>
</view>
</view>
- <view v-if="dataList.length === 0" style="text-align: center;">
- <image src="@/static/empty.png" style="width: 320rpx;margin: 120rpx auto 0" mode="widthFix" />
+ <view v-if="dataList.length === 0" style="text-align: center">
+ <image
+ src="@/static/empty.png"
+ style="width: 320rpx; margin: 120rpx auto 0"
+ mode="widthFix"
+ />
<view class="placeholder9 fs24">鏆傛棤鏁版嵁</view>
</view>
</view>
@@ -229,7 +233,7 @@
text {
&:nth-child(1) {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
&:nth-child(2) {
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index e266b61..60ae8bb 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -299,7 +299,7 @@
padding: 30rpx 0;
.flow_title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 24rpx;
@@ -470,7 +470,7 @@
padding: 30rpx 0;
.name {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
margin-bottom: 20rpx;
color: #222222;
@@ -529,7 +529,7 @@
margin-bottom: 20rpx;
}
.title {
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
margin-bottom: 40rpx;
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index bf13087..54bc0f3 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -37,7 +37,7 @@
</view>
<view class="have_info" v-if="info && info.length > 0">
<view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵宸叉湁杞﹁締棰勭害</view>
- <view class="content" v-for="item,i in info" :key="i">
+ <view class="content" v-for="(item, i) in info" :key="i">
<view class="card">{{ item.carCode }}</view>
<view class="line">
<text>鐢ㄨ溅鏃舵</text>
@@ -61,7 +61,7 @@
</view>
<view class="line">
<text>鐢宠浜�</text>
- <text>{{ item.memberName }} {{ item.memberMobile}}</text>
+ <text>{{ item.memberName }} {{ item.memberMobile }}</text>
</view>
</view>
</view>
@@ -131,7 +131,7 @@
methods: {
onSubmit() {
const { param, info } = this
- if (info.length > 0) return uni.showToast({
+ if (info.length > 0) return uni.showToast({
title: '璇烽噸鏂伴�夋嫨鏃堕棿娈�',
icon: 'none'
})
@@ -217,7 +217,7 @@
<style lang="scss">
.have_info {
- padding: 0 0 200rpx;
+ padding: 0 0 200rpx;
.tit {
color: #ed4545;
margin: 40rpx 0 24rpx;
@@ -226,10 +226,10 @@
background: #f7f7f7;
border-radius: 16rpx;
padding: 30rpx 30rpx 10rpx;
- margin-bottom: 20rpx;
+ margin-bottom: 20rpx;
.card {
margin-bottom: 30rpx;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #222222;
background: #f7f7f7;
@@ -317,7 +317,7 @@
position: fixed;
width: 100%;
left: 0;
- background-color: #fff;
+ background-color: #fff;
bottom: 0;
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
diff --git a/h5/pages/staff/visitorReport.vue b/h5/pages/staff/visitorReport.vue
index 040b1fa..039eb66 100644
--- a/h5/pages/staff/visitorReport.vue
+++ b/h5/pages/staff/visitorReport.vue
@@ -465,7 +465,7 @@
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.list {
@@ -521,7 +521,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
diff --git a/h5/pages/staffLogin/forgetPsd.vue b/h5/pages/staffLogin/forgetPsd.vue
index c5d1c24..d51d593 100644
--- a/h5/pages/staffLogin/forgetPsd.vue
+++ b/h5/pages/staffLogin/forgetPsd.vue
@@ -212,7 +212,7 @@
display: flex;
align-items: center;
justify-content: center;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #ffffff;
border-radius: 50rpx;
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 309f287..d3fc3bf 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -231,7 +231,7 @@
display: flex;
align-items: center;
justify-content: center;
- font-weight: 500;
+ font-weight: 600;
font-size: 32rpx;
color: #ffffff;
border-radius: 50rpx;
@@ -249,7 +249,7 @@
.deal {
color: $uni-color-primary;
}
- .checked{
+ .checked {
width: 48rpx;
margin-right: 12rpx;
}
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 2be75fd..439734d 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -854,7 +854,7 @@
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.list {
@@ -910,7 +910,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.adduser_list {
@@ -1032,7 +1032,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
@@ -1089,7 +1089,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search-box {
@@ -1232,7 +1232,7 @@
background: #025eef;
border-radius: 8rpx;
font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
@@ -1278,7 +1278,6 @@
font-size: 30rpx;
font-weight: 400;
color: #e42d2d;
-
}
&:nth-child(2) {
@@ -1324,7 +1323,7 @@
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
@@ -1400,7 +1399,7 @@
background: #4c99a8;
border-radius: 44rpx;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
diff --git a/h5/pages/visitorApproval/visitorApproval.vue b/h5/pages/visitorApproval/visitorApproval.vue
index 4bba4aa..89d3d1b 100644
--- a/h5/pages/visitorApproval/visitorApproval.vue
+++ b/h5/pages/visitorApproval/visitorApproval.vue
@@ -137,7 +137,7 @@
}
.box_list_name {
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.box_list_job {
--
Gitblit v1.9.3