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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/common/globalRouter.js
  2. 2
      src/config/env.js
  3. 81
      src/views/Home.vue
  4. 10
      src/views/enforceHome.vue
  5. 6
      src/views/enterprise/complaint.vue
  6. 15
      src/views/enterprise/complaintNoScan.vue

3
src/common/globalRouter.js
View File

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

2
src/config/env.js
View File

@ -1,6 +1,6 @@
//本地环境 //本地环境
// let baseUrl="http://139.186.135.156:86"; // 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://jdm.szssfj.cn/jdmApi";
// let baseUrl="http://127.0.0.1:85"; // let baseUrl="http://127.0.0.1:85";
// let wsUrl='ws://10.76.108.1:9326'; // let wsUrl='ws://10.76.108.1:9326';

81
src/views/Home.vue
View File

@ -172,51 +172,56 @@
const signature = sha1(str).toString().toLowerCase(); const signature = sha1(str).toString().toLowerCase();
//深i企鉴权测试 //深i企鉴权测试
getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
// getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => { // getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
// useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); console.log(success.data);
// 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_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId); useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
useCommon.SET_TOKEN(success.data.token);
console.log(useCommon.userId);
getEnterpriseMerchant(success.data.phonenumber.toString()); getEnterpriseMerchant(success.data.phonenumber.toString());
}, error => { }, error => {
console.log("error : " + error)
}) })
},
fail: function (err) { // w6s.config({
console.log(err) // access_key: access_key,
console.log("认证", err); // 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 =>{ // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
// if(!(success.data == null && success.data.length == 0)){ // if(!(success.data == null && success.data.length == 0)){

10
src/views/enforceHome.vue
View File

@ -75,6 +75,7 @@
import {Loading} from 'vant'; import {Loading} from 'vant';
import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home'; import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce"; import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
const isLoading = ref(true); const isLoading = ref(true);
const {useCommon} = $globalStore; const {useCommon} = $globalStore;
const router = useRouter(); const router = useRouter();
@ -223,8 +224,10 @@
// getSzyptLoginAuth(route?.query?.code,success =>{ // getSzyptLoginAuth(route?.query?.code,success =>{
getSzyptLoginAuth(code, success => { getSzyptLoginAuth(code, success => {
console.log(success.data) console.log(success.data)
if (null != success.data) {
useCommon.SET_USER_ID(success.data.userId); useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_TOKEN(success.data.token); useCommon.SET_TOKEN(success.data.token);
}
if (useCommon.firstLoad) { if (useCommon.firstLoad) {
isLoading.value = false; isLoading.value = false;
} }
@ -354,6 +357,7 @@
font-size: 0.5rem; font-size: 0.5rem;
} }
} }
.box-qr-code::before { .box-qr-code::before {
content: ""; content: "";
position: absolute; position: absolute;
@ -398,6 +402,7 @@
font-size: 0.5rem; font-size: 0.5rem;
} }
} }
.box-info::before { .box-info::before {
content: ""; content: "";
position: absolute; position: absolute;
@ -443,6 +448,7 @@
} }
} }
} }
.box-complaint::before { .box-complaint::before {
content: ""; content: "";
position: absolute; position: absolute;
@ -590,17 +596,21 @@
background: url("../assets/images/logo.png") no-repeat; background: url("../assets/images/logo.png") no-repeat;
background-size: 100% auto; background-size: 100% auto;
} }
.loading-div { .loading-div {
position: absolute; position: absolute;
top: 45%; top: 45%;
left: 48%; left: 48%;
} }
.notice-bar-container { .notice-bar-container {
margin-bottom: 0.27rem; margin-bottom: 0.27rem;
} }
.notice-bar-container:last-child { .notice-bar-container:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
/* .notification{ /* .notification{
height: 100%; height: 100%;
font-size: 0.27rem; font-size: 0.27rem;

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

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

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

@ -57,7 +57,9 @@
<div class="file-upload-center"> <div class="file-upload-center">
<label>上传附件</label> <span>(不多于9张)</span> <label>上传附件</label> <span>(不多于9张)</span>
</div> </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 }"> <template #preview-cover="{ file }">
<div class="preview-cover van-ellipsis">{{ file.name }}</div> <div class="preview-cover van-ellipsis">{{ file.name }}</div>
</template> </template>
@ -105,6 +107,7 @@ import {addEnterpriseComplaint} from '../../api/enterprise'
import {getDict} from '../../api/Home' import {getDict} from '../../api/Home'
import {uploadFile} from '../../util/fileUpload' import {uploadFile} from '../../util/fileUpload'
import {reactive, ref} from "vue"; import {reactive, ref} from "vue";
const {useCommon, useMy} = $globalStore const {useCommon, useMy} = $globalStore
const router = useRouter(); const router = useRouter();
@ -298,6 +301,7 @@ export default {
overflow: hidden; overflow: hidden;
background-color: #ebf3fb; background-color: #ebf3fb;
} }
.warp_body { .warp_body {
margin: 2% 3%; margin: 2% 3%;
padding-bottom: 3rem; padding-bottom: 3rem;
@ -307,6 +311,7 @@ export default {
background-image: linear-gradient(to bottom, #ebf3fb, #fff); background-image: linear-gradient(to bottom, #ebf3fb, #fff);
overflow-y: auto; overflow-y: auto;
} }
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast { .van-popup.van-toast {
background: var(--van-toast-background) !important; background: var(--van-toast-background) !important;
@ -316,9 +321,11 @@ export default {
width: var(--van-toast-default-width) !important; width: var(--van-toast-default-width) !important;
max-width: var(--van-toast-max-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; font-size: var(--van-toast-icon-size) !important;
} }
.divdsty { .divdsty {
margin: auto; margin: auto;
width: 100%; width: 100%;
@ -326,23 +333,27 @@ export default {
background-color: #f4f4f4; background-color: #f4f4f4;
border: 0; border: 0;
} }
.file-upload { .file-upload {
position: relative; position: relative;
min-height: 4.2rem; min-height: 4.2rem;
padding: 0.27rem 0.43rem; padding: 0.27rem 0.43rem;
box-sizing: border-box; box-sizing: border-box;
} }
.file-upload-center { .file-upload-center {
position: absolute; position: absolute;
height: 20%; height: 20%;
top: 10%; top: 10%;
left: 0.43rem; left: 0.43rem;
font-size: 0.38rem; font-size: 0.38rem;
span { span {
font-size: 0.32rem; font-size: 0.32rem;
color: rgb(221, 229, 227); color: rgb(221, 229, 227);
} }
} }
.file { .file {
position: absolute; position: absolute;
bottom: 10%; bottom: 10%;
@ -361,6 +372,7 @@ export default {
text-align: center; text-align: center;
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
} }
.rigbtn { .rigbtn {
float: right; float: right;
position: relative; position: relative;
@ -372,6 +384,7 @@ export default {
border-radius: 1rem; border-radius: 1rem;
font-size: 0.3rem; font-size: 0.3rem;
} }
.popup { .popup {
position: fixed; position: fixed;
z-index: 999; z-index: 999;

Write Preview
Loading…
Cancel
Save