From 7c7c4ae64b84be1766a5ebbe3ba5ee97cba8c6da Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 04 七月 2024 16:21:41 +0800
Subject: [PATCH] ‘’
---
admin/src/components/business/operaVisitsWindow.vue | 2
admin/src/views/task/visSubDetail.vue | 5
h5/main.js | 11 -
h5/pages/staff/index.vue | 65 +++++++++-
admin/src/views/business/approvalConfiguration.vue | 10 +
admin/src/views/operation/serviceCar/apprConfig.vue | 10 +
admin/src/views/meeting/rooms.vue | 1
admin/src/components/business/OperaHiddenDangerParamWindow.vue | 3
admin/src/views/business/approvalReport.vue | 37 ++++-
h5/store/index.js | 2
admin/src/components/business/OperaCarDriverWindow.vue | 3
h5/pages/index/index.vue | 42 ++++++
h5/pages/visitorApplication/visitorApplication.vue | 3
admin/src/components/operation/OperCarUseBookParamWindow.vue | 3
/dev/null | 0
h5/pages/staff/task/index.vue | 7 +
admin/src/views/task/index.vue | 2
h5/pages/notice/notice.vue | 27 +++-
admin/src/views/meeting/bookings.vue | 53 ++++----
admin/src/components/business/OperaCarUseBookWindow.vue | 13 ++
h5/App.vue | 50 -------
h5/pages/staff/vehicle/applePeo.vue | 4
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2
h5/pages/answer/answer.vue | 5
24 files changed, 230 insertions(+), 130 deletions(-)
diff --git a/admin/src/components/business/OperaCarDriverWindow.vue b/admin/src/components/business/OperaCarDriverWindow.vue
index ac8c22b..72cd9a5 100644
--- a/admin/src/components/business/OperaCarDriverWindow.vue
+++ b/admin/src/components/business/OperaCarDriverWindow.vue
@@ -88,7 +88,8 @@
},
loadMember () {
allList({
- type: 2
+ type: 2,
+ companyType: 1
})
.then(res => {
this.memberList = res
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 972dd87..607212d 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -111,7 +111,7 @@
<!-- -->
<template v-slot:footer>
<el-button @click="agreeOpen" type="primary" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " class="status-red">鍚屾剰</el-button>
- <el-button @click="isBackProblem=true" type="danger" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " >鎷掔粷</el-button>
+ <el-button @click="jectOpen" type="danger" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " >鎷掔粷</el-button>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
<el-dialog
@@ -241,8 +241,19 @@
},
agreeOpen () {
this.isShowProblem = true
+ this.dealForm = {
+ driveId: null,
+ checkInfo: null
+ }
this.loadMemberList()
},
+ jectOpen () {
+ this.isBackProblem = true
+ this.dealForm = {
+ driveId: null,
+ checkInfo: null
+ }
+ },
backDo () {
this.$refs.backForm.validate((valid) => {
if (!valid) {
diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
index 78ca1dd..3e2b4df 100644
--- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
@@ -92,7 +92,8 @@
},
loadMember () {
allList({
- type: 2
+ type: 2,
+ companyType: 1
})
.then(res => {
this.memberList = res
diff --git a/admin/src/components/business/operaVisitsWindow.vue b/admin/src/components/business/operaVisitsWindow.vue
index 2f97250..784cdcd 100644
--- a/admin/src/components/business/operaVisitsWindow.vue
+++ b/admin/src/components/business/operaVisitsWindow.vue
@@ -257,6 +257,8 @@
if (!valid) {
return
}
+ const { param } = this
+ if (param.starttime.slice(0, 10) !== param.endtime.slice(0, 10)) return this.$tip.error('鍏ュ洯鏃堕棿鍜岀鍥椂闂翠笉鍙法澶�')
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
createFk({
diff --git a/admin/src/components/operation/OperCarUseBookParamWindow.vue b/admin/src/components/operation/OperCarUseBookParamWindow.vue
index f78ebdd..10d590b 100644
--- a/admin/src/components/operation/OperCarUseBookParamWindow.vue
+++ b/admin/src/components/operation/OperCarUseBookParamWindow.vue
@@ -538,7 +538,8 @@
this.carsList = res
})
findTypeMemberInfo({
- type: '2'
+ type: '2',
+ companyType: 1
}).then(res => {
this.memberList = res || []
})
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 320a8b2..eba5df1 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -163,6 +163,7 @@
<div class="config_data_submit">
<el-button
@click="onSubmit"
+ :loading="subLoading"
style="background: #435ebe"
type="primary"
>淇濆瓨閰嶇疆椤�</el-button
@@ -243,6 +244,7 @@
data () {
return {
activeType: '0',
+ subLoading: false,
apprList: [
{ remark: '瀹℃壒浜�', active: false, type: '0', objIds: [] },
{ remark: '鎶勯�佷汉', active: false, type: '1', objIds: [] }
@@ -323,13 +325,15 @@
item.objIds = ''
}
})
+ this.subLoading = true
approveTemplSave({
type: activeType,
paramList: temp
}).then(res => {
- // if (res.code === 200) {
- this.$message.success('淇濆瓨鎴愬姛')
- // }
+ this.subLoading = false
+ this.$tip.success('淇濆瓨鎴愬姛')
+ }, () => {
+ this.subLoading = false
})
},
handleDel () {
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index 49fee30..b264bba 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/admin/src/views/business/approvalReport.vue
@@ -26,15 +26,26 @@
>
<div class="head">{{ item.remark }}</div>
<div class="content">
- <div v-if="item.objIds && item.objIds.length === 1 ">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
+ <div v-if="item.objIds && item.objIds.length === 1">
+ <span
+ >{{ item.objIds[0].name }}
+ {{ item.objIds[0].companyName }}</span
+ >
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
</div>
<div v-else-if="item.objIds && item.objIds.length > 1">
<span>{{ item.objIds[0].name }} 绛�</span>
- <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
- <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
+ <span v-if="item.approveType == 0 && item.type == '0'">
+ 鎴栫</span
+ >
+ <span v-if="item.approveType == 1 && item.type == '0'">
+ 浼氱</span
+ >
</div>
<div v-else>璇烽�夋嫨</div>
<i class="el-icon-arrow-right"></i>
@@ -96,7 +107,7 @@
</div>
<div class="config_data_item_reviewed_content">
<div
- v-for="mem,memIndex in apprList[activeIndex].objIds"
+ v-for="(mem, memIndex) in apprList[activeIndex].objIds"
:key="mem.id"
class="config_data_item_reviewed_content_item"
>
@@ -116,7 +127,7 @@
<div class="config_data_item_reviewed_r">
<span>琚浜虹殑</span>
<el-select
- v-model="apprList[activeIndex].level"
+ v-model="apprList[activeIndex].objLevel"
placeholder="璇烽�夋嫨"
style="margin: 0 20px 0 10px"
>
@@ -159,6 +170,7 @@
<div class="config_data_submit">
<el-button
@click="onSubmit"
+ :loading="subLoading"
style="background: #435ebe"
type="primary"
>淇濆瓨閰嶇疆椤�</el-button
@@ -239,6 +251,7 @@
data () {
return {
activeType: '2',
+ subLoading: false,
apprList: [
{ remark: '瀹℃壒浜�', active: false, type: '0', objIds: [] },
{ remark: '鎶勯�佷汉', active: false, type: '1', objIds: [] }
@@ -310,13 +323,15 @@
item.objIds = ''
}
})
+ this.subLoading = true
approveTemplSave({
type: activeType,
paramList: temp
}).then(res => {
- if (res.code === 200) {
- this.$message.success('淇濆瓨鎴愬姛')
- }
+ this.subLoading = false
+ this.$tip.success('淇濆瓨鎴愬姛')
+ }, () => {
+ this.subLoading = false
})
},
handleDel () {
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 4a9f8f8..83a83f6 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -57,7 +57,7 @@
</el-form-item>
<el-form-item label="浼氳鐘舵��" prop="status">
<el-select
- v-model="searchForm.status"
+ v-model="searchForm.meetingStatus"
filterable
clearable
placeholder="璇烽�夋嫨鐘舵��"
@@ -169,12 +169,13 @@
align="center"
min-width="100px"
></el-table-column>
- <el-table-column label="鐘舵��" align="center" min-width="60px">
+ <el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
<template slot-scope="{ row }">
- <span v-if="row.status == 0" style="color: rgb(127, 178, 53)"
- >姝ｅ父</span
- >
- <span v-else style="color: rgb(234, 54, 38)">鍙栨秷</span>
+ <span v-if="row.meetingStatus == 1">鏈紑濮�</span>
+ <span v-if="row.meetingStatus == 2">杩涜涓�</span>
+ <span v-if="row.meetingStatus == 3">宸茬粨鏉�</span>
+ <span v-if="row.meetingStatus == 4">鍗冲皢寮�濮�</span>
+ <span v-if="row.meetingStatus == 5">宸叉挙閿�</span>
<!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
@@ -182,7 +183,7 @@
prop="createDate"
label="鍒涘缓鏃堕棿"
align="center"
- min-width="100px"
+ min-width="150px"
></el-table-column>
<!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
<el-table-column
@@ -204,9 +205,9 @@
@click="$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', row)"
>鏌ョ湅璇︽儏</el-button
>
- <!-- <el-button v-if="row.flag == 0" type="text" @click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)" v-permissions="['business:bookings:update']">淇敼</el-button> -->
+ <el-button v-if="row.meetingStatus == '1'" type="text" @click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)" v-permissions="['business:bookings:update']">缂栬緫</el-button>
<!-- <el-button type="text" @click="copy(row)">澶嶅埗</el-button> -->
- <!-- <el-button v-if="row.flag == 0" type="text" @click="cancelMeeting(row.id)" v-permissions="['business:bookings:update']">鍙栨秷</el-button> -->
+ <el-button v-if="row.meetingStatus == '1'" type="text" @click="cancelMeeting(row.id)" v-permissions="['business:bookings:update']">鎾ゅ洖</el-button>
</template>
<!-- <el-button v-else type="text" @click="deleteById(row)" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button> -->
</template>
@@ -247,7 +248,7 @@
name: 'Bookings',
extends: BaseTable,
components: { TableLayout, Pagination, OperaBookingsWindow, OperaBookingsDetailWindow },
- data() {
+ data () {
return {
date: [],
// 鎼滅储
@@ -256,7 +257,7 @@
// departmentId: [],
department: [],
realName: '',
- status: '',
+ meetingStatus: '',
createDate: '',
editor: '',
editDate: '',
@@ -280,19 +281,21 @@
{ name: '寮�鍙戦儴闂�', id: '0' }
],
status: [
- { name: '鍏ㄩ儴', id: '' },
- { name: '姝ｅ父', id: '0' },
- { name: '鍙栨秷', id: '1' }
+ { name: '鏈紑濮�', id: 1 },
+ { name: '鍗冲皢寮�濮�', id: 4 },
+ { name: '杩涜涓�', id: 2 },
+ { name: '宸叉挙閿�', id: 5 },
+ { name: '宸茬粨鏉�', id: 3 }
],
link: 'https://dmtest.ahapp.net/meeting_h5/' // H5_LINK_ADDR
}
},
- provide() {
+ provide () {
return {
rooms: () => this.rooms
}
},
- created() {
+ created () {
this.config({
module: '浼氳瀹ら瀹氫俊鎭〃',
api: '/meeting/bookings',
@@ -315,7 +318,7 @@
this.changeRadio('0')
},
methods: {
- changeRadio(e) {
+ changeRadio (e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
@@ -331,7 +334,7 @@
}
this.search()
},
- newTree(tree) {
+ newTree (tree) {
if (tree == null) {
return []
}
@@ -348,12 +351,12 @@
return newItem
})
},
- selectDate(v) {
+ selectDate (v) {
this.searchForm.endTime = v[1] + ' 23:59:59'
this.searchForm.startTime = v[0] + ' 00:00:00'
this.searchForm.radio = null
},
- reset() {
+ reset () {
this.$refs.searchForm.resetFields()
this.date = []
this.searchForm.radio = '0'
@@ -361,7 +364,7 @@
this.searchForm.endTime = ''
this.changeRadio('0')
},
- copy(row) {
+ copy (row) {
const text = `${row.realName} 閭�璇锋偍鍔犲叆浼氳\n浼氳涓婚锛�${row.name}\n浼氳瀹わ細${row.roomName}\n浼氳鏃堕棿锛�${row.meetingTime}\n鐐瑰嚮閾炬帴鐩存帴鍔犲叆浼氳锛歕n${this.link}?id=${row.id}`
this.$copyText(text)
.then(() => {
@@ -370,7 +373,7 @@
.catch(e => {
})
},
- cancelMeeting(id) {
+ cancelMeeting (id) {
this.$dialog.messageWaring('鍙栨秷浼氳', '鏄惁鍙栨秷褰撳墠浼氳锛�')
.then(() => {
cancelById({ id })
@@ -382,7 +385,7 @@
})
})
},
- showDetail(id) {
+ showDetail (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', res)
@@ -390,7 +393,7 @@
.catch(e => {
})
},
- editBookings(id) {
+ editBookings (id) {
bookingsDetail(id)
.then(res => {
this.$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', res)
@@ -398,7 +401,7 @@
.catch(e => {
})
},
- handlePageChange(pageIndex) {
+ handlePageChange (pageIndex) {
this.__checkApi()
this.tableData.pagination.pageIndex = pageIndex || this.tableData.pagination.pageIndex
this.isWorking.search = true
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index c81231c..7730505 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -198,7 +198,7 @@
userList({
page: 1,
capacity: 9999,
- model: { realname: this.filterText }
+ model: { realname: this.filterText, memberType: 2 }
})
.then(res => {
console.log('userList', res)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 4fbc523..c2f1e3c 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -167,6 +167,7 @@
userList({
page: 1,
capacity: 9999,
+ memberType: 2,
model: { realname: this.filterText }
})
.then(res => {
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index 4473aac..93ec48d 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -120,7 +120,7 @@
<div class="config_data_item_reviewed_r">
<span>琚浜虹殑</span>
<el-select
- v-model="apprList[activeIndex].level"
+ v-model="apprList[activeIndex].objLevel"
placeholder="璇烽�夋嫨"
style="margin: 0 20px 0 10px"
>
@@ -172,6 +172,7 @@
<div class="config_data_submit">
<el-button
@click="onSubmit"
+ :loading="subLoading"
style="background: #435ebe"
type="primary"
>淇濆瓨閰嶇疆椤�</el-button
@@ -252,6 +253,7 @@
data () {
return {
activeType: '3',
+ subLoading: false,
apprList: [
{ remark: '瀹℃壒浜�', active: false, type: '0', objIds: [] },
{ remark: '鎶勯�佷汉', active: false, type: '1', objIds: [] }
@@ -332,13 +334,15 @@
item.objIds = ''
}
})
+ this.subLoading = true
approveTemplSave({
type: activeType,
paramList: temp
}).then(res => {
- // if (res.code === 200) {
+ this.subLoading = false
this.$tip.success('淇濆瓨鎴愬姛')
- // }
+ }, () => {
+ this.subLoading = false
})
},
handleDel () {
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 2a8a038..8d1c350 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -211,7 +211,7 @@
})
}
if (row.objType === 2) {
- this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)
+ this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', { ...row, id: row.objId })
return
}
if (row.objType === 1) {
diff --git a/admin/src/views/task/visSubDetail.vue b/admin/src/views/task/visSubDetail.vue
index 8f04d80..d8e4b15 100644
--- a/admin/src/views/task/visSubDetail.vue
+++ b/admin/src/views/task/visSubDetail.vue
@@ -244,7 +244,7 @@
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog
append-to-body
- :title="apprTitle"
+ :title="param.status == 2 ? '鍚屾剰' : '鎷掔粷'"
:visible.sync="isShowAppr"
width="480px"
>
@@ -406,6 +406,9 @@
handleAppr (val) {
this.$set(this.param, 'status', val)
this.isShowAppr = true
+ this.$nextTick(() => {
+ this.$refs.ruleForm.clearValidate()
+ })
},
confirm () {
console.log('--')
diff --git a/h5/App.vue b/h5/App.vue
index a46a53b..0d25d8c 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -2,51 +2,7 @@
import { wxAuthorize, refreshToken } from '@/api'
export default {
onLaunch: function () {
- var that = this
- if (!that.$store.state.openid) {
- let url = window.location.href
- let code = ''
- let source = ''
- if (url.indexOf('code=') !== -1) {
- const query = url.split('?')
- console.log('app-app', url)
- for (const q of query) {
- if (q.indexOf('code=') !== -1) {
- code = q.substring(q.indexOf('code=') + 5, q.length)
- }
- if (q.indexOf('source=') !== -1) {
- source = q.substring(q.indexOf('source=') + 7,q.indexOf('source=') + 8 )
- }
- }
- wxAuthorize({
- code: code,
- source
- }).then(res => {
- console.log('app_ress', res)
- if (res.code === 200) {
- that.$store.commit('setOpenId', res.data.openid)
- if (res.data.member) {
- that.$store.commit('setMember', res.data.member)
- }
- }
- })
- } else {
- // const appID = 'wx4d7c10bdec51942b'
- // let uri = encodeURIComponent(url)
- // let authURL =
- // `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
- // window.location.href = authURL
- }
- }
- // 鍒锋柊token
- const token = uni.getStorageSync('token')
- // if (token) {
- // refreshToken().then(res => {
- // if(res.code && res.code === 200){
- // this.$store.commit('setToken', res.data)
- // }
- // })
- // }
+
},
onShow: function () {
console.log('App Show')
@@ -226,8 +182,8 @@
color: #333333;
}
.popupShow {
- overflow: hidden;
- position: fixed;
+ overflow: hidden;
+ position: fixed;
width: 100%;
}
.placeholder6 {
diff --git a/h5/ic_driver@2x.png b/h5/ic_driver@2x.png
deleted file mode 100644
index 0997cdf..0000000
--- a/h5/ic_driver@2x.png
+++ /dev/null
Binary files differ
diff --git a/h5/ic_staff@2x.png b/h5/ic_staff@2x.png
deleted file mode 100644
index 8006cfd..0000000
--- a/h5/ic_staff@2x.png
+++ /dev/null
Binary files differ
diff --git a/h5/ic_visitor@2x.png b/h5/ic_visitor@2x.png
deleted file mode 100644
index fe007c8..0000000
--- a/h5/ic_visitor@2x.png
+++ /dev/null
Binary files differ
diff --git a/h5/login_bg@2x.png b/h5/login_bg@2x.png
deleted file mode 100644
index 1a40354..0000000
--- a/h5/login_bg@2x.png
+++ /dev/null
Binary files differ
diff --git a/h5/main.js b/h5/main.js
index e9b21e4..4c90c6f 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -4,25 +4,18 @@
import './uni.promisify.adaptor'
import uView from "uview-ui"
import store from './store/index.js'
-
import Tabbar from '@/components/tarbar.vue'
import navigation from '@/components/Header.vue'
Vue.config.productionTip = false
+// 寮傛hook
-// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
-// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
-// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/'
Vue.use(uView)
Vue.component('Tabbar', Tabbar)
Vue.component('navigation', navigation)
Vue.prototype.$store = store
-Vue.prototype.$jump = (url) => {
- uni.navigateTo({
- url
- })
-}
+Vue.prototype.$jump = (url) => {uni.navigateTo({url})}
Vue.prototype.$goBack = () => { uni.navigateBack() }
Vue.prototype.$eventBus = new Vue()
Vue.prototype.$onWait = new Promise((resolve) => {
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index 0129113..92d91bb 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -304,7 +304,6 @@
item.status = '0'
item.selAnswer = null
})
- console.log(res.data)
this.list = res.data
}
// res.param.problemsDOList.forEach(item => {
@@ -316,7 +315,7 @@
},
// 鍗曢�夐�夋嫨涓鐩�
select(line, i) {
- if (this.status === '2') return
+ if (this.status != '0') return
this.list.forEach((item, index) => {
if (index === i) {
item.selAnswer = line.code
@@ -325,7 +324,7 @@
// this.problemIndex = index
},
changeBox(index, jeck) {
- if (this.status === '2') return
+ if (this.status != '0') return
this.list.forEach((item, i) => {
if (index === i) {
item.options.forEach((item2, j) => {
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index f477b93..3c7ac9a 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -29,8 +29,7 @@
</template>
<script>
-import image from 'uview-ui/libs/config/props/image'
-
+import { wxAuthorize } from '@/api'
export default {
data() {
@@ -44,6 +43,45 @@
})
return true
},
+ onLoad() {
+ var that = this
+ // if (!that.$store.state.openid) {
+ let url = window.location.href
+ let code = ''
+ let source = ''
+ if (url.indexOf('code=') !== -1) {
+ const query = url.split('?')
+ console.log('app-app', url)
+ for (const q of query) {
+ if (q.indexOf('code=') !== -1) {
+ code = q.substring(q.indexOf('code=') + 5, q.length)
+ }
+ // if (q.indexOf('source=') !== -1) {
+ // source = q.substring(q.indexOf('source=') + 7, q.indexOf('source=') + 8)
+ // }
+ // 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
+ }
+ wxAuthorize({
+ code: code,
+ source: 1
+ }).then(res => {
+ console.log('app_ress', res)
+ if (res.code === 200) {
+ that.$store.commit('setOpenId', res.data.openid)
+ if (res.data.member) {
+ that.$store.commit('setMember', res.data.member)
+ }
+ }
+ })
+ } else {
+ // const appID = 'wx4d7c10bdec51942b'
+ // let uri = encodeURIComponent(url)
+ // let authURL =
+ // `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
+ // window.location.href = authURL
+ }
+ // }
+ },
methods: {
jump(type) {
switch (type) {
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index 4ad99a7..f108547 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -9,7 +9,7 @@
</view>
<view class="empty"></view>
</scroll-view>
- <view class="button" :class="{disable: num > 0}" @click="toapply">
+ <view class="button" :class="{ disable: num > 0 }" @click="toapply">
宸茬煡鏅擄紝涓嬩竴姝�
<text v-if="num > 0">({{ num }}绉�)</text>
</view>
@@ -33,12 +33,6 @@
if (!this.$store.state.openId) {
this.initToken()
}
- timer = setInterval(() => {
- this.num--
- if (this.num === 0) {
- clearInterval(timer)
- }
- }, 1000)
},
methods: {
initToken() {
@@ -59,6 +53,21 @@
this.content = res.data.code
}
})
+ // 鍊掕鏃舵椂闂�
+ getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'NOTICE_CUTNTDOWN'
+ }).then(res => {
+ if (res.code === 200) {
+ this.num = res.data.code
+ timer = setInterval(() => {
+ this.num--
+ if (this.num === 0) {
+ clearInterval(timer)
+ }
+ }, 1000)
+ }
+ })
// 鏄惁闇�瑕佺瓟棰�
getSystemDictData({
dictCode: 'SYSTEM',
@@ -70,7 +79,7 @@
})
},
toapply() {
- if(this.num > 0) return
+ if (this.num > 0) return
if (this.answer === '0') {
uni.navigateTo({
url: '/pages/userinfo/userinfo'
@@ -125,7 +134,7 @@
bottom: 30rpx;
left: 30rpx;
}
- .disable{
+ .disable {
background-color: #cccccc;
}
}
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 888b8bd..5b07e1b 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -63,7 +63,9 @@
<image class="img" src="@/static/staff/ic_renwuzhongxin.png"></image>
<view class="h1">浠诲姟涓績</view>
<view class="h2">TASK CENTER</view>
- <view class="task_num">{{ taskInfo.noticeWaitNum + taskInfo.noticeCopyNum }}</view>
+ <view class="task_num">{{
+ taskInfo.noticeWaitNum + taskInfo.noticeCopyNum
+ }}</view>
</view>
<view class="img_wrap" @click="jump('/pages/staff/meetingCalendar')">
<image class="img" src="@/static/staff/ic_wodehuiyi.png"></image>
@@ -89,7 +91,7 @@
</template>
<script>
-import { logoutPost, stagingHead } from '@/api'
+import { logoutPost, stagingHead, wxAuthorize, refreshToken } from '@/api'
export default {
data() {
return {
@@ -98,11 +100,62 @@
}
},
onLoad() {
- },
- onShow() {
- if (this.userInfo && this.userInfo.memberId) {
- this.getTaskInfo()
+ var that = this
+ // if (!that.$store.state.openid) {
+ let url = window.location.href
+ let code = ''
+ let source = ''
+ if (url.indexOf('code=') !== -1) {
+ const query = url.split('?')
+ console.log('app-app', url)
+ for (const q of query) {
+ if (q.indexOf('code=') !== -1) {
+ code = q.substring(q.indexOf('code=') + 5, q.length)
+ }
+ // if (q.indexOf('source=') !== -1) {
+ // source = q.substring(q.indexOf('source=') + 7, q.indexOf('source=') + 8)
+ // }
+ // 鏉ユ簮:0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐
+ }
+ wxAuthorize({
+ code: code,
+ source: 2
+ }).then(res => {
+ console.log('app_ress', res)
+ if (res.code === 200) {
+ that.$store.commit('setOpenId', res.data.openid)
+ if (res.data.member) {
+ that.$store.commit('setMember', res.data.member)
+ }
+ }
+ })
+ } else {
+ // const appID = 'wx4d7c10bdec51942b'
+ // let uri = encodeURIComponent(url)
+ // let authURL =
+ // `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
+ // window.location.href = authURL
}
+ // }
+ this.getTaskInfo()
+ // 鍒锋柊token
+ // const token = uni.getStorageSync('token')
+ // if (token) {
+ // refreshToken().then(res => {
+ // if (res.code && res.code === 200) {
+ // this.$store.commit('setToken', res.data)
+ // console.log('res', res.data);
+ // // setTimeout(() => {
+ // // this.getTaskInfo()
+ // // }, 1000)
+ // }
+ // })
+ // }
+ },
+ mounted() {
+ this.$eventBus.$on('taskBack', () => {
+ this.getTaskInfo()
+ })
},
methods: {
jump(path) {
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 942d23b..b0b64bb 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -245,6 +245,12 @@
// this.dataList = []
this.getList()
},
+ onBackPress(options) {
+ setTimeout(()=>{
+ this.$eventBus.$emit('taskBack')
+ })
+ return false
+ },
onShow() {
this.pagination.page = 0
this.dataList = []
@@ -298,7 +304,6 @@
i.param1 = JSON.parse(i.param1)
}
})
- console.log('dataList', this.dataList)
})
},
getHeadList() {
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index baf5fe2..ec74350 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -141,13 +141,13 @@
},
methods: {
initData() {
- const { param, pagination } = this
+ const { param } = this
findTypeMemberInfo({
// model: {
name: param.name,
// },
type: '2',
- ...pagination
+ companyType: 1,
}).then(res => {
this.memberList = res.data || []
this.memberList.forEach(i => {
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 439734d..b309a87 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -119,6 +119,7 @@
v-if="form1.starttime"
:show="show5"
:minDate="formatTimeStamp(form1.starttime)"
+ :maxDate="formatTimeStamp(form1.starttime.slice(0,10) + ' 23:59')"
mode="datetime"
@cancel="show5 = false"
@confirm="setendtime"
@@ -775,7 +776,7 @@
this.form1.starttime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
// this.maxTime = getDaysAfterDate(uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM'), this.day)
this.maxTime = this.form1.starttime
- console.log(this.form1.starttime)
+ console.log(this.form1.starttime.slice(0,10))
this.show4 = false
},
setendtime(e) {
diff --git a/h5/store/index.js b/h5/store/index.js
index 884b032..44fb682 100644
--- a/h5/store/index.js
+++ b/h5/store/index.js
@@ -71,7 +71,7 @@
state.sessionKey = val
uni.setStorageSync('sessionKey', val)
},
- // 娓呯┖鎵�鏈夌紦瀛�
+ // 娓呯┖鐧诲綍缂撳瓨
empty(state) {
state.token = ''
state.userInfo = {}
--
Gitblit v1.9.3