From 033c368cf84fa0ace2803a68290aa9c9008e396f Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Fri, 26 Apr 2024 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1i=E4=BC=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Home.js                               |  4 ++++
 src/views/Home.vue                            | 14 ++++++++----
 src/views/administrative/appointment.vue      |  8 +++----
 src/views/administrative/appointmentEdit.vue  |  2 +-
 src/views/administrative/appointmentList.vue  | 22 +++++++++++++++----
 src/views/enforce/userFilter.vue              |  2 +-
 src/views/enterprise/caseFilter.vue           |  2 +-
 .../enterprise/enterpriseInspectionList.vue   | 17 ++++++++++++++
 src/views/enterprise/registrationList.vue     |  2 +-
 9 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/api/Home.js b/src/api/Home.js
index 1004d2c..ef928bc 100644
--- a/src/api/Home.js
+++ b/src/api/Home.js
@@ -10,3 +10,7 @@ export const getDict = (params, success, error) => _get("/system/dict/data/query
 //查询用户关联企业授权信息
 export const getEnterpriseMerchantAuthorization = (params, success, error) => _get("/code/authorization/queryList",params,success,error);
 
+//深i企登录
+export const getSiqLoginAuth = (params, success, error) => _get("/thirdLogin/siqLogin",params,success,error);
+
+
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 67cc7cf..ed2d7d3 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -47,12 +47,11 @@
 </template>
 
 <script setup name="Home">
-import {getEnterpriseMerchantAuthorization} from '../api/Home';
+import {getEnterpriseMerchantAuthorization,getSiqLoginAuth} from '@/api/Home';
 const { useCommon } = $globalStore;
 const router = useRouter();
+const route = useRoute();
 let carouselList = reactive([]); // 轮播列表
-let boutique = reactive([]); // 精品数据
-let recommend = reactive([]); // 推荐
 let freshMap = reactive({
 	refreshLoad: false, // 是否刷新
 	listLoading: false, // 是否加载中
@@ -122,7 +121,14 @@ const onLoad = () => {
 };
 
 onMounted(() => {
-  console.log(useCommon.phonenumber)
+  // console.log(useCommon.phonenumber)
+  // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
+  // useCommon.SET_USER_ID(success.data.userId);
+  getSiqLoginAuth({userId:"",userName:""},success =>{
+      console.log(success.data)
+  },error =>{
+
+  })
   getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
     console.log(success)
         if(!(success.data == null && success.data.length == 0)){
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 936aea9..f85832d 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -276,7 +276,7 @@ const dataFillIn = () => {
             data.checkRequireText =success.data['params'].checkRequireText;
             submitData.lawEnforcerText =success.data['lawEnforcer'];
             submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
-            showSuccessToast('保存成功');
+            // showSuccessToast('保存成功');
         }
     },error=>{
         console.log("保存失败")
@@ -284,7 +284,7 @@ const dataFillIn = () => {
 }
 
 const tmpSave = () => {
-    showSuccessToast('临时保存');
+    // showSuccessToast('临时保存');
     addEnterpriseLawEnforcement(submitData,success =>{
         //跳转企业二维码地址
         if(success.success){
@@ -300,7 +300,7 @@ const tmpSave = () => {
 }
 
 const submit112 = () =>{
-  showSuccessToast('登记成功');
+  // showSuccessToast('登记成功');
   editEnterpriseLawEnforcement(submitData,success =>{
     //跳转企业二维码地址
     if(success.success){
@@ -353,7 +353,7 @@ const getLinkageByParentIdToGA = (parentId) => {
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
     // 数据填充
-    dataFillIn();
+    // dataFillIn();
 
     //查询当前登录人员信息
     queryUserInfo({},success =>{
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index d9d7e90..4bf8bc7 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -278,7 +278,7 @@
                 data.checkRequireText =success.data['params'].checkRequireText;
                 submitData.lawEnforcerText =success.data['lawEnforcer'];
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
-                showSuccessToast('保存成功');
+                // showSuccessToast('保存成功');
             }
         },error=>{
             console.log("保存失败")
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 3d5aff8..44bb91e 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -225,10 +225,7 @@
 
 	const goAdd = () => {
 		router.push({
-			path: "/appointment",
-			query: {
-				enterpriseNumber: "123",
-			}
+			path: "/appointment"
 		});
 	}
 
@@ -456,5 +453,22 @@ const formattedTime = (dateTime) =>{
 			right: 1%;
 		}
 	}
+  /deep/ .van-hairline--bottom {
+  margin: 0 0 2% 0;
+  height: 0;
+  background-color: transparent;
+  border: 1px;
+}
 
+/deep/ .card_box_span:first-child {
+  color: #c1bfbf;
+}
+
+/deep/ .card_box_span:nth-child(2) p {
+  font-size: 0.4rem;
+  font-weight: bold;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue
index 85afc53..933022d 100644
--- a/src/views/enforce/userFilter.vue
+++ b/src/views/enforce/userFilter.vue
@@ -51,7 +51,7 @@ export default {
     }
   },
   created(){
-      this.queryList()
+      // this.queryList()
   },
   methods: {
     closePopup() {
diff --git a/src/views/enterprise/caseFilter.vue b/src/views/enterprise/caseFilter.vue
index db3240b..d0fcf5a 100644
--- a/src/views/enterprise/caseFilter.vue
+++ b/src/views/enterprise/caseFilter.vue
@@ -108,8 +108,8 @@
   </div>
   </div>
 </template>
-
 <script>
+
 import { ref } from 'vue'
 import {queryRegistrationList} from '../../api/enterprise'
 import {queryLinkageDictByValueAndParentId,queryLinkage,queryLinkageById} from '@/api/linkage'
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index b07e49d..af9e4a7 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -418,5 +418,22 @@ const cancelSelectDate = () =>{
         right: 1%;
     }
 }
+/deep/ .van-hairline--bottom {
+  margin: 0 0 2% 0;
+  height: 0;
+  background-color: transparent;
+  border: 1px;
+}
+
+/deep/ .card_box_span:first-child {
+  color: #c1bfbf;
+}
 
+/deep/ .card_box_span:nth-child(2) p {
+  font-size: 0.4rem;
+  font-weight: bold;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 7af8e6c..e2adfd8 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -63,7 +63,7 @@
                   <div  style="border-color: aqua; border: 2px;" class="van-hairline--bottom"></div>
                   <div @click="toDetailView(item.id)">
                       <div class="card_box_span">
-                        <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
+                        <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItemText }}</p>
                       </div>
                       
                       <div class="card_box_span">