zhb 9 hodín pred
rodič
commit
8c35062d46

+ 4 - 0
api/user.ts

@@ -55,6 +55,10 @@ export const userApi = {
     getManagerInfo: () => {
         return post('/chat/get/manager/info', {})
     },
+    // 获取客户经理信息
+    getChatToken: () => {
+        return post('/chat/token/create', {})
+    },
     // 获取APP扫描登录
     getAppScanLogin: () => {
         return post('/custom/app/scan/login/create', {})

+ 1 - 0
composables/config.ts

@@ -8,6 +8,7 @@ export default config;
 // 使用默认值存储
 export const userToken = useStorage("user-token", "");
 export const shopToken = useStorage("shop_token", "");
+export const chatToken = useStorage("chat_token", "");
 export const lang = useStorage("lang", "cn");
 export const CLIENT = useStorage("CLIENT", "");
 export const rememberPassword = useStorage("rememberPassword", "false");

+ 2 - 4
manifest.json

@@ -52,14 +52,12 @@
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "访问相册用于选取图片上传头像、凭证",
 					"NSPhotoLibraryAddUsageDescription": "保存图片、凭证截图到系统相册",
-                    "NSCameraUsageDescription" : "使用相机拍照上传证件、二维码识别",
-                    "NSMicrophoneUsageDescription" : "麦克风用于语音客服通话、语音留言"
+                    "NSCameraUsageDescription" : "使用相机拍照上传证件、二维码识别"
                 },
 				"infoPlist": {
 					"NSPhotoLibraryUsageDescription": "访问相册用于选取图片上传头像、凭证",
 					"NSPhotoLibraryAddUsageDescription": "保存图片、凭证截图到系统相册",
-					"NSCameraUsageDescription": "使用相机拍照上传证件、二维码识别",
-					"NSMicrophoneUsageDescription": "麦克风用于语音客服通话、语音留言"
+					"NSCameraUsageDescription": "使用相机拍照上传证件、二维码识别"
 				},
                 "NSAppTransportSecurity" : {
                     "NSAllowsArbitraryLoads" : true

+ 12 - 1
pages/login/index.vue

@@ -280,7 +280,7 @@ import { onLoad } from '@dcloudio/uni-app'
 import ls from "@/utils/store2";
 import QrCode from '@/components/QrCode.vue'
 import { post } from '@/utils/request'
-import { userToken } from '@/composables/config'
+import { userToken, chatToken } from '@/composables/config'
 import { userApi } from '@/api/user'
 import { ucardApi } from '@/api/ucard'
 import { customApi } from '@/service/custom'
@@ -549,6 +549,7 @@ const handleTokenLogin = async (token) => {
 
     // 获取用户信息并跳转
     await getCustomLoginInfo()
+    // await getChatToken()
 
     // 获取拒绝原因列表
     reasonsRefusalList()
@@ -755,6 +756,7 @@ async function handleLogin() {
       uni.showToast({ title: t('login.msg0_1'), icon: 'success' })
       getCustomLoginInfo()
       // getCardUserInfo();
+      // getChatToken()
       reasonsRefusalList()
       if (remenber.value.length) {
         userStore.saveAccountInfo({
@@ -817,6 +819,14 @@ async function getCustomLoginInfo() {
     //  console.log(error, 111);
   }
 }
+async function getChatToken() {
+  try {
+    const res = await userApi.getChatToken()
+    chatToken.value = res.data
+  } catch (error) {
+    uni.$u.toast(error.msg || t('login.msg0'), 'error')
+  }
+}
 
 async function getCardUserInfo() {
   try {
@@ -884,6 +894,7 @@ const handleScanLoginResult = async (data) => {
     userToken.value = data.accessToken
     uni.showToast({ title: t('login.msg0_1'), icon: 'success' })
     await getCustomLoginInfo()
+    // await getChatToken()
     reasonsRefusalList()
     return
   }

+ 2 - 1
stores/use-user-store.ts

@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import ls from "@/utils/store2";
 import { ref } from "vue";
-import { userToken } from "../composables/config";
+import { userToken, chatToken } from "../composables/config";
 import crypt from "../composables/crypt";
 import useGlobalStore from "./use-global-store";
 
@@ -153,6 +153,7 @@ const useUserStore = defineStore("userStore", () => {
     userInfo.value = null;
     isLoggedIn.value = false;
     userToken.value = "";
+    chatToken.value = "";
     reasonsOptions.value = null;
     loginOptions.value = null;
     paymentChannel.value = null;

+ 4 - 2
utils/request.js

@@ -9,6 +9,7 @@ const SystemError = {
   "vn": "Mạng không được tốt lắm. Vui lòng thử lại sau.",
 }
 const timeout = 60000;
+const sourceList = ['/chat/token/create','/custom/login']
 const getHost = (type = 'Host80') => config1[type] || config1.Host80;
 // 不加loading
 const urlLoading = ['/list', '/page', '/field/params', '/dropdown', '/single', '/detail']
@@ -50,7 +51,8 @@ const requestInterceptor = (config) => {
   }
   config.header["X-System"] = config.header["X-System"] || 'B';
   // #ifdef APP-PLUS
-  if (config.url.includes('/custom/login')) {
+  const hit = sourceList.some(item => config.url.includes(item))
+  if (hit) {
     const { platform } = uni.getSystemInfoSync()
     const DEVICE_TYPE = {
       ios: 'PHONE_IOS',
@@ -139,7 +141,7 @@ export const request = async (options) => {
 
   return new Promise((resolve, reject) => {
     const needLoading = urlLoading.some(item => config.url.includes(item));
-    // console.log(needLoading,config.url)
+    console.log(needLoading,config.url)
     if (!needLoading) {
       // uni.showLoading({
       //   mask:true