Merge remote-tracking branch 'origin/master'

src/api/Home.js

@@ -12,5 +12,9 @@ export const getEnterpriseMerchantAuthorization = (params, success, error) => _g
 
 //深i企登录
 export const getSiqLoginAuth = (params, success, error) => _post("/app/thirdLogin/siqLogin",params,success,error);
+export const getSiqLoginAuthTest = (params, success, error) => _post("/app/thirdLogin/siqLoginTest",params,success,error);
+
+// 深圳易平台登录
+export const getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error);
 
 

src/api/enforce.js

@@ -31,7 +31,7 @@ export const addEnforcementInspectionProgram = (params, success, error) =>_post(
 //保存执法信息登记
 export const addEnforcementRegistration = (params, success, error) => _post("/app/code/registration/add",params,success,error)
 export const editEnforcementRegistration = (params, success, error) => _post("/app/code/registration/edit",params,success,error)
-export const getRegByUserIdAndZero = (id, success, error) => _get("/app/code/registration/getByUserIdAndZero",null,success,error)
+export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error)
 export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error)
 
 //查询历史检查信息

src/api/enterprise.js

@@ -4,7 +4,7 @@ import { _get, _post,_form,_delete } from "../http/index";
 export const addEnterpriseInformation = (params, success, error)  => _post("/app/enterpriseInformation/add", params, success, error);
 
 //查询企业二维码
-export const queryEnterpriseInformationQrCode = (params, success, error) => _get("/app/enterpriseInformation/getQrCode",params,success,error)
+export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get("/app/enterpriseInformation/getQrCode/"+enterpriseNumber,null,success,error)
 
 //查询企业执法登记列表
 export const queryRegistrationList = (params, success, error) => _get("/app/code/registration/queryList",params,success,error)

src/views/Home.vue

@@ -1,9 +1,9 @@
 <template>
 	<div class="home app_content">
 		<!-- 导航栏 -->
-		<div class="header_body">
-			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
-		</div>
+<!--		<div class="header_body">-->
+<!--			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
+<!--		</div>-->
 
 		<!-- 中间 -->
 		<div class="warp_body">
@@ -50,7 +50,7 @@
  import Vconsolefrom from 'vconsole';
 import * as w6s from 'szient-js-sdk';
 import sha1 from 'crypto-js/sha1';
-import {getEnterpriseMerchantAuthorization,getSiqLoginAuth} from '../api/Home';
+import {getEnterpriseMerchantAuthorization,getSiqLoginAuth, getSiqLoginAuthTest} from '../api/Home';
 const { useCommon } = $globalStore;
 const router = useRouter();
 const route = useRoute();
@@ -84,7 +84,7 @@ const boutiqueGoods = async () => {
 };
 
 const toRegisterView = async() =>{
-  console.log(useCommon.phonenumber);
+  console.log(useCommon.enterpriseNumber);
   if(useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == ""){
         router.push({ path: "/enterprise/register" });
       }else{
@@ -137,7 +137,7 @@ onMounted(() => {
   const access_key = '6374106c5eb449a4ad6c2430f30796e6';
   const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
   // generateRandomNumber()
-  const nonce = generateRandomNumber;
+  const nonce = generateRandomNumber();
   const timestamp = `${Date.now()}`;
 
   const str = [access_secret, nonce, timestamp]
@@ -146,7 +146,13 @@ onMounted(() => {
 
   // 最终还需要转成全小写
   const signature = sha1(str).toString().toLowerCase();
-  //深i企鉴权
+
+  // //深i企鉴权
+	getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"},success =>{
+		console.log(success.data)
+		useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
+	},error =>{})
+
   w6s.config({
     access_key: access_key,
     nonce: nonce,
@@ -183,17 +189,12 @@ onMounted(() => {
   });
 });
 
-  // getSiqLoginAuth({code:""},success =>{
-  //     console.log(success.data)
-  // },error =>{
-
-  // })
-  // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
-  //       if(!(success.data == null && success.data.length == 0)){
-  //         useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
-  //       }
-  //     },error =>{
-  //  })
+  getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
+        if(!(success.data == null && success.data.length == 0)){
+          useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+        }
+      },error =>{
+   })
 });
 </script>
 

src/views/administrative/appointmentEdit.vue

@@ -358,7 +358,7 @@
         dataFillIn(route?.query?.id);
 
         //查询当前登录人员信息
