fstarter 2.11.3 → 2.11.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fstarter",
   "description": "A Vue.js project",
-  "version": "2.11.3",
+  "version": "2.11.5",
   "author": "han.zhang <zhanghan810810@163.com>",
   "license": "MIT",
   "private": false,

package/src/plugins/plugins/components/pdfPreview.vue

@@ -1,10 +1,11 @@
 <template>
   <div v-if="visible" class="pdf-preview-overlay">
     <div class="pdf-preview-container" @click.stop>
-      <div class="pdf-header" v-if="currentPdf.title">
+      <div class="pdf-header">
         <div class="pdf-title">
-          {{ currentPdf.title }}
+          {{ currentPdf.title || currentPdf.url.split('/').pop() }}
         </div>
+        <div class="share-button" @click="sharePdf()" v-if="currentPdf.share">分享</div>
       </div>
       <div class="pdf-content" ref="pdfContent" @scroll="checkIfScrolledToBottom">
         <div ref="pdfContainer" class="pdf-container" role="region" aria-label="PDF内容">
@@ -37,7 +38,7 @@
 
 <script>
 let Pdfh5;
-
+import nativeUtils from '../nativeUtils'
 // 动态导入pdfh5以避免构建时错误
 try {
   Pdfh5 = require("pdfh5").default || require("pdfh5");
@@ -95,6 +96,23 @@ export default {
     }
   },
   methods: {
+    sharePdf(){
+      const shareConfig = {
+        type: 'file',
+        scene: 'session',
+        content: {
+          fileType: 'pdf', // 替换为实际的文件类型
+          fileName: this.currentPdf.title, // 替换为实际的PDF文件标题
+          fileUrl: this.currentPdf.url
+        }
+      };
+
+      nativeUtils.share(shareConfig)
+        .then(res => {
+        })
+        .catch(err => {
+        });
+    },
     handleCountdownClick() {
       // 如果还在倒计时中，不允许点击
       if (this.countdown > 0) {
@@ -295,27 +313,6 @@ export default {
         } else {
           // 倒计时结束
           this.isCountingDown = false;
-
-          // 倒计时结束后根据PDF数量和位置自动执行操作
-          if (this.pdfList.length === 1) {
-            // 单个PDF，倒计时结束自动关闭
-            console.log('Single PDF countdown finished, closing preview');
-            this.close();
-          } else {
-            // 多个PDF，倒计时结束切换到下一个或关闭
-            if (this.currentIndex < this.pdfList.length - 1) {
-              // 还有下一个PDF
-              console.log('Multiple PDFs countdown finished, moving to next');
-              this.nextPdf();
-              // 为下一个PDF启动倒计时
-              this.startCountdown();
-            } else {
-              // 已经是最后一个PDF，关闭预览
-              console.log('Last PDF countdown finished, closing preview');
-              this.close();
-            }
-          }
-          // 倒计时器由stopCountdown()统一管理，这里不主动清除
         }
       }, 1000);
     },
