提交前端代码

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

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 => {

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;

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 =>{
+        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 => {
-                        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_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 => {
+        },error =>{})
-                        console.log("error : " + error)
+
-                    })
+        // w6s.config({
-                },
+        //     access_key: access_key,
-                fail: function (err) {
+        //     nonce: nonce,
-                    console.log(err)
+        //     timestamp: timestamp,
-                    console.log("认证", err);
+        //     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%;

src/views/administrative/deptFilter.vue

@@ -83,7 +83,7 @@
                 })
             },
             cancel() {
-                this.searchParam.userName = '';
+                this.searchParam.deptName = '';
                 this.queryList()
             },
             selectData() {

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="企业名称"
                     />
                     <van-field
                             v-model="submitData.enterpriseNumber"
                             required
                             label="统一社会信用代码"
                             :rules="[{ required: true, message: '必填项' }]"
-                            placeholder="必填 统一社会信用代码"
+                            placeholder="统一社会信用代码"
                     />
                 </van-cell-group>
 

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 => {
+        // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => {
-            if (!(success.data == null && success.data.length == 0)) {
+        //     if (!(success.data == null && success.data.length == 0)) {
-                useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+        //         useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
-            }
+        //     }
-        }, error => {
+        // }, error => {
-        })
+        // })
-        queryList();
+        // queryList();
  
     });
     const setNotificationMove =()=>{

src/views/enterprise/caseFilter.vue

@@ -9,7 +9,7 @@
         <div class="popup-content">
             <!--      {{ content }}-->
             <div class="subsearch">
-                <input v-model="searchParam.searchValue" class="searchbox" placeholder="执法部门/执法人员" name="keyword" id="" onclick="">
+                <input v-model="searchParam.searchValue" class="searchbox" placeholder="请输入关键字查询" name="keyword" id="" onclick="">
             </div>
             <!-- <div class="subtitle">快捷筛选</div>
             <div class="quick-item">
@@ -49,13 +49,14 @@
                         @confirm="onConfirm"
                 />
             </van-popup>
-            <div class="subtitle">自定义时段</div>
+            <div class="subtitle">执法时间</div>
             <van-cell-group>
                 <van-field
                         label="开始时间"
                         placeholder="请选择"
                         clickable
                         is-link
+                        readonly
                         @click="selectDate"
                         v-model="date.beginTime"
                 />
@@ -75,6 +76,7 @@
                         placeholder="请选择"
                         clickable
                         is-link
+                        readonly
                         @click="selectEndDate"
                         v-model="date.endTime"
                 />

src/views/enterprise/complaint.vue

@@ -18,7 +18,7 @@
                     <van-field
                             v-model="submitData.lawEnforcementIncident"
                             label="投诉案件"
-                            placeholder="必填 请选择"
+                            placeholder="请选择"
                             readonly
                             required
                             :rules="[{ required: true, message: '请选择投诉案件' }]"
@@ -31,7 +31,7 @@
                     <van-field
                             v-model="submitData.lawEnforcementIncident"
                             label="投诉案件"
-                            placeholder="必填 请选择"
+                            placeholder="请选择"
                             readonly
                             required
                             :rules="[{ required: true, message: '请选择投诉案件' }]"
@@ -82,11 +82,16 @@
                     <!--              <div class="preview-cover van-ellipsis">{{ file.name }}</div>-->
                     <!--            </template>-->
                     <!--          </van-uploader>-->
-                    <van-uploader v-model="submitData.fileListObj" max-count="9" class="file" multiple
+                    <!-- <van-uploader v-model="submitData.fileListObj" max-count="9" class="file" multiple
                                   :after-read="uploadFiles" :before-delete="deleteFile">
                         <template #preview-cover="{ file }">
                             <div class="preview-cover van-ellipsis">{{ file.name }}</div>
                         </template>
+                    </van-uploader> -->
+                    <van-uploader v-model="submitData.fileListObj" class="file" multiple max-count="9" :after-read="uploadFiles" :before-delete="deleteFile">
+                            <template #preview-cover="{ file }">
+                                <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+                            </template>
                         </van-uploader>
 
                 </div>
@@ -108,14 +113,14 @@
                 <van-field
                         v-model="submitData.linkman"
                         label="联系人"
-                        placeholder="必填 联系人"
+                        placeholder="联系人"
                         required
                         :rules="[{ required: true, message: '请填写联系人' }]"
                 />
                 <van-field
                         v-model="submitData.linkmanTel"
                         label="联系方式"
-                        placeholder="必填 联系方式"
+                        placeholder="联系方式"
                         required
                         :rules="[{ validator, message: '请输入正确内容' }]"
                 />
@@ -124,6 +129,9 @@
                     <span class="accept-item"><input class="checksty" type="checkbox" name="" value="" v-model="data.isCheckedon" @click="selectCh(1)">同意</span>
                     <span class="accept-item"><input class="checksty" type="checkbox" name="" value="" v-model="data.isCheckedoff" @click="selectCh(0)">不同意</span>
                 </div>
+                <div class="agree-remark">
+                    <span class="accept-item">注：选择“同意”，处置部门将通过登记的联系人联系电话与您联系，并对您的个人信息严格保密。</span>
+                </div>
             </van-cell-group>
             <van-action-bar>
 <!--                <van-action-bar-button color="#1367fe" text="提交" @click="submit"/>-->
@@ -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);
+        });
+    }
 
 </script>
 <script>
