20

util/imCommon.js

@@ -253,7 +253,6 @@ export const bytesToSize = (bytes) => {
 
 	return (bytes / Math.pow(k, i)).toPrecision(3) + " " + sizes[i];
 };
-
 export const tipMessaggeFormat = (msg, currentUserID) => {
 
 	const getName = (user) =>
@@ -269,43 +268,43 @@ export const tipMessaggeFormat = (msg, currentUserID) => {
 		case MessageType.GroupInfoUpdated:
 			const groupUpdateDetail = JSON.parse(msg.notificationElem.detail);
 			const groupUpdateUser = groupUpdateDetail.opUser;
-			return `${parseInfo(groupUpdateUser)}修改了群信息`;
+			return `${getName(groupUpdateUser)}修改了群信息`;
 		case MessageType.GroupOwnerTransferred:
 			const transferDetails = JSON.parse(msg.notificationElem.detail);
 			const transferOpUser = transferDetails.opUser;
 			const newOwner = transferDetails.newGroupOwner;
-			return `${parseInfo(transferOpUser)}转让群主给${parseInfo(newOwner)}`;
+			return `${getName(transferOpUser)}转让群主给${getName(newOwner)}`;
 		case MessageType.MemberQuit:
 			const quitDetails = JSON.parse(msg.notificationElem.detail);
 			const quitUser = quitDetails.quitUser;
-			return `${parseInfo(quitUser)}退出了群组`;
+			return `${getName(quitUser)}退出了群组`;
 		case MessageType.MemberInvited:
 			const inviteDetails = JSON.parse(msg.notificationElem.detail);
 			const inviteOpUser = inviteDetails.opUser;
 			const invitedUserList = inviteDetails.invitedUserList ?? [];
 			let inviteStr = "";
 			invitedUserList.find(
-				(user, idx) => (inviteStr += parseInfo(user) + "、") && idx > 3,
+				(user, idx) => (inviteStr += getName(user) + "、") && idx > 3,
 			);
 			inviteStr = inviteStr.slice(0, -1);
-			return `${parseInfo(inviteOpUser)} 邀请了${inviteStr}${invitedUserList.length > 3 ? "..." : ""}加入群聊`;		case MessageType.MemberKicked:
+			return `${getName(inviteOpUser)} 邀请了${inviteStr}${invitedUserList.length > 3 ? "..." : ""}加入群聊`;		case MessageType.MemberKicked:
 			const kickDetails = JSON.parse(msg.notificationElem.detail);
 			const kickOpUser = kickDetails.opUser;
 			const kickdUserList = kickDetails.kickedUserList ?? [];
 			let kickStr = "";
 			kickdUserList.find(
-				(user, idx) => (kickStr += parseInfo(user) + "、") && idx > 3,
+				(user, idx) => (kickStr += getName(user) + "、") && idx > 3,
 			);
 			kickStr = kickStr.slice(0, -1);
-			return `${parseInfo(kickOpUser)} 踢出了${kickStr}${kickdUserList.length > 3 ? "..." : ""}`;
+			return `${getName(kickOpUser)} 踢出了${kickStr}${kickdUserList.length > 3 ? "..." : ""}`;
 		case MessageType.MemberEnter:
 			const enterDetails = JSON.parse(msg.notificationElem.detail);
 			const enterUser = enterDetails.entrantUser;
-			return `${parseInfo(enterUser)}加入了群聊`;
+			return `${getName(enterUser)}加入了群聊`;
 		case MessageType.GroupDismissed:
 			const dismissDetails = JSON.parse(msg.notificationElem.detail);
 			const dismissUser = dismissDetails.opUser;
-			return `${parseInfo(dismissUser)}解散了群聊`;
+			return `${getName(dismissUser)}解散了群聊`;
 		default:
 			return "";
 	}

util/index.js

@@ -1,13 +1,14 @@
 
 //import i18n from '@/locales'
 import base from '@/common/config';
-//import store from "@/store";
+import store from "@/store";
 import IMSDK from "openim-uniapp-polyfill";
 
 import CryptoJS from 'crypto-js';
 import md5 from "md5";
-
+// #ifdef APP
 import {downloadFile} from "@/uni_modules/network-manage";
+// #endif
 const isString = (v)=> {
 	return typeof v === 'string' || v instanceof String;
 },
@@ -144,20 +145,31 @@ const scan = ()=>{
 				barCode	扫描条形码时返回条形码数据	支付宝小程序
 				imageChannel	来源	支付宝小程序
 			*/
-			if(res.result){
-				if(res.result.indexOf('blackcatp:/')){
+			if(res.scanType == "QR_CODE"){
+				const user_prefix = `${store.getters.config.website}/u/`;
+				console.log(res.result,user_prefix)
+				if(res.result.startsWith(user_prefix)){
+					return uni.navigateTo({
+						url:"/pages/common/userCard/index?sourceID="+res.result.replace(user_prefix,'')
+					});
+				}
+				const group_prefix = `${store.getters.config.website}/g/`;
+				console.log(res.result,group_prefix)
+				if(res.result.startsWith(group_prefix)){
+					return uni.navigateTo({
+						url:"/pages/common/groupCard/index?sourceID="+res.result.replace(group_prefix,'')
+					});
+				}
+				if(res.result.startsWith("http")){
 					uni.navigateTo({
-						url:res.result.substring(11)
-					})
-				}else{
-					success(res.result)
+						url:"/pages/common/webview?url="+encodeURIComponent(res.result)
+					});
+					//res.result;
+					return ;
 				}
 			}
 		},
 		fail(res){
-			
-		},
-		complete(res){
 			console.log(res)
 		}
 	});
@@ -234,6 +246,11 @@ const get_absolute_path = (fn)=>{
 }
 const pendingDownloads = new Map();
 const cacheFile = (url, saveDir,progressCallback) => {
+	// #ifndef APP
+    return new Promise(async (resolve, reject) => {
+		resolve(url);
+	});
+	// #endif
     return new Promise(async (resolve, reject) => {
         try {
 			if(!url || !url.startsWith('http')){
@@ -443,7 +460,9 @@ export default{
 	cacheFile,
 	fileExsit,
     get_absolute_path,
+	// #ifdef APP
 	downloadFile,
+	// #endif
 	isString :isString,
 	isNumber :isNumber,
 	isInteger :isInteger,