@@ -579,17 +576,25 @@ export default {
 
 .pdf-header {
   display: flex;
-  justify-content: space-between;
+  position: relative;
   align-items: center;
-  padding: 10px 15px;
+  padding: 15px 15px;
   background: #f5f5f5;
   border-bottom: 1px solid #ddd;
 }
 
 .pdf-title {
-  font-size: 16px;
+  font-size: 14px;
   font-weight: bold;
   color: #333;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 70%;
+  text-align: center;
 }
 
 .pdf-controls {
@@ -656,6 +661,11 @@ export default {
   color: #666;
 }
 
+.share-button {
+  margin-left: auto;
+  color: #4a6bbe;
+}
+
 .prev-btn {
   order: -1;
 }
@@ -663,26 +673,4 @@ export default {
 .next-btn {
   order: 1;
 }
-
-@media (max-width: 768px) {
-  .pdf-preview-container {
-    width: 100%;
-    height: 100%;
-  }
-
-  .pdf-header {
-    flex-direction: column;
-    gap: 5px;
-    text-align: center;
-  }
-
-  .pdf-title {
-    font-size: 14px;
-  }
-
-  .pdf-controls {
-    width: 100%;
-    justify-content: space-between;
-  }
-}
 </style>

package/src/plugins/plugins/nativeUtils.js

@@ -1,6 +1,6 @@
 import native from './native-js-sdk.js'
 import ImageCropper from './components/imageCropper.vue';
-import { Toast } from "vant"
+import { Toast, Dialog } from "vant"
 import axios from 'axios'
 import { JSEncrypt } from 'jsencrypt'
 const publicKey = `-----BEGIN PUBLIC KEY-----
@@ -46,7 +46,7 @@ if(isProductionEnvironment()){
   faceResultUrl = 'https://bcs.ihasl.com/api/v1/bcs/face/faceResultQuery'
   appid = 'wx751d925fbededc73' // 回调安全域名 wx.ihasl
   tokenKey = '6297391dca6d4090ae60959acb73cda1'
-  loginUrl = 'https://www.ihasl.com/pages/salessupport/app/#/login'
+  loginUrl = 'https://www.ihasl.com/pages/app2-hasl/#/login'
 } else {
   console.log('测试环境')
   auth = 0
@@ -55,9 +55,7 @@ if(isProductionEnvironment()){
   faceResultUrl = 'https://testbcs.ihasl.com/api/v1/bcs/face/faceResultQuery'
   appid = 'wx38c646900b5b7ec0' // 回调安全域名 teststatic.com
   tokenKey = '814a0b7eb0f82e02246da5e098b6e2b5'
-  loginUrl = 'https://teststatic.ihasl.com/pages/salessupport/app/#/login'
-  // 本地的
-  // loginUrl = 'http://172.20.10.2:8080/#/login'
+  loginUrl = 'https://teststatic.ihasl.com/pages/app2-hasl/#/login'
 }
 console.log(appid, 'appid')
 
@@ -321,10 +319,10 @@ const nativeUtils = {
 
         let params = {
           orderNo: urlParams.get('orderNo'), // 从URL中获取orderNo参数
-          requestSource: 'WX', // 请求来源
+          requestSource: 'YX', // 请求来源
           meta: { // 元数据
-            tenantCode: 'WX', // 租户编码
-            businessCode: 'WX-EDOR', // 业务编码
+            tenantCode: 'YX', // 租户编码
+            businessCode: 'YX-EDOR', // 业务编码
             serviceType: 'FACE' // 业务类型
           }
         }
@@ -338,20 +336,29 @@ const nativeUtils = {
             'Accept-Attr4': 'NULL'
           }
         }).then(response => {
-          if (response.data.resultType === 'SUCCESS') {
-            // console.log('接口调用成功', response)
-            // if(response.facePhotoUrl && response.facePhotoUrl!=='null' && response.similarity && response.similarity!=='null'){
-            //   resolve(response.data)
-            //   } else {
-            //   Toast('人脸对比未返回图片和相似度，请重试');
-            // }
-            Toast.clear()
-            resolve({
-              similarity: "99",
-              liveRate: "99",
-              facePhotoUrl: "http://testfile.ihasl.com/file/v1/hasl/fileAdmin/fileAdmin/get/z254g0pc55tj11apjge0dun8hvxjdxxs.jpg",
-            })
+          Toast.clear()
+          console.log('人脸查询接口调用成功', response)
+          if (response.data.resultType == 'SUCCESS') {
+            if(isProductionEnvironment()){
+              // 生产环境正常返回
+              resolve({
+                similarity: response.data.similarity,
+                facePhotoUrl: response.data.facePhotoUrl
+              })
+            } else {
+              // 测试环境写死一个相似度
+              resolve({
+                similarity: 99,
+                facePhotoUrl: response.data.facePhotoUrl
+              })
+            }
           } else {
+            Dialog.alert({
+              title: '人脸识别提示',
+              message: response.data.failMessage + '，请重试。',
+            }).then(() => {
+              // on close
+            });
             reject(new Error('接口调用失败'))
           }
         }).catch(error => {
@@ -1175,19 +1182,26 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
       });
       document.getElementById('cancelBtn').addEventListener('click', () => {
         nativeUtils.closeDialog();
-        nativeUtils._takePictureReject(new Error('用户取消了操作'));
+        if (nativeUtils._takePictureReject) {
+          nativeUtils._takePictureReject(new Error('用户取消了操作'));
+        }
+      });
+
+      // 添加点击背景关闭弹窗的功能
+      const cameraDialog = dialog.querySelector('.camera-dialog');
+      cameraDialog.addEventListener('click', function (e) {
+        if (e.target === cameraDialog) {
+          // 点击背景时也视为取消操作
+          nativeUtils.closeDialog();
+          if (nativeUtils._takePictureReject) {
+            nativeUtils._takePictureReject(new Error('用户取消了操作'));
+          }
+        }
       });
     }, 0);
 
     // 添加到文档
     document.body.appendChild(dialog);
-
-    // 添加事件监听器，点击背景关闭弹窗
-    dialog.addEventListener('click', function (e) {
-      if (e.target.classList.contains('camera-dialog')) {
-        this.closeDialog();
-      }
-    });
   },
   // 关闭弹窗
   closeDialog() {
@@ -1209,6 +1223,8 @@ nFqBB1zM586NpO+4hua/1Ol5OiqoQJ4iQinyDiA=
         document.body.removeChild(dialog);
       }, 300);
     }
+
+    // 清理全局引用
     delete nativeUtils._takePictureResolve;
     delete nativeUtils._takePictureReject;
   },