From 6739c54297cdfca25ddc4c5b25a74a53532da7c5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 19:17:11 +0800
Subject: [PATCH] ll
---
h5/pages/index/index.vue | 354 ++++++++++++++++++++++++++------------------------
h5/pages/driver/index.vue | 14 ++
h5_meeting/pages/index/index.vue | 2
h5/pages/login/login.vue | 13 +
h5/pages/staff/index.vue | 23 +++
h5_meeting/utils/config.js | 4
6 files changed, 232 insertions(+), 178 deletions(-)
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index ae867f4..74f39ce 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -111,6 +111,20 @@
driverInfo: uni.getStorageSync('driverInfo'),
}
+ },
+ onLoad() {
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if(ywinfo.ywid && ywinfo.type == 0){
+ setTimeout(() => {
+ uni.removeStorageSync('ywinfo')
+ }, 500)
+ const yw = ywinfo.yw
+ if(yw == 7){
+ this.jump('/pages/driver/reservedDetail?id=' + ywinfo.ywid)
+ }else if(yw == 8){
+ this.jump('/pages/driver/taskDetail?id=' + ywinfo.ywid)
+ }
+ }
},
onShow() {
this.initData()
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 9237ee9..b308766 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -1,171 +1,185 @@
-<template>
- <view class="box">
- <view class="box_head">
- <text>瀹夋嘲鐗╂祦鏅烘収鍥尯</text>
- <text class="h2">璁垮涓撳尯</text>
- <image mode="widthFix" class="banner_bg" src="@/static/banner.jpg" />
- </view>
- <view class="main_title">涓氬姟鍔炵悊</view>
- <view class="box_list">
- <view class="box_list_item" @click="jump(1)">
- <image src="@/static/ic_laifangdengji.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(2)">
- <image src="@/static/ic_yuyuejilu.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(3)">
- <image src="@/static/ic_yuanqudaolan.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(4)">
- <image src="@/static/ic_yuyuezhinan.png" mode="widthFix" />
- </view>
- </view>
- <!-- <view class="box_btn">閫�鍑虹櫥褰�</view> -->
- <view class="copyright">
- <image src="@/static/logo_s@2x.png" mode="widthFix" />
- <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
- </view>
- </view>
-</template>
-
-<script>
-import { wxAuthorize, app_url } from '@/api'
-export default {
-
- data() {
- return {
-
- }
- },
- onLoad() {
-
- },
- methods: {
- jump(type) {
- switch (type) {
- case 1:
- uni.navigateTo({
- url: '/pages/notice/notice'
- })
- break
- case 2:
- uni.navigateTo({
- url: '/pages/applicationRecord/applicationRecord'
- })
- break
- case 3:
- uni.navigateTo({
- url: '/pages/guidemap/guidemap'
- })
- break
- case 4:
- uni.navigateTo({
- url: '/pages/visitorSubGuide/index'
- })
- break
- }
- }
- }
-}
-</script>
-
-<style lang="scss" scoped>
-.box {
- width: 100%;
- height: auto;
- padding: 30rpx;
- box-sizing: border-box;
-
- .box_btn {
- position: fixed;
- bottom: 70rpx;
- left: 50%;
- transform: translate(-50%, 0);
- width: 208rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- border-radius: 36rpx;
- border: 1rpx solid #999999;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- }
-
- .box_head {
- width: 100%;
- height: 270rpx;
- padding: 0 44rpx;
- box-sizing: border-box;
- border-radius: 8rpx;
- display: flex;
- flex-direction: column;
- position: relative;
-
- .banner_bg {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
-
- .h2 {
- font-size: 28rpx;
- font-family: SourceHanSansSC, SourceHanSansSC;
- font-weight: 400;
- color: #ffffff;
- margin-top: 14rpx;
- }
-
- text {
- &:first-child {
- font-size: 44rpx;
- font-family: SourceHanSansSC, SourceHanSansSC;
- font-weight: bold;
- color: #ffffff;
- margin-top: 54rpx;
- }
- }
- }
-
- .main_title {
- font-weight: 600;
- font-size: 32rpx;
- color: #222222;
- margin: 40rpx 0 32rpx;
- }
-
- .box_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 40rpx;
-
- .box_list_item {
- width: 100%;
- margin-bottom: 20rpx;
-
- image {
- width: 100%;
- }
- }
- }
-
- .copyright {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 84rpx;
- font-size: 24rpx;
- color: #666666;
-
- image {
- width: 40rpx;
- height: 40rpx;
- }
- }
-}
+<template>
+ <view class="box">
+ <view class="box_head">
+ <text>瀹夋嘲鐗╂祦鏅烘収鍥尯</text>
+ <text class="h2">璁垮涓撳尯</text>
+ <image mode="widthFix" class="banner_bg" src="@/static/banner.jpg" />
+ </view>
+ <view class="main_title">涓氬姟鍔炵悊</view>
+ <view class="box_list">
+ <view class="box_list_item" @click="jump(1)">
+ <image src="@/static/ic_laifangdengji.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(2)">
+ <image src="@/static/ic_yuyuejilu.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(3)">
+ <image src="@/static/ic_yuanqudaolan.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(4)">
+ <image src="@/static/ic_yuyuezhinan.png" mode="widthFix" />
+ </view>
+ </view>
+ <!-- <view class="box_btn">閫�鍑虹櫥褰�</view> -->
+ <view class="copyright">
+ <image src="@/static/logo_s@2x.png" mode="widthFix" />
+ <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
+ </view>
+ </view>
+</template>
+
+<script>
+ import {
+ wxAuthorize,
+ app_url
+ } from '@/api'
+ export default {
+
+ data() {
+ return {
+
+ }
+ },
+ onLoad() {
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if (ywinfo.ywid && ywinfo.type == 1) {
+ setTimeout(() => {
+ uni.removeStorageSync('ywinfo')
+ }, 500)
+ const yw = ywinfo.yw
+ if (yw == 2) {
+ uni.navigateTo({
+ url: '/pages/appointmentDetails/appointmentDetails?id=' + ywinfo.ywid
+ })
+ }
+ }
+ },
+ methods: {
+ jump(type) {
+ switch (type) {
+ case 1:
+ uni.navigateTo({
+ url: '/pages/notice/notice'
+ })
+ break
+ case 2:
+ uni.navigateTo({
+ url: '/pages/applicationRecord/applicationRecord'
+ })
+ break
+ case 3:
+ uni.navigateTo({
+ url: '/pages/guidemap/guidemap'
+ })
+ break
+ case 4:
+ uni.navigateTo({
+ url: '/pages/visitorSubGuide/index'
+ })
+ break
+ }
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .box {
+ width: 100%;
+ height: auto;
+ padding: 30rpx;
+ box-sizing: border-box;
+
+ .box_btn {
+ position: fixed;
+ bottom: 70rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ width: 208rpx;
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ border-radius: 36rpx;
+ border: 1rpx solid #999999;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
+ }
+
+ .box_head {
+ width: 100%;
+ height: 270rpx;
+ padding: 0 44rpx;
+ box-sizing: border-box;
+ border-radius: 8rpx;
+ display: flex;
+ flex-direction: column;
+ position: relative;
+
+ .banner_bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
+
+ .h2 {
+ font-size: 28rpx;
+ font-family: SourceHanSansSC, SourceHanSansSC;
+ font-weight: 400;
+ color: #ffffff;
+ margin-top: 14rpx;
+ }
+
+ text {
+ &:first-child {
+ font-size: 44rpx;
+ font-family: SourceHanSansSC, SourceHanSansSC;
+ font-weight: bold;
+ color: #ffffff;
+ margin-top: 54rpx;
+ }
+ }
+ }
+
+ .main_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ margin: 40rpx 0 32rpx;
+ }
+
+ .box_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ margin-top: 40rpx;
+
+ .box_list_item {
+ width: 100%;
+ margin-bottom: 20rpx;
+
+ image {
+ width: 100%;
+ }
+ }
+ }
+
+ .copyright {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 84rpx;
+ font-size: 24rpx;
+ color: #666666;
+
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+ }
+ }
</style>
\ No newline at end of file
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 6fb7207..cb05f32 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -45,8 +45,12 @@
}
},
onLoad(option) {
- if(option.type){
-
+ if(option.ywid){
+ uni.setStorageSync('ywinfo', {
+ type: option.type,
+ yw: option.yw,
+ ywid: option.ywid
+ })
}
},
onShow() {
@@ -54,7 +58,10 @@
let url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
let code = ''
if (window.location.href.indexOf('code=') !== -1 || this.code) {
-
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if(ywinfo.ywid){
+ this.userAuth(ywinfo.type)
+ }
} else {
// let url = window.location.href
const appID = 'wx173e6caf5abc718a'
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index d541d13..d3a2564 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -127,9 +127,28 @@
}
},
- mounted() {
+ onLoad() {
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if(ywinfo.ywid && ywinfo.type == 2){
+ setTimeout(() => {
+ uni.removeStorageSync('ywinfo')
+ }, 500)
+ const yw = ywinfo.yw
+ if(yw == 1 || yw == 6){
+ this.jump('/pages/staff/meetingDetail?id=' + ywinfo.ywid)
+ }else if(yw == 2){
+ this.jump('/pages/staff/task/visitorApprove?id=' + ywinfo.ywid)
+ }else if(yw == 3){
+ this.jump('/pages/staff/task/visitorReport?id=' + ywinfo.ywid)
+ }else if(yw == 4){
+ this.jump('/pages/staff/task/vDangetAppr?id=' + ywinfo.ywid)
+ }else if(yw == 7){
+ this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid)
+ }else if(yw == 5){
+ this.jump('/pages/staff/vehicle/index')
+ }
+ }
},
-
onShow() {
setTimeout(() => {
this.getTaskInfo()
diff --git a/h5_meeting/pages/index/index.vue b/h5_meeting/pages/index/index.vue
index 04de318..94b405d 100644
--- a/h5_meeting/pages/index/index.vue
+++ b/h5_meeting/pages/index/index.vue
@@ -151,7 +151,7 @@
// 璁剧疆浜岀淮鐮佸唴瀹�
// qr.data = "https://uqrcode.cn/doc";
qr.data =
- "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxac2a80c2144c4ee0&redirect_uri=http://192.168.0.109:8080/redirect.html&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
+ "https://atwl.ahzyssl.com/zhyq_h5/#/pages/login/login/?type=2&yw=1&ywid=" + this.meetingInfo.id
// 璁剧疆浜岀淮鐮佸ぇ灏忥紝蹇呴』涓巆anvas璁剧疆鐨勫楂樹竴鑷�
qr.size = 83;
// 璋冪敤鍒朵綔浜岀淮鐮佹柟娉�
diff --git a/h5_meeting/utils/config.js b/h5_meeting/utils/config.js
index 11dc26e..7366678 100644
--- a/h5_meeting/utils/config.js
+++ b/h5_meeting/utils/config.js
@@ -1,7 +1,7 @@
-export const baseUrl = 'gateway_interface/'
+// export const baseUrl = 'gateway_interface/'
// export const baseUrl = 'http://192.168.5.13/gateway_interface/'
-// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
+export const baseUrl = 'http://192.168.0.173/gateway_interface/'
export const statusMap = {
0: '寰呯‘璁�',
--
Gitblit v1.9.3