chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

企业端 token修复

master
蟑螂恶霸 2 years ago
parent
a49b59294e
commit
3805455a68
6 changed files with 776 additions and 745 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/common/globalRouter.js
  2. 2
      src/config/env.js
  3. 93
      src/views/Home.vue
  4. 420
      src/views/enforceHome.vue
  5. 6
      src/views/enterprise/complaint.vue
  6. 981
      src/views/enterprise/complaintNoScan.vue

3
src/common/globalRouter.js
View File

@ -3,7 +3,8 @@ import { createRouter, createWebHashHistory } from "vue-router";
let routes = [
{
path: "/",
redirect: "/home",
// redirect: "/home",
redirect: "/enforceHome",
name: "App",
},
{

2
src/config/env.js
View File

@ -1,6 +1,6 @@
//本地环境
// let baseUrl="http://139.186.135.156:86";
// let baseUrl="http://10.132.108.3:85";
// let baseUrl="http://10.132.108.1:85";
let baseUrl="http://jdm.szssfj.cn/jdmApi";
// let baseUrl="http://127.0.0.1:85";
// let wsUrl='ws://10.76.108.1:9326';

93
src/views/Home.vue
View File

@ -172,51 +172,56 @@
const signature = sha1(str).toString().toLowerCase();
//深i企鉴权测试
getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
// getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
// useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
// useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
// console.log("phone : " + useCommon.phonenumber);
// }, error => {
// })
w6s.config({
access_key: access_key,
nonce: nonce,
timestamp: timestamp,
signature: signature,
}).then((res) => {
// 成功
console.log("鉴权", res);
}).catch((err) => {
// 失败
// console.log(err)
console.log("鉴权", err);
// todo 临时工
getEnterpriseMerchant(useCommon.phonenumber.toString());
});
w6s.ready(() => {
w6s.szient.getAuthCode({
success: function (res) {
console.log(res)
console.log("认证", res);
console.log("code: " + res.result.result.code);
getSiqLoginAuth({code: res.result.result.code}, success => {
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
getEnterpriseMerchant(success.data.phonenumber.toString());
}, error => {
console.log("error : " + error)
})
},
fail: function (err) {
console.log(err)
console.log("认证", err);
},
});
});
console.log(success.data);
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
useCommon.SET_TOKEN(success.data.token);
console.log(useCommon.userId);
getEnterpriseMerchant(success.data.phonenumber.toString());
}, error => {
})
// w6s.config({
// access_key: access_key,
// nonce: nonce,
// timestamp: timestamp,
// signature: signature,
// }).then((res) => {
// // 成功
// console.log("鉴权", res);
//
// }).catch((err) => {
// // 失败
// // console.log(err)
// console.log("鉴权", err);
// // todo 临时工
// getEnterpriseMerchant(useCommon.phonenumber.toString());
// });
//
// w6s.ready(() => {
// w6s.szient.getAuthCode({
// success: function (res) {
// console.log(res)
// console.log("认证", res);
// console.log("code: " + res.result.result.code);
// getSiqLoginAuth({code: res.result.result.code}, success => {
// useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
// useCommon.SET_USER_ID(success.data.userId);
// useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
// getEnterpriseMerchant(success.data.phonenumber.toString());
// }, error => {
// console.log("error : " + error)
// })
// },
// fail: function (err) {
// console.log(err)
// console.log("认证", err);
// },
// });
// });
// getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
// if(!(success.data == null && success.data.length == 0)){

420
src/views/enforceHome.vue
View File

