Merge remote-tracking branch 'origin/master'

im-admin-ui/src/views/im/code/components/alink.vue

@@ -33,7 +33,7 @@ export default {
       const baseUrl = `${location.origin}/h5`;
       
       if (this.uniqueToken) {
-        return `${baseUrl}?uniqueToken=${this.uniqueToken}`;
+        return `${baseUrl}?token=${this.uniqueToken}`;
       }
       
       return baseUrl;

im-admin-ui/src/views/im/code/components/wangye.vue

@@ -16,6 +16,7 @@
   var option = {
         "authInit":true,
         openUrl: '{{ siteUrl }}',
+        token: '{{ uniqueToken }}',
         isShowTip: true, // 初始化成功后，界面右下角会自动创建 “联系客服按钮”， 如无需默认展示，则填写false即可,默认为true
         mobileIcon: '', //  手机端悬浮客服图片
         pcIcon: '', // pc端悬浮客服图片
@@ -39,22 +40,35 @@
 </template>
 <script setup lang="ts">
 import { defineProps, defineEmits } from 'vue';
-
+import { getInfo } from '@/api/login';
 const props = defineProps<{
   tokeninfo?: any;
   siteUrl?: string;
 }>();
 
 const emit = defineEmits<{ (e: 'cgetCopy', id: string): void }>();
-
+const uniqueToken = ref('');
 function jiazai() {
-  const token = props.tokeninfo?.token_md5 || '';
+  // const token = props.tokeninfo?.token_md5 || '';
+  const token = uniqueToken.value || '';
   window.open(`${location.origin}/chat/index?token=${token}&noCanClose=1`);
 }
 
+async function fetchUniqueToken() {
+  const res = await getInfo();
+  console.log(res.data.tokenInfo);
+  if (res.data && res.data.tokenInfo) {
+      uniqueToken.value = res.data.tokenInfo.uniqueToken || '';
+    }
+}
+
 function getCopy(id: string) {
   emit('cgetCopy', id);
 }
+
+onMounted(() => {
+  fetchUniqueToken();
+});
 </script>
 <style>
 .a {