Merge remote-tracking branch 'origin/master'

842a6164 · 罗林杰 · d625be02 · b1e37d5b · 842a6164 · 842a6164
Commit 842a6164 authored Jan 14, 2025 by 罗林杰
7 changed files
--- a/.env.test
+++ b/.env.test
@@ -3,9 +3,9 @@ ENV = 'production'

 # 测试环境
 # base api
-  VUE_APP_BASE_API = 'http://49.232.167.247:20014/'
+  VUE_APP_BASE_API = 'http://106.3.97.198:20162/'


-VUE_APP_BASE_API_ONLYOFFICE_WEB = 'http://49.232.167.247:20016'
-VUE_APP_BASE_API_GETFILE = 'http://zc-api:8082'
-VUE_APP_BASE_API_CALLBACK = 'http://zc-api:8082'
+# VUE_APP_BASE_API_ONLYOFFICE_WEB = 'http://49.232.167.247:20016'
+# VUE_APP_BASE_API_GETFILE = 'http://zc-api:8082'
+# VUE_APP_BASE_API_CALLBACK = 'http://zc-api:8082'
--- a/public/test.html
+++ b/public/test.html
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Title</title>
+  <!--   引入该JS，全局注入getMetaInfo方法   -->
+  <script type="text/javascript" src="https://o.alicdn.com/yd-cloudauth/cloudauth-cdn/jsvm_all.js"></script>
+</head>
+<body>
+<div>1111111</div>
+
+<script>
+  // 获取当前页面的URL
+  const url = window.location.href;
+  // 创建一个新的URL对象
+  const urlObj = new URL(url);
+  // 使用URLSearchParams来获取参数
+  const params = new URLSearchParams(urlObj.search);
+  // 获取uniapp用户的token
+  var token = params.get('token'); // 替换'token'为实际参数名
+  console.log('Token:', token);
+  // 在调用实人认证服务端发起认证请求时需要传入该MetaInfo值
+  var MetaInfoChildren = window.getMetaInfo();
+  console.log('MetaInfo:',MetaInfo)
+  var MetaInfo = {
+    metaInfo: JSON.stringify(MetaInfoChildren),
+  }
+  console.log('JSON.stringify(MetaInfo):',JSON.stringify(MetaInfo))
+  // 请求认证业务接口获取CertifyUrl
+  fetch('http://localhost:8092/faceVerify/initFaceVerify', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + token
+    },
+    body: JSON.stringify(MetaInfo)
+  })
+    .then(response => response.json())
+    .then(data => {
+      console.log('data:', data)
+      // 获取CertifyUrl后跳转至认证页面
+      window.location.href = data.resultObject.certifyUrl;
+    });
+</script>
+</body>
+</html>
--- a/src/views/contentManagement/activity/index.vue
+++ b/src/views/contentManagement/activity/index.vue
@@ -92,8 +92,8 @@
            <template slot-scope="scope">
              <div :id="step(scope.$index)">
                <el-image
-                  :src="getImagePath(scope.row.path)"
-                  :preview-src-list="[getImagePath(scope.row.path)]"
+                  :src="getImagePath(scope.row.url)"
+                  :preview-src-list="[getImagePath(scope.row.url)]"
                  style="width:100%;height:100%;"
                  @mouseover="justEnter($event)"
                  @mouseout="justOut($event)"