@ -1,5 +1,5 @@
<template>
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<div class="home app_content" v-if="!isLoading">
<!-- 导航栏 -->
<!-- <div class="header_body">
@ -8,7 +8,7 @@
<!-- 中间 -->
<div class="warp_body" >
<div class="warp_body">
<div class="logobox"></div>
<!-- <div class="streamer" @click="">
<i></i>
@ -18,12 +18,12 @@
</div> -->
<van-notice-bar
:text="noticeStr"
:key="freshMap.key"
left-icon="volume-o"
scrollable
:speed="100"
class="streamer"
:text="noticeStr"
:key="freshMap.key"
left-icon="volume-o"
scrollable
:speed="100"
class="streamer"
/>
<!-- <div class="container streamer" id="notification-container":key="freshMap.key">
@ -72,9 +72,10 @@
<script setup name="Home">
import Vconsolefrom from 'vconsole';
import { Loading } from 'vant';
import {Loading} from 'vant';
import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
const isLoading = ref(true);
const {useCommon} = $globalStore;
const router = useRouter();
@ -89,26 +90,26 @@
key: 0,
});
// 模拟异步数据加载
// setTimeout(() => {
// setTimeout(() => {
// // 如果不是执法用户 则跳转
// router.push(
// {
// path: "/noAccess"
// });
isLoading.value = false;
isLoading.value = false;
// }, 3000);
//定时器
let noticeObj = reactive({
noticeList: [],
notificationtext: "",
noticeTimer: null,
itemWidth: 0,
offset: 0,
step: 3,
speed: 20,
noticeList: [],
notificationtext: "",
noticeTimer: null,
itemWidth: 0,
offset: 0,
step: 3,
speed: 20,
});
const data = reactive({});
@ -161,42 +162,42 @@
path: "/enforce/enforceNotice",
});
}
const queryList = () =>{
queryEnforcementInspectionProgramListNoPermission({},success =>{
console.log(success)
if(success.data.length > 4 ){
for (let i = 0; i < 1; i++) {
carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName)
// noticeStr += success.data[i].planName + " ";
// noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
}
noticeStr += success.data[0].planName != null ?success.data[0].planName + "":"";
}else{
carouselList = success.data;
for (let i = 0; i <= success.data.length; i++) {
// carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName);
}
noticeStr += success.data[0].planName != null ?success.data[0].planName + "":"";
}
freshMap.key = 1
console.log(carouselList);
// timerObj.timer = setInterval(flushMessage, 4000);
setNotificationMove();
},error =>{
const queryList = () => {
queryEnforcementInspectionProgramListNoPermission({}, success => {
console.log(success)
if (success.data.length > 4) {
for (let i = 0; i < 1; i++) {
carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName)
// noticeStr += success.data[i].planName + " ";
// noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
}
noticeStr += success.data[0].planName != null ? success.data[0].planName + "" : "";
} else {
carouselList = success.data;
})
for (let i = 0; i <= success.data.length; i++) {
// carouselList.push(success.data[i]);
noticeObj.noticeList.push(success.data[i].planName);
}
noticeStr += success.data[0].planName != null ? success.data[0].planName + "" : "";
}
freshMap.key = 1
console.log(carouselList);
// timerObj.timer = setInterval(flushMessage, 4000);
setNotificationMove();
}, error => {
})
}
const flushMessage =() =>{
timerObj.value++;
freshMap.key = timerObj.value;
if(carouselList.length == timerObj.value){
timerObj.value = 0;
}
freshMap.key = timerObj.value;
noticeStr = carouselList[timerObj.value].planName
const flushMessage = () => {
timerObj.value++;
freshMap.key = timerObj.value;
if (carouselList.length == timerObj.value) {
timerObj.value = 0;
}
freshMap.key = timerObj.value;
noticeStr = carouselList[timerObj.value].planName
}
//下拉刷新
@ -223,14 +224,16 @@
// getSzyptLoginAuth(route?.query?.code,success =>{
getSzyptLoginAuth(code, success => {
console.log(success.data)
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
if(useCommon.firstLoad){
isLoading.value = false;
if (null != success.data) {
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
}
//设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false)
queryList();
if (useCommon.firstLoad) {
isLoading.value = false;
}
//设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false)
queryList();
// 如果不是执法用户 则跳转
// if (!success.data.lawOfficer) {
// router.push(
@ -251,51 +254,51 @@
// queryList();
});
const setNotificationMove =()=>{
// 清除定时器
clearInterval(noticeObj.noticeTimer);
const notificationContainer = document.getElementById(
"notification-container"
);
const notificationWidth = notificationContainer.offsetWidth;
let index = 0;
// 播报内容赋值
noticeObj.notificationtext = noticeObj.noticeList[index];
const notification = document.getElementById("notification");
noticeObj.offset = notificationWidth;
// 初始化x轴平移距离
notification.style.transform = `translateX(${noticeObj.offset}px)`;
// 当前通知的宽度
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
noticeObj.noticeTimer = setInterval(() => {
noticeObj.offset -= noticeObj.step;
if (noticeObj.offset < -noticeObj.itemWidth) {
noticeObj.offset = notificationWidth;
if (index >= noticeObj.noticeList.length - 1) {
index = 0;
} else {
index++;
}
noticeObj.notificationtext = noticeObj.noticeList[index];
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
}
const setNotificationMove = () => {
// 清除定时器
clearInterval(noticeObj.noticeTimer);
const notificationContainer = document.getElementById(
"notification-container"
);
const notificationWidth = notificationContainer.offsetWidth;
let index = 0;
// 播报内容赋值
noticeObj.notificationtext = noticeObj.noticeList[index];
const notification = document.getElementById("notification");
noticeObj.offset = notificationWidth;
// 初始化x轴平移距离
notification.style.transform = `translateX(${noticeObj.offset}px)`;
}, noticeObj.speed);
// 当前通知的宽度
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
noticeObj.noticeTimer = setInterval(() => {
noticeObj.offset -= noticeObj.step;
if (noticeObj.offset < -noticeObj.itemWidth) {
noticeObj.offset = notificationWidth;
if (index >= noticeObj.noticeList.length - 1) {
index = 0;
} else {
index++;
}
noticeObj.notificationtext = noticeObj.noticeList[index];
noticeObj.itemWidth = noticeObj.notificationtext.length * 20;
}
notification.style.transform = `translateX(${noticeObj.offset}px)`;
}, noticeObj.speed);
}
const delayNoticeMove = () =>{
const notification = document.getElementById("notification");
let currentOffset = notification.style.transform;
if (currentOffset) {
currentOffset = currentOffset.split("(")[1];
currentOffset = currentOffset.substring(0, currentOffset.indexOf("px"));
let duration = ((Number(currentOffset) + noticeObj.itemWidth) / noticeObj.step) * noticeObj.speed;
// 判断当前还有多久滚动完毕 添加一个setTimeout等待滚动结束后重新计时
setTimeout(() => {
this.setNotificationMove();
}, duration);
} else {
this.setNotificationMove();
}
const delayNoticeMove = () => {
const notification = document.getElementById("notification");
let currentOffset = notification.style.transform;
if (currentOffset) {
currentOffset = currentOffset.split("(")[1];
currentOffset = currentOffset.substring(0, currentOffset.indexOf("px"));
let duration = ((Number(currentOffset) + noticeObj.itemWidth) / noticeObj.step) * noticeObj.speed;
// 判断当前还有多久滚动完毕 添加一个setTimeout等待滚动结束后重新计时
setTimeout(() => {
this.setNotificationMove();
}, duration);
} else {
this.setNotificationMove();
}
}
</script>
@ -308,14 +311,14 @@
background-color: #f4f4f4;
.warp_body {
position: relative;
margin: 0;
width: 100%;
height: 100%;
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
position: relative;
margin: 0;
width: 100%;
height: 100%;
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
.carousel_box {
height: 4rem;
@ -346,39 +349,40 @@
border-radius: 0.27rem;
.box-qr-code-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-qr-code::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
.box-qr-code::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_scan.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_scan.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
}
.box-info {
@ -390,39 +394,40 @@
border-radius: 0.27rem;
.box-info-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-info::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
.box-info::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_check.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_check.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
}
.box-complaint {
@ -434,40 +439,41 @@
border-radius: 0.27rem;
.box-complaint-text {
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
position: absolute;
z-index: 10;
top: 10%;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
}
.box-complaint::before {
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border-radius: 0.27rem;
content: "";
position: absolute;
top: -0.14rem;
left: -0.14rem;
z-index: 0;
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
.box-complaint::after {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_count.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
content: "";
position: absolute;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../assets/images/item_count.jpg") no-repeat left;
background-size: auto 100%;
border: 0.01rem solid #8db4ff;
}
.recommend_box {
@ -590,17 +596,21 @@
background: url("../assets/images/logo.png") no-repeat;
background-size: 100% auto;
}
.loading-div{
position: absolute;
top: 45%;
left: 48%;
.loading-div {
position: absolute;
top: 45%;
left: 48%;
}
.notice-bar-container {
margin-bottom: 0.27rem;
margin-bottom: 0.27rem;
}
.notice-bar-container:last-child {
margin-bottom: 0;
margin-bottom: 0;
}
/* .notification{
height: 100%;
font-size: 0.27rem;
@ -610,17 +620,17 @@
}*/
@media screen and (max-width: 380px) {
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
}
@media screen and (min-width: 540px) {
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
.home .warp_body {
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: 100% auto;
}
}
</style>

6
src/views/enterprise/complaint.vue
View File

@ -206,7 +206,7 @@
};
const submit = () => {
// console.log(submitData);
console.log(submitData);
addEnterpriseComplaint(submitData, success => {
@ -267,7 +267,6 @@
const uploadFiles = (file) => {
console.log(11111111)
uploadFile(file, (res) => {
console.log(res);
submitData.fileList.push(res.url)
@ -288,6 +287,9 @@
return true;
}
onMounted(() => {
console.log("================")
console.log(submitData.userId);
console.log("================")
submitData.relId = route?.query?.id;
submitData.lawEnforcementIncident = route?.query?.lawEnforcementItemText;
data.isSelect = route?.query?.isSelect;

981
src/views/enterprise/complaintNoScan.vue
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save