Browse Source

企业端 token修复

master
蟑螂恶霸 2 years ago
parent
commit
3805455a68
  1. 3
      src/common/globalRouter.js
  2. 2
      src/config/env.js
  3. 81
      src/views/Home.vue
  4. 48
      src/views/enforceHome.vue
  5. 6
      src/views/enterprise/complaint.vue
  6. 305
      src/views/enterprise/complaintNoScan.vue

3
src/common/globalRouter.js

@ -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

@ -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';

81
src/views/Home.vue

@ -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 => {
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 => {
console.log("error : " + error)
})
},
fail: function (err) {
console.log(err)
console.log("认证", err);
},
});
});
// 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)){

48
src/views/enforceHome.vue

@ -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>
@ -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();
@ -161,38 +162,38 @@
path: "/enforce/enforceNotice",
});
}
const queryList = () =>{
queryEnforcementInspectionProgramListNoPermission({},success =>{
const queryList = () => {
queryEnforcementInspectionProgramListNoPermission({}, success => {
console.log(success)
if(success.data.length > 4 ){
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{
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 + "":"";
noticeStr += success.data[0].planName != null ? success.data[0].planName + "" : "";
}
freshMap.key = 1
console.log(carouselList);
// timerObj.timer = setInterval(flushMessage, 4000);
setNotificationMove();
},error =>{
}, error => {
})
}
const flushMessage =() =>{
const flushMessage = () => {
timerObj.value++;
freshMap.key = timerObj.value;
if(carouselList.length == timerObj.value){
if (carouselList.length == timerObj.value) {
timerObj.value = 0;
}
freshMap.key = timerObj.value;
@ -223,9 +224,11 @@
// getSzyptLoginAuth(route?.query?.code,success =>{
getSzyptLoginAuth(code, success => {
console.log(success.data)
if (null != success.data) {
useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token);
if(useCommon.firstLoad){
}
if (useCommon.firstLoad) {
isLoading.value = false;
}
//
@ -251,7 +254,7 @@
// queryList();
});
const setNotificationMove =()=>{
const setNotificationMove = () => {
//
clearInterval(noticeObj.noticeTimer);
const notificationContainer = document.getElementById(
@ -282,7 +285,7 @@
notification.style.transform = `translateX(${noticeObj.offset}px)`;
}, noticeObj.speed);
}
const delayNoticeMove = () =>{
const delayNoticeMove = () => {
const notification = document.getElementById("notification");
let currentOffset = notification.style.transform;
if (currentOffset) {
@ -354,6 +357,7 @@
font-size: 0.5rem;
}
}
.box-qr-code::before {
content: "";
position: absolute;
@ -363,7 +367,7 @@
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
@ -398,6 +402,7 @@
font-size: 0.5rem;
}
}
.box-info::before {
content: "";
position: absolute;
@ -407,7 +412,7 @@
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
@ -443,6 +448,7 @@
}
}
}
.box-complaint::before {
content: "";
position: absolute;
@ -452,7 +458,7 @@
width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255,255,255,0.5);
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
@ -590,17 +596,21 @@
background: url("../assets/images/logo.png") no-repeat;
background-size: 100% auto;
}
.loading-div{
.loading-div {
position: absolute;
top: 45%;
left: 48%;
}
.notice-bar-container {
margin-bottom: 0.27rem;
}
.notice-bar-container:last-child {
margin-bottom: 0;
}
/* .notification{
height: 100%;
font-size: 0.27rem;

6
src/views/enterprise/complaint.vue

@ -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;

305
src/views/enterprise/complaintNoScan.vue

@ -31,7 +31,7 @@
placeholder="必填 请选择"
readonly
/>
<!-- <van-popup v-model:show="data.showPicker" position="bottom">
<!-- <van-popup v-model:show="data.showPicker" position="bottom">
<van-picker
v-model="data.selectTypeValue"
:columns="data.columns"
@ -39,7 +39,7 @@
@confirm="onConfirm"
/>
</van-popup>-->
<van-divider class="divdsty" />
<van-divider class="divdsty"/>
<van-field
v-model="submitData.problemDescription"
rows="5"
@ -52,12 +52,14 @@
:rules="[{ required: true, message: '请输入描述' }]"
show-word-limit
/>
<van-divider class="divdsty" />
<van-divider class="divdsty"/>
<div class="file-upload">
<div class="file-upload-center">
<label>上传附件</label> <span>(不多于9张)</span>
</div>
<van-uploader v-model="submitData.fileListObj" max-count="9" class="file" :after-read="uploadFiles" multiple @oversize="onOversize" :before-delete="deleteFile">
<van-uploader v-model="submitData.fileListObj" max-count="9" class="file"
:after-read="uploadFiles" multiple @oversize="onOversize"
:before-delete="deleteFile">
<template #preview-cover="{ file }">
<div class="preview-cover van-ellipsis">{{ file.name }}</div>
</template>
@ -100,53 +102,54 @@
<script setup name="register">
import { showSuccessToast} from 'vant';
import {addEnterpriseComplaint} from '../../api/enterprise'
import {getDict} from '../../api/Home'
import {uploadFile} from '../../util/fileUpload'
import { reactive, ref } from "vue";
const { useCommon, useMy } = $globalStore
const router = useRouter();
const route = useRoute();
let queryaddressId = ref("");
const data = reactive({
import {showSuccessToast} from 'vant';
import {addEnterpriseComplaint} from '../../api/enterprise'
import {getDict} from '../../api/Home'
import {uploadFile} from '../../util/fileUpload'
import {reactive, ref} from "vue";
const {useCommon, useMy} = $globalStore
const router = useRouter();
const route = useRoute();
let queryaddressId = ref("");
const data = reactive({
searchResult: [],
showPicker: false,
columns: [],
selectTypeValue : ref[0],
selectTypeValue: ref[0],
isSelect: false,
isCheckedon: true,
isCheckedoff: false
});
//
const submitData = reactive({
});
//
const submitData = reactive({
//id
userId:useCommon.userId,
userId: useCommon.userId,
//ID
relId:"",
relId: "",
//
lawEnforcementIncident:"",
lawEnforcementIncident: "",
//
enterpriseName:"",
enterpriseName: "",
//
enterpriseNumber:"",
enterpriseNumber: "",
//
enforceType:"",
enforceTypeText:"",
enforceType: "",
enforceTypeText: "",
//
problemDescription:"",
problemDescription: "",
//
linkman:"",
linkman: "",
//
linkmanTel:"",
linkmanTel: "",
//
authorization: 1,
//
fileList:[],
fileList: [],
//vant
fileListObj:[],
})
fileListObj: [],
})
//
@ -155,20 +158,20 @@ const goBack = () => {
router.push({ name: "Home" });
};
const validator = (val) => /^1[34578]\d{9}$/.test(val);
const validator = (val) => /^1[34578]\d{9}$/.test(val);
const onFailed = (errorInfo) => {
const onFailed = (errorInfo) => {
console.log('failed', errorInfo);
};
};
const submit = () =>{
const submit = () => {
// console.log(submitData);
showSuccessToast('投诉成功');
addEnterpriseComplaint(submitData,success =>{
addEnterpriseComplaint(submitData, success => {
console.log(success)
//
if(success.success){
if (success.success) {
// console.log("");
// Toast.loading('');
@ -176,62 +179,62 @@ const submit = () =>{
goBack();
}, 2000);
}
},error=>{
}, error => {
console.log("登记失败")
})
}
//
// const toast = showLoadingToast({
// duration: 0,
// forbidClick: true,
// message: '',
// });
// let second = 3;
// const timer = setInterval(() => {
// second--;
// if (second) {
// } else {
// clearInterval(timer);
// closeToast();
// }
// }, 1000);
//
const onSave = () => {
router.replace({ name: "addressList" });
};
}
//
// const toast = showLoadingToast({
// duration: 0,
// forbidClick: true,
// message: '',
// });
// let second = 3;
// const timer = setInterval(() => {
// second--;
// if (second) {
// } else {
// clearInterval(timer);
// closeToast();
// }
// }, 1000);
//
const onSave = () => {
router.replace({name: "addressList"});
};
const onConfirm = (value)=> {
const onConfirm = (value) => {
data.showPicker = false;
console.log(value)
submitData.enforceType = value.selectedValues[0];
submitData.enforceTypeText = value.selectedOptions[0].text;
}
const selectType = () =>{
}
const selectType = () => {
data.showPicker = true;
// console.log(data)
}
}
const selectCh =(val) => {
const selectCh = (val) => {
submitData.authorization = val;
if(val == 0) {
if (val == 0) {
data.isCheckedon = false;
data.isCheckedoff = true;
} else {
data.isCheckedon = true;
data.isCheckedoff = false;
}
}
}
const uploadFiles = (file) =>{
uploadFile(file,(res) =>{
const uploadFiles = (file) => {
uploadFile(file, (res) => {
console.log(res);
submitData.fileList.push(res.url)
console.log(submitData.fileList);
});
}
const deleteFile = (file,index) =>{
}
const deleteFile = (file, index) => {
// submitData.fileListObj.filter((item, indexs) => {
// if (index.index == indexs) {
// submitData.fileListObj.splice(indexs, 1);//splice
@ -243,8 +246,8 @@ const deleteFile = (file,index) =>{
}
});
return true;
}
onMounted(() => {
}
onMounted(() => {
console.log(route?.query?.id);
console.log(route?.query?.lawEnforcementIncident);
submitData.relId = route?.query?.id;
@ -262,14 +265,14 @@ onMounted(() => {
// })
submitData.enforceType = 3;
submitData.enforceTypeText = "入企不扫码";
});
});
</script>
<script>
//
import Popup from './caseFilter.vue';
//
import Popup from './caseFilter.vue';
export default {
export default {
components: {
Popup
},
@ -287,18 +290,19 @@ export default {
this.popupVisible = false;
}
}
}
}
</script>
<style lang="less" scoped>
.address_edit {
.address_edit {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
background-color: #ebf3fb;
}
.warp_body {
}
.warp_body {
margin: 2% 3%;
padding-bottom: 3rem;
width: 94%;
@ -306,51 +310,58 @@ export default {
//border-radius: 0.25rem;
background-image: linear-gradient(to bottom, #ebf3fb, #fff);
overflow-y: auto;
}
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast{
}
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast {
background: var(--van-toast-background) !important;
box-sizing: content-box !important;
/* 下面3条css,影响不大 */
transition: all var(--van-duration-fast) !important;
width: var(--van-toast-default-width) !important;
max-width: var(--van-toast-max-width) !important;
}
.van-popup.van-toast .van-toast__icon{
}
.van-popup.van-toast .van-toast__icon {
font-size: var(--van-toast-icon-size) !important;
}
.divdsty {
}
.divdsty {
margin: auto;
width: 100%;
height: 0.25rem;
background-color: #f4f4f4;
border: 0;
}
.file-upload {
}
.file-upload {
position: relative;
min-height: 4.2rem;
padding: 0.27rem 0.43rem;
box-sizing: border-box;
}
.file-upload-center {
}
.file-upload-center {
position: absolute;
height: 20%;
top: 10%;
left: 0.43rem;
font-size: 0.38rem;
span {
font-size: 0.32rem;
color: rgb(221, 229, 227);
}
}
.file {
}
.file {
position: absolute;
bottom: 10%;
left: 0.43rem;
width: calc(100% - 0.86rem);
}
}
.preview-cover {
.preview-cover {
position: absolute;
bottom: 0;
box-sizing: border-box;
@ -361,7 +372,8 @@ export default {
text-align: center;
background: rgba(0, 0, 0, 0.3);
}
.rigbtn {
.rigbtn {
float: right;
position: relative;
z-index: 1;
@ -371,8 +383,9 @@ export default {
color: #1367fe;
border-radius: 1rem;
font-size: 0.3rem;
}
.popup {
}
.popup {
position: fixed;
z-index: 999;
top: 3rem;
@ -381,9 +394,9 @@ export default {
height: calc(100% - 3rem);;
background: #fff;
overflow: hidden;
}
}
.popup-title {
.popup-title {
margin: 0.3rem 0 0;
width: 100%;
height: 1rem;
@ -391,9 +404,9 @@ export default {
text-align: center;
font-size: 0.45rem;
font-weight: 600;
}
}
.close-button {
.close-button {
position: absolute;
top: 0.15rem;
right: 0.1rem;
@ -403,10 +416,10 @@ export default {
border: 0.05rem solid rgba(255, 255, 255, .7);
border-radius: 50%;
transform: rotate(45deg);
}
}
.close-button:before,
.close-button:after {
.close-button:before,
.close-button:after {
content: '';
position: absolute;
top: 50%;
@ -416,28 +429,28 @@ export default {
transform: translate(-50%, -50%);
height: 0.4rem;
width: 0.02rem;
}
}
.close-button:after {
.close-button:after {
height: 0.02rem;
width: 0.4rem;
}
}
.popup-content {
.popup-content {
margin: 0.25rem 3% 0;
padding-bottom: 3rem;
width: 94%;
height: calc(100% - 1.6rem);
overflow-y: auto;
font-size: 0.38rem;
}
}
.subsearch {
.subsearch {
width: 100%;
height: 1.25rem;
}
}
.searchbox {
.searchbox {
margin: 2% 3%;
padding: 0.15rem 0.3rem 0.1rem 1.15rem;
width: 94%;
@ -446,23 +459,23 @@ export default {
background-position: left 0.5rem center;
background-size: auto 50%;
box-sizing: border-box;
border: 1px solid rgba(0,0,0,.05);
border: 1px solid rgba(0, 0, 0, .05);
border-radius: 0.5rem;
color: #999999;
outline: none;
}
}
.subtitle {
.subtitle {
margin: 0.5rem 0 0.25rem;
font-size: 0.4rem;
font-weight: 600;
}
}
.quick-item {
.quick-item {
display: flex;
}
}
.quick-item span {
.quick-item span {
display: inline-block;
margin: 1% 0 2% 3.5%;
padding: 2% 3.75%;
@ -470,23 +483,23 @@ export default {
border: 0;
border-radius: 8px;
color: #4c4c4c;
}
}
.quick-item span.seled {
.quick-item span.seled {
background: #e9f2fb;
color: #1367fe;
}
}
.btnbox {
.btnbox {
display: flex;
justify-content: center;
margin: 5% 2%;
width: 96%;
height: 1.0rem;
}
}
.btn-reset,
.btn-search {
.btn-reset,
.btn-search {
display: inline-block;
margin: 0 2%;
padding: 0;
@ -497,21 +510,21 @@ export default {
background: #1367fe;
border: 1px solid #1367fe;
text-align: center;
}
}
.btn-reset {
.btn-reset {
width: 35%;
background-color: #fff;
border-color: rgba(19, 103, 254, .7);
color: #1367fe;
}
}
.search-result {
.search-result {
width: 100%;
padding-bottom: 2rem;
}
}
.case-item {
.case-item {
margin: 3% 2%;
padding: 2% 0;
width: 96%;
@ -519,16 +532,16 @@ export default {
border-bottom: 1px solid #f4f4f4;
color: #999;
line-height: 2;
}
}
.case-title {
.case-title {
margin: 2% 0;
font-size: 0.42rem;
color: #333;
line-height: 1.25;
}
}
/deep/ .van-button {
/deep/ .van-button {
margin: 5% 3%;
padding: 0;
width: 94%;
@ -539,33 +552,33 @@ export default {
background: #1367fe;
border: 0.01rem solid #1367fe;
text-align: center;
}
}
/deep/ .van-action-bar {
/deep/ .van-action-bar {
box-shadow: 0 0 0.27rem #e5e5e5;
}
}
.agree-box {
.agree-box {
display: flex;
align-items: center;
height: 1.5rem;
}
}
.agree-box .remsty {
.agree-box .remsty {
margin: 0.5rem 0.5rem;
padding-left: 0.85rem;
background: url("../../assets/images/icon_remind.png") no-repeat left center;
background-size: auto 100%;
font-size: 0.5rem;
font-weight: 600;
}
}
.accept-item {
.accept-item {
display: flex;
align-items: center;
margin: 0 0.15rem;
font-size: 0.42rem;
}
}
.checksty {
margin: 0 0.25rem;

Loading…
Cancel
Save