@@ -322,7 +322,7 @@ export default {
  // },
  data() {
    return {
-      yesOrNo, 
+      yesOrNo,
      pageKey: 0,
      hasAddPerm: ['sys:activity:add'],
      hasUpdatePerm: ['sys:activity:update'],

--- a/src/views/contentManagement/activity/info/index.vue
+++ b/src/views/contentManagement/activity/info/index.vue
@@ -554,16 +554,6 @@ export default {
        const url = res.data.url
        Editor.insertEmbed(cursorLocation, 'image', url)
      })
-      // var formData = new FormData()
-      // formData.append('image', file)
-      // $http.post(this.$common.baseUrl + 'upload/image', formData).then(res => {
-      //   const data = res.body
-      //   if (data.code == 200) {
-      //     const url = data.data.url
-      //     Editor.insertEmbed(cursorLocation, 'image', url)
-      //     resetUploader()
-      //   } else { }
-      // })
    },

    // 查询详情
@@ -573,7 +563,8 @@ export default {
        getCmsActivity(this.$route.query.bussinessId).then(response => {
          if (response.code === 200) {
            this.form = response.data
-            this.imageUrl = response.data.path
+            this.imageUrl = response.data.url
+            console.log('this.imageUrl:',this.imageUrl)
          }
        })
      }

--- a/src/views/contentManagement/banner/index.vue
+++ b/src/views/contentManagement/banner/index.vue
@@ -68,8 +68,8 @@
            <template slot-scope="scope">
              <div :id="step(scope.$index)">
                <el-image
-                  :src="getImagePath(scope.row.path)"
-                  :preview-src-list="[getImagePath(scope.row.path)]"
+                  :src="getImagePath(scope.row.url)"
+                  :preview-src-list="[getImagePath(scope.row.url)]"
                  style="width:100%;height:100%;"
                  @mouseover="justEnter($event)"
                  @mouseout="justOut($event)"
@@ -226,7 +226,7 @@ export default {
        bannerName: undefined,
        type: undefined,
        weight: undefined,
-        path: undefined,
+        url: undefined,
        flag: ''
      },
      showImg: false,
@@ -284,42 +284,6 @@ export default {
    justOut(event) {
      // 鼠标离开时的操作
    },
-    /**
-     * @description: 处理上传接口
-     * @author: gaoyu
-     * @param:
-     * @return:
-     **/
-    /*    handleUpload(file) {
-      // 获取上传的文件
-      const formData = new FormData()
-      formData.append('file', file.file)
-
-      // 模拟本地上传，将图片保存到本地某个目录（如：assets/images）
-      const localPath = this.getImagePath(file.file) // 获取本地存储的路径
-
-      // 假设你将本地路径保存到 form.pictureId 中
-      this.imageUrl = localPath // 显示图片路径
-      this.form.pictureId = localPath // 保存到表单字段中
-    },*/
-    /*    handleUpload(file) {
-      const formData = new FormData()
-      formData.append('file', file.file)
-      formData.append('temp', 'CmsBanner')
-      uploadPublic(formData).then(res => {
-        // console.log('url', res.data.url)
-        this.imageUrl = res.data.url
-        this.showImg = true
-        this.form.pictureId = res.data.businessId
-      })
-    },*/
-    /*    handleAvatarSuccess(res, file) {
-      console.log('res', res)
-      // this.imageUrl = URL.createObjectURL(file.raw)
-      // this.form.pictureId = res.data.businessId
-      // this.form.url = res.data.url
-    },*/
-
    beforeAvatarUpload(file) {
      // this.file = file
      // 判断文件是否为图片类型
@@ -369,7 +333,7 @@ export default {
        type: '1',
        weight: null,
        remarks: null,
-        path: null,
+        url: null,
        flag: '1'
      }
      this.resetForm('form')
@@ -389,7 +353,7 @@ export default {
        bannerName: null,
        type: null,
        weight: null,
-        path: null,
+        url: null,
        flag: ''
      }
      this.handleQuery()
@@ -407,8 +371,7 @@ export default {
      const id = row.businessId
      getCmsBanner(id).then(response => {
        this.form = response.data
-        this.imageUrl = response.data.path
-        console.log('hhahaah', this.imagUrl)
+        this.imageUrl = response.data.url
        this.open = true
        this.title = '修改banner'
      })

--- a/src/views/contentManagement/notice/index.vue
+++ b/src/views/contentManagement/notice/index.vue
@@ -91,8 +91,8 @@
            <template slot-scope="scope">
              <div :id="step(scope.$index)">
                <el-image
-                  :src="getImagePath(scope.row.path)"
-                  :preview-src-list="[getImagePath(scope.row.path)]"
+                  :src="getImagePath(scope.row.url)"
+                  :preview-src-list="[getImagePath(scope.row.url)]"
                  style="width:100%;height:100%;"
                  @mouseover="justEnter($event)"
                  @mouseout="justOut($event)"

--- a/src/views/contentManagement/notice/info/index.vue
+++ b/src/views/contentManagement/notice/info/index.vue
@@ -365,7 +365,7 @@ export default {
        getCmsNotice(this.$route.query.bussinessId).then(response => {
          if (response.code === 200) {
            this.form = response.data
-            this.imageUrl = response.data.path
+            this.imageUrl = response.data.url
          }
        })
      }