-        queryUserInfo({},success =>{
+        queryUserInfo(useCommon.userId,success =>{
             console.log(success.data)
             submitData.lawEnforcer = success.data.userName;
             submitData.lawCertificateNum = success.data.lawCertificateNum

src/views/enforce/enforcementPlanAdd.vue

@@ -102,7 +102,7 @@ import {getDict} from '../../api/Home'
 import {uploadFile} from '../../util/fileUpload'
 import { reactive, ref } from "vue";
 import { showConfirmDialog } from 'vant';
-const { useMy } = $globalStore
+const { useCommon, useMy } = $globalStore;
 
 const router = useRouter();
 const route = useRoute();
@@ -260,7 +260,7 @@ onMounted(() => {
 
   })
   //查询企业信息
-  queryUserInfo({},success =>{
+  queryUserInfo(useCommon.userId,success =>{
       submitData.enforcementDepartment = success.data.dept.deptName;
       submitData.enforcementDepartmentId = success.data.dept.deptId;
     },error=>{

src/views/enforce/sign.vue

@@ -169,7 +169,7 @@ import {getDict} from "../../api/Home";
 import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
 import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";
 
-const { useMy } = $globalStore
+const { useCommon,useMy } = $globalStore
 
 const router = useRouter();
 //路由参数
@@ -224,7 +224,7 @@ const submitData = reactive({
     //统一信用码
     enterpriseNumber:"",
     //执法时间
-    enforcementTime:"",
+    enforcementTime:formattedTime(new Date()),
     //后台保存图片列表
     fileList:[],
     //vant组件上传照片列表
@@ -282,7 +282,7 @@ const getLinkageByParentIdToGA = (parentId) => {
 //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
-    dataFillIn();
+    // dataFillIn();
 
     //查询企业信息
     getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
@@ -294,7 +294,7 @@ onMounted(() =>{
 
     })
     //查询执法部门信息
-    queryUserInfo({},success =>{
+    queryUserInfo(useCommon.userId,success =>{
         if (null != success.data) {
             submitData.lawEnforcer = success.data.userName
             submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
@@ -371,15 +371,17 @@ const gaCancel = () => {
 /* 检查要求 end */
 
 const dataFillIn = () => {
-    getRegByUserIdAndZero(null,success =>{
+    getRegByUserIdAndZero(useCommon.userId,success =>{
         //跳转企业二维码地址
         if(success.success){
             Object.keys(submitData).forEach((item) => {
-                submitData[item] = success.data[item] ? success.data[item] : "";
+                if ("lawEnforcement"!=item && "lawCertificateNumText"!=item && "enforcementTime"!=item) {
+                    submitData[item] = success.data[item] ? success.data[item] : "";
+                }
             })
             data.lawEnforcementItemText =success.data['params'].lawEnforcementItemText;
             data.lawEnforcementBasisText =success.data['params'].lawEnforcementBasisText;
-            submitData.lawCertificateNumText =success.data['lawEnforcer'];
+            // submitData.lawCertificateNumText =success.data['lawEnforcer'];
             submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo'];
             submitData.subsidiaryerText =success.data['subsidiaryer'];
             if(success.data['reslut']==0) {

src/views/enforceHome.vue

@@ -49,9 +49,10 @@
 </template>
 
 <script setup name="Home">
-import {getEnterpriseMerchantAuthorization} from '../api/Home';
+	import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
 const { useCommon } = $globalStore;
 const router = useRouter();
+const route = useRoute();
 let carouselList = reactive([]); // 轮播列表
 let boutique = reactive([]); // 精品数据
 let recommend = reactive([]); // 推荐
@@ -125,6 +126,12 @@ const onLoad = () => {
 };
 
 onMounted(() => {
+	console.log("code: "+route?.query?.code);
+	getSzyptLoginAuth(route?.query?.code,success =>{
+		console.log(success.data)
+	},error =>{
+
+	})
   getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
         if(!(success.data == null && success.data.length == 0)){
           useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);

src/views/enterprise/enterpriseInspectionList.vue

@@ -2,9 +2,9 @@
 <template>
 	<div class="shop app_content">
 		<!-- 导航栏 -->
-		<div class="header_body">
-      <header-nav :leftArrow="false" titelText="行政检查通知"></header-nav>
-		</div>
+<!--		<div class="header_body">-->
+<!--            <header-nav :leftArrow="false" titelText="行政检查通知"></header-nav>-->
+<!--		</div>-->
     <van-search
     v-model="searchParam.searchValue"
     show-action

src/views/enterprise/qrCode.vue

@@ -59,7 +59,7 @@ const goBack = () => {
 onMounted(() => {
 	console.log(route?.query?.enterpriseNumber);
 
-  queryEnterpriseInformationQrCode({"enterpriseNumber": route?.query?.enterpriseNumber}
+  queryEnterpriseInformationQrCode(route?.query?.enterpriseNumber
   ,success =>{
       console.log(success)
       if(success.success){

src/views/enterprise/registrationEdit.vue

@@ -169,7 +169,7 @@
     import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
     import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";
 
-    const { useMy } = $globalStore
+    const { useCommon,useMy } = $globalStore
 
     const router = useRouter();
     //路由参数
@@ -294,7 +294,7 @@
 
         })
         //查询执法部门信息
-        queryUserInfo({},success =>{
+        queryUserInfo(useCommon.userId,success =>{
             if (null != success.data) {
                 submitData.lawEnforcer = success.data.userName
                 submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum

src/views/login.vue

@@ -43,8 +43,8 @@ const onSubmit = async (values) => {
   // return;
   userLogin(values,success=>{
     console.log(success);
-        // router.push({ name: "Home" });
-        router.push({ name: "enforceHome" });
+        router.push({ name: "Home" });
+        // router.push({ name: "enforceHome" });
         //设置全局变量
         useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
         useCommon.SET_USER_ID(success.data.userId);