From de75495bfdf4af6eace6608b370a0c42c174befe Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 20 Jun 2024 18:42:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/refresh-list/index.vue | 2 +- src/http/http.js | 6 +- src/store/Common.js | 8 +- src/views/Home.vue | 102 +++++++++--------- src/views/administrative/deptFilter.vue | 2 +- src/views/enforce/sign.vue | 8 +- src/views/enforceHome.vue | 30 ++++-- src/views/enterprise/caseFilter.vue | 6 +- src/views/enterprise/complaint.vue | 75 +++++++++++-- .../enterprise/enterpriseInspectionList.vue | 4 +- src/views/enterprise/qrCode.vue | 7 +- src/views/enterprise/registrationDetail.vue | 4 +- src/views/enterprise/registrationList.vue | 2 +- 13 files changed, 173 insertions(+), 83 deletions(-) diff --git a/src/components/refresh-list/index.vue b/src/components/refresh-list/index.vue index 7095cae..ab4bef4 100644 --- a/src/components/refresh-list/index.vue +++ b/src/components/refresh-list/index.vue @@ -11,7 +11,7 @@ v-model:loading="data.freshData.listLoading" :finished="data?.freshData?.listFinished" :immediate-check="true" - :finished-text="finishedText" + @load="onLoad" :offset="20" > diff --git a/src/http/http.js b/src/http/http.js index 9ca7bde..f4fc7dd 100644 --- a/src/http/http.js +++ b/src/http/http.js @@ -7,7 +7,7 @@ import { $globalStore } from "../common/globalStore" const http = axios.create({ traditional: true, contentType : "application/json", - timeout: 1000 * 1000, // 1 秒 + timeout: 1000 * 500000, // 1 秒 }); const router = useRouter(); //请求拦截器添加head @@ -16,7 +16,9 @@ http.interceptors.request.use( if(!config.headers['Content-Type']){ config.headers['Content-Type'] = 'application/json' } - config.headers['token'] = $globalStore.useCommon.token + config.headers['token'] = $globalStore.useCommon.token; + // config.headers['dataScopeId'] = $globalStore.useCommon.userId; + return config }, err => { diff --git a/src/store/Common.js b/src/store/Common.js index 0eb870e..a9386e5 100644 --- a/src/store/Common.js +++ b/src/store/Common.js @@ -16,7 +16,9 @@ export default defineStore('useCommon', { // token token: "", //当前登录用户的手机号 - phonenumber:"" + phonenumber:"", + //是否初始化加载 + firstLoad: true }), getters: {}, actions: { @@ -48,6 +50,10 @@ export default defineStore('useCommon', { SET_TOKEN(data){ this.token = data; }, + //设置用户token + SET_IS_FIRST_LOAD(data){ + this.firstLoad = data; + }, //设置用户手机号码 SET_USER_PHONENUMBER(data){ this.phonenumber = data; diff --git a/src/views/Home.vue b/src/views/Home.vue index 0be5572..293c6bb 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -147,7 +147,7 @@ onMounted(() => { // console.log(useCommon.phonenumber) // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber); - // new Vconsolefrom(); + new Vconsolefrom(); const access_key = '6374106c5eb449a4ad6c2430f30796e6'; const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; @@ -163,52 +163,58 @@ const signature = sha1(str).toString().toLowerCase(); // //深i企鉴权测试 - // getSiqLoginAuthTest({userId: "1608644307579883522", 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); - }, - }); - }); + getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"},success =>{ + useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); + useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); + useCommon.SET_TOKEN(success.data.token); + console.log("phone : "+useCommon.phonenumber); + console.log("token : "+useCommon.token); + 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 临时工 + // if(useCommon.phonenumber != '' || useCommon.phonenumber != null){ + // 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)){ @@ -237,7 +243,7 @@ background-size: auto 100%; overflow-x: hidden; overflow-y: auto; - + margin-top: 0%; .carousel_box { height: 4rem; width: 100%; diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue index 2705f7b..aef309f 100644 --- a/src/views/administrative/deptFilter.vue +++ b/src/views/administrative/deptFilter.vue @@ -83,7 +83,7 @@ }) }, cancel() { - this.searchParam.userName = ''; + this.searchParam.deptName = ''; this.queryList() }, selectData() { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index de21190..aaa21ba 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -64,7 +64,7 @@ readonly label="检查事项" :rules="[{ required: true, message: '必填项' }]" - placeholder="必填 执法事项" + placeholder="执法事项" @click="data.showItem = true" type="textarea" rows="1" @@ -77,7 +77,7 @@ readonly :rules="[{ required: true, message: '必填项' }]" label="检查依据" - placeholder="必填 执法依据" + placeholder="执法依据" @click="showPopupqz" type="textarea" rows="1" @@ -143,14 +143,14 @@ required label="企业名称" :rules="[{ required: true, message: '必填项' }]" - placeholder="必填 企业名称" + placeholder="企业名称" /> diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index 3b52c38..d7feef5 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -89,7 +89,7 @@ key: 0, }); // 模拟异步数据加载 - setTimeout(() => { + // setTimeout(() => { // // 如果不是执法用户 则跳转 // router.push( @@ -98,7 +98,7 @@ // }); isLoading.value = false; - }, 3000); + // }, 3000); //定时器 let noticeObj = reactive({ @@ -215,14 +215,22 @@ }; onMounted(() => { - // new Vconsolefrom(); + new Vconsolefrom(); let fullUrl = window.location.href; let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state=')); + console.log(useCommon.firstLoad) + isLoading.value = useCommon.firstLoad; // 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; + } + //设置已经初始化 + useCommon.SET_IS_FIRST_LOAD(false) + queryList(); // 如果不是执法用户 则跳转 // if (!success.data.lawOfficer) { // router.push( @@ -234,13 +242,13 @@ }, error => { }) - getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => { - if (!(success.data == null && success.data.length == 0)) { - useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber); - } - }, error => { - }) - queryList(); + // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => { + // if (!(success.data == null && success.data.length == 0)) { + // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber); + // } + // }, error => { + // }) + // queryList(); }); const setNotificationMove =()=>{ diff --git a/src/views/enterprise/caseFilter.vue b/src/views/enterprise/caseFilter.vue index e25c2f2..744677c 100644 --- a/src/views/enterprise/caseFilter.vue +++ b/src/views/enterprise/caseFilter.vue @@ -9,7 +9,7 @@
- +
- - + --> + + +
@@ -108,14 +113,14 @@ @@ -124,6 +129,9 @@ 同意 不同意 +
+ 注：选择“同意”，处置部门将通过登记的联系人联系电话与您联系，并对您的个人信息严格保密。 +
@@ -141,7 +149,7 @@ import {getDict} from '../../api/Home' import {uploadFile} from '../../util/fileUpload' import {reactive, ref} from "vue"; - + import * as w6s from 'szient-js-sdk'; const {useCommon, useMy} = $globalStore const router = useRouter(); @@ -259,6 +267,7 @@ const uploadFiles = (file) => { + console.log(11111111) uploadFile(file, (res) => { console.log(res); submitData.fileList.push(res.url) @@ -308,6 +317,48 @@ submitData.lawEnforcementIncident = item.lawEnforcementItem; submitData.relId = item.id; } + const getAddressInfo = () =>{ + console.log(url); + const access_key = '6374106c5eb449a4ad6c2430f30796e6'; + const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; + // generateRandomNumber() + const nonce = "887954"; + const timestamp = `${Date.now()}`; + + const str = [access_secret, nonce, timestamp] + .sort() + .reduce((str, item) => str += item, ''); + + // 最终还需要转成全小写 + const signature = sha1(str).toString().toLowerCase(); + var siqObject = { + access_key: access_key, + nonce: nonce, + timestamp: timestamp, + signature: signature, + }; + console.log(siqObject); + //深i企鉴权 + w6s.config(siqObject) + .then((res) => { + // 成功 + console.log("鉴权成功",res); + w6s.ready(() => { + w6s.location.getLocation({ + success: function(res) { + console.log(res) + }, + fail: function(err) {}, + }); + }); + + }) + .catch((err) => { + // 失败 + // console.log(err) + console.log("鉴权失败",err); + }); + }