@@ -624,6 +675,16 @@
         width: 0.5rem;
         height: 0.5rem;
     }
+    .agree-remark {
+      .accept-item {
+        font-size: 0.3rem;
+        padding: 0px 10px;
+        width: 80%;
+        color: #969799
+    }
+    height: 1.4rem;
+      
+    }
 
     /deep/ .van-button {
         margin: 5% 3%;

src/views/enterprise/enterpriseInspectionList.vue

@@ -7,7 +7,7 @@
         <van-search
                 v-model="searchParam.searchValue"
                 show-action
-                placeholder="执法事项/执法部门/企业名称 "
+                placeholder="请输入关键字查询"
                 @search="onSearch"
         >
             <template #action>
@@ -263,7 +263,7 @@
 
     // 触底加载
     const onLoad = () => {
-        freshMap.listFinished = true;
+        freshMap.listFinished = false;
         getGoodslist(true);
     };
 

src/views/enterprise/qrCode.vue

@@ -81,6 +81,7 @@ const downloadFile = (url) => {
       document.body.removeChild(a) // 下载完成移除元素
 }
 const download = (url) =>{
+  console.log(url);
     //  let e = this.$refs.toast;
     // debugger
     //  html2canvas(document.getElementById('download-images'), {
@@ -138,6 +139,10 @@ const download = (url) =>{
   w6s.image.saveImages({
       url: url,
     });
+    w6s.dialog.showToast({
+      title: '二维码下载中，请稍后...',
+      duration: 3000, // 毫秒数
+    });
 });   
 
   })

src/views/enterprise/registrationDetail.vue

@@ -45,7 +45,7 @@
                       required
                       label="检查事项"
                       :rules="[{ required: true, message: '必填项' }]"
-                      placeholder="必填 检查事项"
+                      placeholder="检查事项"
                       readonly
                       type="textarea"
                       rows="1"
@@ -56,7 +56,7 @@
                       required
                       label="检查依据"
                       :rules="[{ required: true, message: '必填项' }]"
-                      placeholder="必填 检查依据"
+                      placeholder="检查依据"
                       readonly
                       type="textarea"
                       rows="1"

src/views/enterprise/registrationList.vue

@@ -13,7 +13,7 @@
         <van-search
                 v-model="searchParam.searchValue"
                 show-action
-                placeholder="执法事项/执法部门/执法人员/企业名称"
+                placeholder="请输入关键字查询"
                 @search="onSearch"
         >
             <template #action>